From 2ea3b5d5cc9ec171e9e66d31a4bc677337b4defb Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sun, 15 Mar 2026 13:20:39 +0000 Subject: [PATCH] libgcrypt: upgrade 1.12.0 -> 1.12.1 --- .../0001-libgcrypt-fix-m4-file-for-oe-core.patch | 2 +- ...001-tests-Fix-link-errors-for-t-thread-local.patch | 9 +++------ ...kefile.am-fix-undefined-reference-to-pthread.patch | 11 ++++------- .../libgcrypt/files/no-bench-slope.patch | 2 +- .../libgcrypt/files/no-native-gpg-error.patch | 4 ++-- .../{libgcrypt_1.12.0.bb => libgcrypt_1.12.1.bb} | 2 +- 6 files changed, 12 insertions(+), 18 deletions(-) rename meta/recipes-support/libgcrypt/{libgcrypt_1.12.0.bb => libgcrypt_1.12.1.bb} (95%) 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 e60507e636..4c08b73cf8 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 3bc536529c9bbe1e62d1c1127abee6183ed64298 Mon Sep 17 00:00:00 2001 +From 2ac3d5d09ee8fabfc6ca75dbc238bbd215d3e6ac 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 diff --git a/meta/recipes-support/libgcrypt/files/0001-tests-Fix-link-errors-for-t-thread-local.patch b/meta/recipes-support/libgcrypt/files/0001-tests-Fix-link-errors-for-t-thread-local.patch index 8dc2fe328c..ba439ca675 100644 --- a/meta/recipes-support/libgcrypt/files/0001-tests-Fix-link-errors-for-t-thread-local.patch +++ b/meta/recipes-support/libgcrypt/files/0001-tests-Fix-link-errors-for-t-thread-local.patch @@ -1,4 +1,4 @@ -From 942e232ded48fa08d2bda417ae8ad8c03d644372 Mon Sep 17 00:00:00 2001 +From dd98542d8ae0476beb5368e4eda6711e1e9617fc Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Wed, 27 Aug 2025 11:49:06 +0800 Subject: [PATCH] tests: Fix link errors for t-thread-local. @@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 4800135..f0f7adb 100644 +index b5ad74c..b7de27d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -98,7 +98,7 @@ testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ +@@ -102,7 +102,7 @@ testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@ t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread t_thread_local_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@ @@ -33,6 +33,3 @@ index 4800135..f0f7adb 100644 testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE) # Build a version of the test driver for the build platform. --- -2.34.1 - 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 bbd48ebeee..ea5c20d804 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 a3496435dcc223a914eec5e61e853934fd4eb635 Mon Sep 17 00:00:00 2001 +From 03021f9a060ab32b3c0eec69f0e1bd56cbe97692 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 27 Aug 2025 11:46:17 +0800 Subject: [PATCH] tests/Makefile.am: fix undefined reference to @@ -14,10 +14,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 93daf3c..4800135 100644 +index 4f42925..b5ad74c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -96,7 +96,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ +@@ -100,7 +100,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@ @@ -26,7 +26,7 @@ index 93daf3c..4800135 100644 t_thread_local_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@ t_thread_local_CFLAGS = $(GPG_ERROR_MT_CFLAGS) testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE) -@@ -117,7 +117,7 @@ else +@@ -122,7 +122,7 @@ else xtestsuite_libs = ../src/.libs/libgcrypt.so* xtestsuite_driver = testdrv t_kdf_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@ @@ -35,6 +35,3 @@ index 93daf3c..4800135 100644 endif # xcheck uses our new testdrv instead of the automake test runner. --- -2.34.1 - diff --git a/meta/recipes-support/libgcrypt/files/no-bench-slope.patch b/meta/recipes-support/libgcrypt/files/no-bench-slope.patch index 606cca1344..b47cdad81d 100644 --- a/meta/recipes-support/libgcrypt/files/no-bench-slope.patch +++ b/meta/recipes-support/libgcrypt/files/no-bench-slope.patch @@ -1,4 +1,4 @@ -From 254821a620c1f7d6542c23dbe555e7c02637a3f8 Mon Sep 17 00:00:00 2001 +From f05fd2d4551e8a2c8c5217c83ec6b0304a253513 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 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 98874ce12a..cf36ee9cc1 100644 --- a/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch +++ b/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch @@ -1,4 +1,4 @@ -From ede03b847038afc294e206ca345d12d75bbba844 Mon Sep 17 00:00:00 2001 +From 6b782efe2ccbdf88de427a52838724193993a6d0 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 26 Aug 2022 15:23:37 +0100 Subject: [PATCH] libgcrypt: rewrite ptest @@ -13,7 +13,7 @@ Signed-off-by: Ross Burton 1 file changed, 1 deletion(-) diff --git a/tests/testdrv.c b/tests/testdrv.c -index bfca4c2..634b718 100644 +index 7743258..bffa3cc 100644 --- a/tests/testdrv.c +++ b/tests/testdrv.c @@ -32,7 +32,6 @@ diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.12.0.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.12.1.bb similarity index 95% rename from meta/recipes-support/libgcrypt/libgcrypt_1.12.0.bb rename to meta/recipes-support/libgcrypt/libgcrypt_1.12.1.bb index 7638cb0847..b3c0d050b7 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.12.0.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.12.1.bb @@ -26,7 +26,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://no-bench-slope.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "0311454e678189bad62a7e9402a9dd793025efff6e7449898616e2fc75e0f4f5" +SRC_URI[sha256sum] = "7df5c08d952ba33f9b6bdabdb06a61a78b2cf62d2122c2d1d03a91a79832aa3c" BINCONFIG = "${bindir}/libgcrypt-config" -- 2.47.1