From patchwork Thu May 15 12:32:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 63038 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 7DC51C61CE7 for ; Thu, 15 May 2025 12:32:12 +0000 (UTC) Received: from a27-193.smtp-out.us-west-2.amazonses.com (a27-193.smtp-out.us-west-2.amazonses.com [54.240.27.193]) by mx.groups.io with SMTP id smtpd.web10.11262.1747312313830576133 for ; Thu, 15 May 2025 05:32:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=j46ser6a2yusdzubpv7m7ewqgesde2ie header.b=k1FkVc0n; dkim=pass header.i=@amazonses.com header.s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx header.b=PgFURqHt; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.193, mailfrom: 01010196d3ee40d0-431bb5a8-e5d3-48ac-a8d7-2429d31b44b6-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=j46ser6a2yusdzubpv7m7ewqgesde2ie; d=yoctoproject.org; t=1747312329; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=uUYo/xZmHuyn9Wlcbxx3Wj2NY8qHv5erR3Btv1S1xaQ=; b=k1FkVc0n8l8BtFVkF/jTzAekndc8yfQsgKC1ixdlFwJmuD70oIT3XJ9gb6i6F09V NR89rKH+KU7VF9fdmoVMXfqYB0mYkI2pYnrE/OGUdwSDViYc/+FotCANuXkG2o/zuDc QwZW3F1/ZmaP01a6nZxRSbVG52aRfYEzgaHBf9rQ= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx; d=amazonses.com; t=1747312329; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=uUYo/xZmHuyn9Wlcbxx3Wj2NY8qHv5erR3Btv1S1xaQ=; b=PgFURqHtAmhF8O2mE+t+yA/3IZ5NK1YYmUhEG2h3Wg1T77Tp5351SCSUJlq/SLa6 9TsHRZgVeA/j0gSGSQ8+GX5bHqg7QK+BFxz2V17r7IEzJ7fF31aAEpwkzwnmJscs/gJ Zj2+zabz7LUnl+z33FyIyDC88zWc3/sXTv7s1c8o= MIME-Version: 1.0 From: auh@yoctoproject.org To: Hongxu Jia Cc: openembedded-core@lists.openembedded.org Subject: [AUH] libgcrypt: upgrading to 1.11.1 SUCCEEDED Message-ID: <01010196d3ee40d0-431bb5a8-e5d3-48ac-a8d7-2429d31b44b6-000000@us-west-2.amazonses.com> Date: Thu, 15 May 2025 12:32:08 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2025.05.15-54.240.27.193 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 May 2025 12:32:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216663 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *libgcrypt* to *1.11.1* has Succeeded. Next steps: - apply the patch: git am 0001-libgcrypt-upgrade-1.11.0-1.11.1.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 dc2cacf7c50a12993fc7719636643203c1bd6468 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 15 May 2025 12:24:39 +0000 Subject: [PATCH] libgcrypt: upgrade 1.11.0 -> 1.11.1 --- ...01-libgcrypt-fix-m4-file-for-oe-core.patch | 8 +-- ...ilding-error-with-O2-in-sysroot-path.patch | 49 ------------------- ...m-fix-undefined-reference-to-pthread.patch | 9 ++-- .../libgcrypt/files/no-bench-slope.patch | 10 ++-- .../libgcrypt/files/no-native-gpg-error.patch | 10 +++- ...ibgcrypt_1.11.0.bb => libgcrypt_1.11.1.bb} | 3 +- 6 files changed, 23 insertions(+), 66 deletions(-) delete mode 100644 meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch rename meta/recipes-support/libgcrypt/{libgcrypt_1.11.0.bb => libgcrypt_1.11.1.bb} (91%) diff --git a/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch index 9615611f6e..7b840644d4 100644 --- a/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch +++ b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch @@ -1,4 +1,4 @@ -From bcfd89abdb5110b93314297120412d4c7f2da313 Mon Sep 17 00:00:00 2001 +From fcb53181b18c00083a8b08625db74829cfd6b4b2 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Tue, 29 Oct 2019 14:08:32 -0400 Subject: [PATCH] libgcrypt: fix m4 file for oe-core @@ -11,13 +11,12 @@ settings. Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Trevor Gamblin - --- src/libgcrypt.m4 | 90 +++--------------------------------------------- 1 file changed, 4 insertions(+), 86 deletions(-) diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4 -index 353df81b6d..b195e22894 100644 +index 353df81..b195e22 100644 --- a/src/libgcrypt.m4 +++ b/src/libgcrypt.m4 @@ -116,41 +116,6 @@ dnl @@ -144,6 +143,3 @@ index 353df81b6d..b195e22894 100644 ifelse([$3], , :, [$3]) fi AC_SUBST(LIBGCRYPT_CFLAGS) --- -2.34.1 - diff --git a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch deleted file mode 100644 index 78b02eda9d..0000000000 --- a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e96df0c82e086bf348753d2d0fa37fa6191b4b14 Mon Sep 17 00:00:00 2001 -From: "simit.ghane" -Date: Tue, 11 Jun 2024 07:22:28 +0530 -Subject: [PATCH] random:cipher: handle substitution in sed command - -Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=e96df0c82e086bf348753d2d0fa37fa6191b4b14] - -* cipher/Makefile.am (o_flag_munging): Add 'g' flag for first sed -expression. -* random/Makefile.am (o_flag_munging): Likewise. --- - -It was there earlier and accidentally removed from -Makefile.am of cipher and random - -Signed-off-by: simit.ghane -[jk: add changelog to commit message] -Signed-off-by: Jussi Kivilinna ---- - cipher/Makefile.am | 2 +- - random/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cipher/Makefile.am b/cipher/Makefile.am -index ea9014cc98..149c9f2101 100644 ---- a/cipher/Makefile.am -+++ b/cipher/Makefile.am -@@ -169,7 +169,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c - - - if ENABLE_O_FLAG_MUNGING --o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' -+o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g' - else - o_flag_munging = cat - endif -diff --git a/random/Makefile.am b/random/Makefile.am -index c7100ef8b8..a42e430649 100644 ---- a/random/Makefile.am -+++ b/random/Makefile.am -@@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h - - # The rndjent module needs to be compiled without optimization. */ - if ENABLE_O_FLAG_MUNGING --o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g' -+o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g' - else - o_flag_munging = cat - endif diff --git a/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch b/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch index 4233fa7877..ccf4e18910 100644 --- a/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch +++ b/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch @@ -1,4 +1,4 @@ -From 9182bc2dc676858a823c477d8f45a578b8c4f69f Mon Sep 17 00:00:00 2001 +From c7a99e7a15f1f703ac90fc2a16b2c2115a66a996 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Sun, 12 Jun 2016 04:44:29 -0400 Subject: [PATCH] tests/Makefile.am: fix undefined reference to @@ -9,16 +9,15 @@ Add missing '-lpthread' to CFLAGS Upstream-Status: Pending Signed-off-by: Hongxu Jia - --- tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index e6953fd..f47e1d3 100644 +index 3170a58..9a9e1c2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -76,7 +76,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ +@@ -93,7 +93,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ t_secmem_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@ @@ -27,7 +26,7 @@ index e6953fd..f47e1d3 100644 testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE) # Build a version of the test driver for the build platform. -@@ -95,7 +95,7 @@ else +@@ -112,7 +112,7 @@ else xtestsuite_libs = ../src/.libs/libgcrypt.so* xtestsuite_driver = testdrv t_kdf_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@ diff --git a/meta/recipes-support/libgcrypt/files/no-bench-slope.patch b/meta/recipes-support/libgcrypt/files/no-bench-slope.patch index ed65ed4e67..44aac1913e 100644 --- a/meta/recipes-support/libgcrypt/files/no-bench-slope.patch +++ b/meta/recipes-support/libgcrypt/files/no-bench-slope.patch @@ -1,3 +1,8 @@ +From eb3a5bc4d5a212da64c0f9396c7f31f83aa6f36c Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 9 Sep 2022 11:13:37 +0100 +Subject: [PATCH] libgcrypt: disable bench-slope test case + The bench-slope test appears to be aborting fairly frequently, which causes failures on the autobuilder. @@ -10,10 +15,10 @@ Signed-off-by: Ross Burton 1 file changed, 1 deletion(-) diff --git a/tests/testdrv.c b/tests/testdrv.c -index bfca4c2314..5a755f512e 100644 +index 634b718..1e9dddb 100644 --- a/tests/testdrv.c +++ b/tests/testdrv.c -@@ -77,7 +77,6 @@ static struct { +@@ -76,7 +76,6 @@ static struct { { "t-x448" }, { "t-ed448" }, { "benchmark" }, @@ -21,4 +26,3 @@ index bfca4c2314..5a755f512e 100644 { "hashtest-6g", "hashtest", "--hugeblock --gigs 6 SHA1 SHA256 SHA512 " "SHA3-512 SM3 BLAKE2S_256 " "BLAKE2B_512 CRC32 " - diff --git a/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch b/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch index b9a607863d..98874ce12a 100644 --- a/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch +++ b/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch @@ -1,11 +1,19 @@ +From ede03b847038afc294e206ca345d12d75bbba844 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 26 Aug 2022 15:23:37 +0100 +Subject: [PATCH] libgcrypt: rewrite ptest + Don't depend on a native libgpg-error to build the test driver, as it's an optional dependency for some C annotations. Upstream-Status: Inappropriate Signed-off-by: Ross Burton +--- + tests/testdrv.c | 1 - + 1 file changed, 1 deletion(-) diff --git a/tests/testdrv.c b/tests/testdrv.c -index 0ccde326..6d6abd57 100644 +index bfca4c2..634b718 100644 --- a/tests/testdrv.c +++ b/tests/testdrv.c @@ -32,7 +32,6 @@ diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb similarity index 91% rename from meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb rename to meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb index ea1f34e8ce..e51a20e5bf 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb @@ -20,13 +20,12 @@ DEPENDS = "libgpg-error" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0001-libgcrypt-fix-m4-file-for-oe-core.patch \ - file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \ file://no-native-gpg-error.patch \ file://no-bench-slope.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c" +SRC_URI[sha256sum] = "24e91c9123a46c54e8371f3a3a2502f1198f2893fbfbf59af95bc1c21499b00e" BINCONFIG = "${bindir}/libgcrypt-config"