diff mbox series

[3/3] libgcrypt: 1.11.1 -> 1.11.2

Message ID 20250827051852.3900650-3-hongxu.jia@windriver.com
State New
Headers show
Series [1/3] rpcbind: 1.2.7 -> 1.2.8 | expand

Commit Message

Hongxu Jia Aug. 27, 2025, 5:18 a.m. UTC 
Refresh patches:
- 0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
- 0001-tests-Fix-link-errors-for-t-thread-local.patch

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 ...s-Fix-link-errors-for-t-thread-local.patch | 20 +++++++++++--------
 ...m-fix-undefined-reference-to-pthread.patch | 17 +++++++++-------
 ...ibgcrypt_1.11.1.bb => libgcrypt_1.11.2.bb} |  2 +-
 3 files changed, 23 insertions(+), 16 deletions(-)
 rename meta/recipes-support/libgcrypt/{libgcrypt_1.11.1.bb => libgcrypt_1.11.2.bb} (95%)
diff mbox series

Patch

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 5ebc3831d4a..8dc2fe328c1 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,6 +1,6 @@ 
-From 746dc1c3837546c1085102e546a83da8d1c773e1 Mon Sep 17 00:00:00 2001
+From 942e232ded48fa08d2bda417ae8ad8c03d644372 Mon Sep 17 00:00:00 2001
 From: Collin Funk <collin.funk1@gmail.com>
-Date: Thu, 1 May 2025 22:20:58 -0700
+Date: Wed, 27 Aug 2025 11:49:06 +0800
 Subject: [PATCH] tests: Fix link errors for t-thread-local.
 
 On platforms where pthread_create is not in libc t-thread-local fails to
@@ -15,20 +15,24 @@  Upstream-Status: Backport [793eda7b258a562757b51c96044b103b638f1a63]
 GnuPG-bug-id: 7634
 Signed-off-by: Collin Funk <collin.funk1@gmail.com>
 Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
- tests/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
+ tests/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 9a9e1c2c264a..b80f266f97c2 100644
+index 4800135..f0f7adb 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -94,6 +94,8 @@ t_secmem_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
- testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
+@@ -98,7 +98,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@
+ t_thread_local_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
+-t_thread_local_CFLAGS = $(GPG_ERROR_MT_CFLAGS)
 +t_thread_local_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread
  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 ccf4e18910b..bbd48ebeee3 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,6 +1,6 @@ 
-From c7a99e7a15f1f703ac90fc2a16b2c2115a66a996 Mon Sep 17 00:00:00 2001
+From a3496435dcc223a914eec5e61e853934fd4eb635 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Sun, 12 Jun 2016 04:44:29 -0400
+Date: Wed, 27 Aug 2025 11:46:17 +0800
 Subject: [PATCH] tests/Makefile.am: fix undefined reference to
  `pthread_create'
 
@@ -14,19 +14,19 @@  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 3170a58..9a9e1c2 100644
+index 93daf3c..4800135 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -93,7 +93,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
+@@ -96,7 +96,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@
 -t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS)
 +t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread
+ 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)
- 
- # Build a version of the test driver for the build platform.
-@@ -112,7 +112,7 @@ else
+@@ -117,7 +117,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,3 +35,6 @@  index 3170a58..9a9e1c2 100644
  endif
  
  # xcheck uses our new testdrv instead of the automake test runner.
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.11.2.bb
similarity index 95%
rename from meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb
rename to meta/recipes-support/libgcrypt/libgcrypt_1.11.2.bb
index 14cbe536473..d0236b58b31 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.11.2.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] = "24e91c9123a46c54e8371f3a3a2502f1198f2893fbfbf59af95bc1c21499b00e"
+SRC_URI[sha256sum] = "6ba59dd192270e8c1d22ddb41a07d95dcdbc1f0fb02d03c4b54b235814330aac"
 
 BINCONFIG = "${bindir}/libgcrypt-config"