License-Update: Remove occurrences of old FSF postal address[1] ChangeLog: https://github.com/gpg/libgcrypt/blob/libgcrypt-1.12.0/NEWS
[1] https://github.com/gpg/libgcrypt/commit/67b8da4ef62734927e061327efa9a6f48616d114 Signed-off-by: Yi Zhao <[email protected]> --- .../files/0001-libgcrypt-fix-m4-file-for-oe-core.patch | 6 +++--- .../libgcrypt/files/no-bench-slope.patch | 10 +++++----- .../{libgcrypt_1.11.2.bb => libgcrypt_1.12.0.bb} | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) rename meta/recipes-support/libgcrypt/{libgcrypt_1.11.2.bb => libgcrypt_1.12.0.bb} (88%) 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 7b840644d4..e60507e636 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 fcb53181b18c00083a8b08625db74829cfd6b4b2 Mon Sep 17 00:00:00 2001 +From 3bc536529c9bbe1e62d1c1127abee6183ed64298 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin <[email protected]> Date: Tue, 29 Oct 2019 14:08:32 -0400 Subject: [PATCH] libgcrypt: fix m4 file for oe-core @@ -16,7 +16,7 @@ Signed-off-by: Trevor Gamblin <[email protected]> 1 file changed, 4 insertions(+), 86 deletions(-) diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4 -index 353df81..b195e22 100644 +index 7cb05ba..0501e0d 100644 --- a/src/libgcrypt.m4 +++ b/src/libgcrypt.m4 @@ -116,41 +116,6 @@ dnl @@ -34,7 +34,7 @@ index 353df81..b195e22 100644 - fi - - use_gpgrt_config="" -- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if test x"$GPGRT_CONFIG" != x && test "$GPGRT_CONFIG" != "no"; then - if $GPGRT_CONFIG libgcrypt --exists; then - LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt" - AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config]) diff --git a/meta/recipes-support/libgcrypt/files/no-bench-slope.patch b/meta/recipes-support/libgcrypt/files/no-bench-slope.patch index 44aac1913e..606cca1344 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 eb3a5bc4d5a212da64c0f9396c7f31f83aa6f36c Mon Sep 17 00:00:00 2001 +From 254821a620c1f7d6542c23dbe555e7c02637a3f8 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Fri, 9 Sep 2022 11:13:37 +0100 Subject: [PATCH] libgcrypt: disable bench-slope test case @@ -15,12 +15,12 @@ Signed-off-by: Ross Burton <[email protected]> 1 file changed, 1 deletion(-) diff --git a/tests/testdrv.c b/tests/testdrv.c -index 634b718..1e9dddb 100644 +index bffa3cc..a228a28 100644 --- a/tests/testdrv.c +++ b/tests/testdrv.c -@@ -76,7 +76,6 @@ static struct { - { "t-x448" }, - { "t-ed448" }, +@@ -79,7 +79,6 @@ static struct { + { "t-mlkem" }, + { "t-mldsa" }, { "benchmark" }, - { "bench-slope" }, { "hashtest-6g", "hashtest", "--hugeblock --gigs 6 SHA1 SHA256 SHA512 " diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.11.2.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.12.0.bb similarity index 88% rename from meta/recipes-support/libgcrypt/libgcrypt_1.11.2.bb rename to meta/recipes-support/libgcrypt/libgcrypt_1.12.0.bb index d0236b58b3..7638cb0847 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.11.2.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.12.0.bb @@ -10,8 +10,8 @@ LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & BSD-3-Clause" LICENSE:${PN} = "LGPL-2.1-or-later & BSD-3-Clause" LICENSE:${PN}-dev = "GPL-2.0-or-later & LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce \ + file://COPYING.LIB;md5=4bf661c1e3793e55c8d1051bc5e0ae21 \ file://LICENSES;md5=034b4e369944ad4b52a68368f1cf98b8 \ " @@ -26,7 +26,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://no-bench-slope.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "6ba59dd192270e8c1d22ddb41a07d95dcdbc1f0fb02d03c4b54b235814330aac" +SRC_URI[sha256sum] = "0311454e678189bad62a7e9402a9dd793025efff6e7449898616e2fc75e0f4f5" BINCONFIG = "${bindir}/libgcrypt-config" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#230710): https://lists.openembedded.org/g/openembedded-core/message/230710 Mute This Topic: https://lists.openembedded.org/mt/117715876/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
