From patchwork Thu Feb 1 18:00:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 38579 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EE8FC48299 for ; Thu, 1 Feb 2024 18:00:15 +0000 (UTC) Received: from a27-23.smtp-out.us-west-2.amazonses.com (a27-23.smtp-out.us-west-2.amazonses.com [54.240.27.23]) by mx.groups.io with SMTP id smtpd.web11.2109.1706810406372120697 for ; Thu, 01 Feb 2024 10:00:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=OqnwuVjD; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=iMX+1Nnr; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.23, mailfrom: 0101018d65d3fd58-1f6b0395-bb22-468c-a752-02c031c37105-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1706810408; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=O465xK/B8I3Xlgya/RHeSQJIulkudt+2JtLGA2mdUgI=; b=OqnwuVjD+syfLIzhfRRmlirgT8KeFUpO0ggWjbKXYuY3jgPhQAL5mxcoCxSLwwsJ NJBVOKtdj5XwJSP4+aatong6mUdgRfJAzV8MkT0gb7qY1bF0TMVEKHkS63aKKmooFq3 Q3C0nEHvBM4DeO8HXcYAMNVMM/7lK8M3rCLgi610= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1706810408; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=O465xK/B8I3Xlgya/RHeSQJIulkudt+2JtLGA2mdUgI=; b=iMX+1Nnr4h0t77MbktdNWUvjLpGgOpXDWKBDghg0bgpRq4m/3ogOeRC7DsEw8Odj UTwMk/zS1Ttp5rJ1uR4e7q47cCVhpBEbO7Bei0Tpdj1k6QKb3QuVjMcEXCEMNaBkZ1M KvpG7EeQHz+WdXT6qmUCh6J/jd/YcFpkJnOkr6Rs= MIME-Version: 1.0 From: auh@yoctoproject.org To: Hongxu Jia Cc: openembedded-core@lists.openembedded.org Subject: [AUH] gnupg: upgrading to 2.4.4 SUCCEEDED Message-ID: <0101018d65d3fd58-1f6b0395-bb22-468c-a752-02c031c37105-000000@us-west-2.amazonses.com> Date: Thu, 1 Feb 2024 18:00:08 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.02.01-54.240.27.23 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Feb 2024 18:00:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194714 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *gnupg* to *2.4.4* has Succeeded. Next steps: - apply the patch: git am 0001-gnupg-upgrade-2.4.3-2.4.4.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 6beaa7922df6447a86a01cf8fa128ccd9dea5ea3 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 1 Feb 2024 17:38:07 +0000 Subject: [PATCH] gnupg: upgrade 2.4.3 -> 2.4.4 --- ...erride-init-is-not-needed-with-gcc-9.patch | 8 ++--- ...-a-custom-value-for-the-location-of-.patch | 6 ++-- ...use-pkgconfig-instead-of-npth-config.patch | 2 +- ...h-fix-find-version-for-beta-checking.patch | 12 +++---- .../gnupg/gnupg/fix-ldap.patch | 34 ------------------- .../gnupg/gnupg/relocate.patch | 18 +++++----- .../gnupg/{gnupg_2.4.3.bb => gnupg_2.4.4.bb} | 4 +-- 7 files changed, 23 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-support/gnupg/gnupg/fix-ldap.patch rename meta/recipes-support/gnupg/{gnupg_2.4.3.bb => gnupg_2.4.4.bb} (96%) 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 83195b5bd4..11cbf8c8ef 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 e10d933c88df8e49c0e028a86642922808f85ae7 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 @@ -12,12 +12,13 @@ unary '&' operand | Upstream-Status: Pending Signed-off-by: Khem Raj + --- dirmngr/dns.h | 2 +- 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 +30,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 561616584c..b84dcb9b90 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 acdb7e1d2844cd4088f099617e25352b3dc5b075 Mon Sep 17 00:00:00 2001 +From 66069803a54aa767ef3a520b3159d701a5adf0db 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 @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index e68b779..eec9f89 100644 +index 26d7f7b..e953c2e 100644 --- a/configure.ac +++ b/configure.ac -@@ -1922,7 +1922,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1921,7 +1921,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/0002-use-pkgconfig-instead-of-npth-config.patch b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch index 0e58fd4c4d..0fdd9fa3a2 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 86ebb6cdc59c9b474ff75292948327903082c2d3 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 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 dcd8582ca6..66842e6d49 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,7 +1,7 @@ -From 914ae4a3f7529fb069467bf0ded57dd24ee2e763 Mon Sep 17 00:00:00 2001 +From 7910eaec574ad6d0de6674929a1f41a1b36bca54 Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Wed, 16 Aug 2017 11:23:22 +0800 -Subject: [PATCH 4/4] autogen.sh: fix find-version for beta checking +Subject: [PATCH] autogen.sh: fix find-version for beta checking find-version always assumes that gnupg is beta if autogen.sh is run out of git-repo. This doesn't work for users whom just take release @@ -13,15 +13,16 @@ 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 e5ba5bf..05e0e11 100755 +index 0abf103..78753b5 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -245,7 +245,6 @@ if [ "$myhost" = "find-version" ]; then +@@ -237,7 +237,6 @@ if [ "$myhost" = "find-version" ]; then rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) else ingit=no @@ -29,6 +30,3 @@ index e5ba5bf..05e0e11 100755 tmp="-unknown" rev="0000000" rvd="0" --- -1.8.3.1 - diff --git a/meta/recipes-support/gnupg/gnupg/fix-ldap.patch b/meta/recipes-support/gnupg/gnupg/fix-ldap.patch deleted file mode 100644 index 4754781565..0000000000 --- a/meta/recipes-support/gnupg/gnupg/fix-ldap.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dc13361524c1477b2106c7385f2059f9ea111b84 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Wed, 5 Jul 2023 09:29:54 +0900 -Subject: [PATCH] dirmngr: Enable the call of ks_ldap_help_variables when - USE_LDAP. - -* dirmngr/server.c [USE_LDAP] (cmd_ad_query): Conditionalize. - --- - -Upstream-Status: Backport -Signed-off-by: NIIBE Yutaka -Signed-off-by: Alexander Kanavin ---- - dirmngr/server.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dirmngr/server.c b/dirmngr/server.c -index 51a149cb2..ee61f63d6 100644 ---- a/dirmngr/server.c -+++ b/dirmngr/server.c -@@ -2776,7 +2776,9 @@ cmd_ad_query (assuan_context_t ctx, char *line) - - if (opt_help) - { -+#if USE_LDAP - ks_ldap_help_variables (ctrl); -+#endif - err = 0; - goto leave; - } --- -2.11.0 - diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index d540e9edbb..0e20a6aec1 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From 0e4b325c199354ce54cc4687532cced1440fd496 Mon Sep 17 00:00:00 2001 +From 29fb8230e38a238228017e29f4d25cc250fa3008 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 @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index 286685f..212a945 100644 +index 6f99f3e..f22aa9e 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -1213,7 +1213,7 @@ gnupg_socketdir (void) +@@ -1284,7 +1284,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy; @@ -26,7 +26,7 @@ index 286685f..212a945 100644 gpgrt_annotate_leaked_object (name); } -@@ -1245,7 +1245,7 @@ gnupg_sysconfdir (void) +@@ -1316,7 +1316,7 @@ gnupg_sysconfdir (void) if (dir) return dir; else @@ -35,7 +35,7 @@ index 286685f..212a945 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1281,7 +1281,7 @@ gnupg_bindir (void) +@@ -1352,7 +1352,7 @@ gnupg_bindir (void) return name; } else @@ -44,7 +44,7 @@ index 286685f..212a945 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1308,7 +1308,7 @@ gnupg_libexecdir (void) +@@ -1379,7 +1379,7 @@ gnupg_libexecdir (void) return name; } else @@ -53,7 +53,7 @@ index 286685f..212a945 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1338,7 +1338,7 @@ gnupg_libdir (void) +@@ -1409,7 +1409,7 @@ gnupg_libdir (void) return name; } else @@ -62,7 +62,7 @@ index 286685f..212a945 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1369,7 +1369,7 @@ gnupg_datadir (void) +@@ -1440,7 +1440,7 @@ gnupg_datadir (void) return name; } else @@ -71,7 +71,7 @@ index 286685f..212a945 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1401,7 +1401,7 @@ gnupg_localedir (void) +@@ -1472,7 +1472,7 @@ gnupg_localedir (void) return name; } else diff --git a/meta/recipes-support/gnupg/gnupg_2.4.3.bb b/meta/recipes-support/gnupg/gnupg_2.4.4.bb similarity index 96% rename from meta/recipes-support/gnupg/gnupg_2.4.3.bb rename to meta/recipes-support/gnupg/gnupg_2.4.4.bb index e91ef34b7d..5e589d8a21 100644 --- a/meta/recipes-support/gnupg/gnupg_2.4.3.bb +++ b/meta/recipes-support/gnupg/gnupg_2.4.4.bb @@ -18,13 +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://fix-ldap.patch \ + file://relocate.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] = "a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d" +SRC_URI[sha256sum] = "67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \