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..ad071e07f5 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 4f27b68f509c94739d8d7c5e5c8bc1b0b17259ad 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 19a925c2c6..6200ac0a31 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 4a8d31b6e1af1d2764e159d5825ad2241a74fe7b 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,18 +21,15 @@ 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 3baaf48..cc2fd6b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -102,7 +102,7 @@ testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ +@@ -103,7 +103,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_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 - + t_cipher_internal_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/cipher + t_sntrup761_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/cipher 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 090948c3c5..924ece8b8e 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 6322f759b58ba78d5b01c09c19d91571e999334c 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 8c468b4..3baaf48 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -100,7 +100,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ +@@ -101,7 +101,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) -@@ -122,7 +122,7 @@ else +@@ -125,7 +125,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..849f8b0361 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 50bfe58f1ffa6a8519377f4c10e5d41133d8782a 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..f22f6993a2 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 a7778057e08273041c48e10ff2f4c7dcce9220c1 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.2.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.12.3.bb similarity index 44% rename from meta/recipes-support/libgcrypt/libgcrypt_1.12.2.bb rename to meta/recipes-support/libgcrypt/libgcrypt_1.12.3.bb index deb053031e..af5f00dbfa 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.12.2.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.12.3.bb @@ -1,3 +1,53 @@ +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. +# The following is the difference between the old and the new license text. +# Please update the LICENSE value if needed, and summarize the changes in +# the commit message via 'License-Update:' tag. +# (example: 'License-Update: copyright years updated.') +# +# The changes: +# +# --- LICENSES +# +++ LICENSES +# @@ -61,6 +61,36 @@ +# +# #+begin_quote +# Copyright (c) 2021-2022, Intel Corporation +# + +# + Redistribution and use in source and binary forms, with or without +# + modification, are permitted provided that the following conditions are met: +# + +# + * Redistributions of source code must retain the above copyright notice, +# + this list of conditions and the following disclaimer. +# + * Redistributions in binary form must reproduce the above copyright +# + notice, this list of conditions and the following disclaimer in the +# + documentation and/or other materials provided with the distribution. +# + * Neither the name of Intel Corporation nor the names of its contributors +# + may be used to endorse or promote products derived from this software +# + without specific prior written permission. +# + +# + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +# + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +#+end_quote +# + +# + For files: +# + - cipher/sm3-intel-avx2-amd64.S +# + +# +#+begin_quote +# + Copyright (c) 2023-2024, Intel Corporation +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# + SUMMARY = "General purpose cryptographic library based on the code from GnuPG" DESCRIPTION = "A cryptography library developed as a separated module of GnuPG. \ It can also be used independently of GnuPG, but depends on its error-reporting \ @@ -12,7 +62,7 @@ LICENSE:${PN}-dev = "GPL-2.0-or-later AND LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce \ file://COPYING.LIB;md5=4bf661c1e3793e55c8d1051bc5e0ae21 \ - file://LICENSES;md5=034b4e369944ad4b52a68368f1cf98b8 \ + file://LICENSES;md5=47e346a71a2593d19f741408407fe91f \ " DEPENDS = "libgpg-error" @@ -26,7 +76,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://no-bench-slope.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "7ce33c2492221a0436f96a8500215e9f3e3dcb5fd26a757cd415e7a843babd5e" +SRC_URI[sha256sum] = "98d1b0b3202d2b03fa754a35aa3cbbfcf526a3260d8d2ee213748001b1043006" BINCONFIG = "${bindir}/libgcrypt-config"