From: hongxu Date: Fri, 23 Aug 2024 01:48:06 +0000 (+0800) Subject: gnupg: 2.4.5 -> 2.5.0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7bcd683365961e661c419e79a4bb641069f2a79;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git gnupg: 2.4.5 -> 2.5.0 Fix compile failure with musl Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch b/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch index 83195b5bd4d..77d7507edcb 100644 --- a/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch +++ b/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch @@ -1,4 +1,4 @@ -From e3adc816d2d56dd929016073937ba24e01e03cb8 Mon Sep 17 00:00:00 2001 +From 6392cb71a23adfd601537049da4e5e06e51d2e50 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 20 Dec 2018 17:37:48 -0800 Subject: [PATCH] Woverride-init is not needed with gcc 9 @@ -17,7 +17,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dirmngr/dns.h b/dirmngr/dns.h -index 024d6dcc8..c6e141e16 100644 +index 1f647e1..334acb6 100644 --- a/dirmngr/dns.h +++ b/dirmngr/dns.h @@ -139,7 +139,7 @@ DNS_PUBLIC int *dns_debug_p(void); @@ -29,6 +29,3 @@ index 024d6dcc8..c6e141e16 100644 #define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push") #define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"") #define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop") --- -2.17.1 - diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch index f957f6b55ec..12b1447138e 100644 --- a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -1,4 +1,4 @@ -From 6b581c43bd01f815db78a410fd3814fc5994171e Mon Sep 17 00:00:00 2001 +From a0e986b487891ef8e3bb41b95f969e00edd4923f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -8,16 +8,15 @@ This should avoid clashes with the host gpg-agent observed on autobuilders. Upstream-Status: Inappropriate [oe-core specific, and only for -native] Signed-off-by: Alexander Kanavin - --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 26d7f7b..e953c2e 100644 +index e4f8c0e..fa75ec8 100644 --- a/configure.ac +++ b/configure.ac -@@ -1921,7 +1921,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1925,7 +1925,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) diff --git a/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch b/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch new file mode 100644 index 00000000000..fef05cf3c8d --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch @@ -0,0 +1,36 @@ +From 4a7d4d6e45c68708ec95335b0f11d6596b23095a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 22 Aug 2024 15:31:16 +0800 +Subject: [PATCH] fix compile failure with musl + +``` +../../gnupg-2.5.0/scd/app.c:379:3: error: implicit declaration of function 'write'; did you mean 'fwrite'? [-Wimplicit-function-declaration] + 379 | write (card_list_lock.notify_pipe[1], "", 1); + | ^~~~~ + | fwrite +``` +To access the Posix low level file interface such as open, read, +write and close, should include . + +Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=1d5cfa9b7fd22e1c46eeed5fa9fed2af6f81d34f] + +Signed-off-by: Hongxu Jia +--- + scd/app.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scd/app.c b/scd/app.c +index 926ab79..7bf58a2 100644 +--- a/scd/app.c ++++ b/scd/app.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include "scdaemon.h" + #include "../common/exechelp.h" +-- +2.27.0 + diff --git a/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch index 0e58fd4c4db..945abb55ff8 100644 --- a/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch +++ b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch @@ -1,4 +1,4 @@ -From d9048788d906774b1475c3bb1b17e22455c2add4 Mon Sep 17 00:00:00 2001 +From fa93b5f7c2da0e5846b80de9c6296966ca2a3d83 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 16 Aug 2017 11:16:30 +0800 Subject: [PATCH] use pkgconfig instead of npth config @@ -9,7 +9,6 @@ Signed-off-by: Saul Wold Rebase to 2.1.23 Signed-off-by: Hongxu Jia - --- m4/npth.m4 | 53 ++++++++--------------------------------------------- 1 file changed, 8 insertions(+), 45 deletions(-) diff --git a/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch index d664c36a1bc..761fd6c608f 100644 --- a/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch +++ b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch @@ -1,4 +1,4 @@ -From 6a7f9b71d936847dcaeeac7d1b69d8299be4dd85 Mon Sep 17 00:00:00 2001 +From e8f67e3bbbdbaa17cfe88c1f7a8f488eb4936281 Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Wed, 16 Aug 2017 11:23:22 +0800 Subject: [PATCH] autogen.sh: fix find-version for beta checking @@ -13,20 +13,19 @@ Signed-off-by: Wenzong Fan Rebase to 2.1.23 Signed-off-by: Hongxu Jia - --- autogen.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/autogen.sh b/autogen.sh -index 0abf103..78753b5 100755 +index 9f91297..116fb7f 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -237,7 +237,6 @@ if [ "$myhost" = "find-version" ]; then +@@ -270,7 +270,6 @@ if [ "$myhost" = "find-version" ]; then rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) else ingit=no - beta=yes tmp="-unknown" + cid="0000000" rev="0000000" - rvd="0" diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index ea0252026aa..5c4d81f87a5 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From c50d0a95fcf8f96c272fadd4ba85f3eeac39fcaf Mon Sep 17 00:00:00 2001 +From 4e556a5edde8a97312abae63f8e9b5f989ca5c91 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its @@ -8,16 +8,15 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin - --- common/homedir.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index 6f99f3e..f22aa9e 100644 +index 3929108..d3a7b8f 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -1284,7 +1284,7 @@ gnupg_socketdir (void) +@@ -1439,7 +1439,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy; @@ -26,7 +25,7 @@ index 6f99f3e..f22aa9e 100644 gpgrt_annotate_leaked_object (name); } -@@ -1316,7 +1316,7 @@ gnupg_sysconfdir (void) +@@ -1468,7 +1468,7 @@ gnupg_sysconfdir (void) if (dir) return dir; else @@ -35,7 +34,7 @@ index 6f99f3e..f22aa9e 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1352,7 +1352,7 @@ gnupg_bindir (void) +@@ -1504,7 +1504,7 @@ gnupg_bindir (void) return name; } else @@ -44,7 +43,7 @@ index 6f99f3e..f22aa9e 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1379,7 +1379,7 @@ gnupg_libexecdir (void) +@@ -1531,7 +1531,7 @@ gnupg_libexecdir (void) return name; } else @@ -53,7 +52,7 @@ index 6f99f3e..f22aa9e 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1409,7 +1409,7 @@ gnupg_libdir (void) +@@ -1561,7 +1561,7 @@ gnupg_libdir (void) return name; } else @@ -62,7 +61,7 @@ index 6f99f3e..f22aa9e 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1440,7 +1440,7 @@ gnupg_datadir (void) +@@ -1592,7 +1592,7 @@ gnupg_datadir (void) return name; } else @@ -71,7 +70,7 @@ index 6f99f3e..f22aa9e 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1472,7 +1472,7 @@ gnupg_localedir (void) +@@ -1624,7 +1624,7 @@ gnupg_localedir (void) return name; } else diff --git a/meta/recipes-support/gnupg/gnupg_2.4.5.bb b/meta/recipes-support/gnupg/gnupg_2.5.0.bb similarity index 95% rename from meta/recipes-support/gnupg/gnupg_2.4.5.bb rename to meta/recipes-support/gnupg/gnupg_2.5.0.bb index 97b5d8856c0..9cfdbdf0a4f 100644 --- a/meta/recipes-support/gnupg/gnupg_2.4.5.bb +++ b/meta/recipes-support/gnupg/gnupg_2.5.0.bb @@ -18,12 +18,13 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0002-use-pkgconfig-instead-of-npth-config.patch \ file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ + file://0001-fix-compile-failure-with-musl.patch \ " SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch" SRC_URI:append:class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277" +SRC_URI[sha256sum] = "2222c827d4e7087f15e7f72739d004abc1d05c6c5f0a5a12b24c6a6cc5d173fb" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \