From patchwork Thu Aug 15 18:58:55 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: 47856 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 D1064C54F32 for ; Thu, 15 Aug 2024 18:59:06 +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.131434.1723748334879712346 for ; Thu, 15 Aug 2024 11:58:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=by3LS9cX; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=MTZQFjUa; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.23, mailfrom: 0101019157683fe7-60f6e4d5-508c-4fab-bdfb-4d7fa8f74258-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1723748335; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=WYSGULDWNv5bb+0DpHbnTQ+Te/n2RpuUtFO5+eFRx+w=; b=by3LS9cXO9Abnge1Yl0bRcEVN0akUUP5r9yZoVfHfCtn59P8Jz4wRuFVVJ5ny+Yq HhvEwrlKgTYUfGu9u9qaji22eJFHhzk30ujb1wnUQ5KksBGDQrgvaASt2Ip8pJjpdrc 5KTV5ipbN2x2R2SNwLGY3iWgFHgbJ03xNHSZLMOM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1723748335; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=WYSGULDWNv5bb+0DpHbnTQ+Te/n2RpuUtFO5+eFRx+w=; b=MTZQFjUajbPTP/mEqpXk+UfeIQ7nMsGEBXjy2hNSc6FuBHdCXc+5QcmjDqYBSZAY oERYSBqRjLLpupViYRLl37ixEnYqDqMX+gvtX3j1UnPFuS1XRHi+XZyFCDTrHT+3Hqw gJgLZ6N4lu9kuyhFmEA+ILi0Ls8TAqWgnF2oFU9Q= MIME-Version: 1.0 From: auh@yoctoproject.org To: Hongxu Jia Cc: openembedded-core@lists.openembedded.org Subject: [AUH] gnupg: upgrading to 2.5.0 FAILED Message-ID: <0101019157683fe7-60f6e4d5-508c-4fab-bdfb-4d7fa8f74258-000000@us-west-2.amazonses.com> Date: Thu, 15 Aug 2024 18:58:55 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.08.15-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, 15 Aug 2024 18:59:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203406 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *gnupg* to *2.5.0* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-gnupg-upgrade-2.4.5-2.5.0.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 c2ac4dfbd8dc5650ca67486ca0fe6cb6ac86f7e1 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 15 Aug 2024 18:23:06 +0000 Subject: [PATCH] gnupg: upgrade 2.4.5 -> 2.5.0 --- ...erride-init-is-not-needed-with-gcc-9.patch | 7 ++----- ...-a-custom-value-for-the-location-of-.patch | 7 +++---- ...use-pkgconfig-instead-of-npth-config.patch | 3 +-- ...h-fix-find-version-for-beta-checking.patch | 9 ++++----- .../gnupg/gnupg/relocate.patch | 19 +++++++++---------- .../gnupg/{gnupg_2.4.5.bb => gnupg_2.5.0.bb} | 2 +- 6 files changed, 20 insertions(+), 27 deletions(-) rename meta/recipes-support/gnupg/{gnupg_2.4.5.bb => gnupg_2.5.0.bb} (97%) 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..77d7507edc 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 f957f6b55e..12b1447138 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/0002-use-pkgconfig-instead-of-npth-config.patch b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch index 0e58fd4c4d..945abb55ff 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 d664c36a1b..761fd6c608 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 ea0252026a..5c4d81f87a 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 97% rename from meta/recipes-support/gnupg/gnupg_2.4.5.bb rename to meta/recipes-support/gnupg/gnupg_2.5.0.bb index 99996968b1..7c6d7bdc1a 100644 --- a/meta/recipes-support/gnupg/gnupg_2.4.5.bb +++ b/meta/recipes-support/gnupg/gnupg_2.5.0.bb @@ -23,7 +23,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- 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 \