mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 00:32:13 +02:00
libgcrypt: upgrade 1.11.0 -> 1.11.1
(From OE-Core rev: 73bcdedc80a83e241d2162b10a2244a8dbd0e403) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongxu Jia
committed by
Richard Purdie
Richard Purdie
parent
9aef708f44
commit
fa96265154
@@ -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 <trevor.gamblin@windriver.com>
|
||||
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 <trevor.gamblin@windriver.com>
|
||||
|
||||
---
|
||||
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
|
||||
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
From e96df0c82e086bf348753d2d0fa37fa6191b4b14 Mon Sep 17 00:00:00 2001
|
||||
From: "simit.ghane" <simit.ghane@lge.com>
|
||||
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 <simit.ghane@lge.com>
|
||||
[jk: add changelog to commit message]
|
||||
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
|
||||
---
|
||||
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
|
||||
@@ -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 <hongxu.jia@windriver.com>
|
||||
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 <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
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@
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
From eb3a5bc4d5a212da64c0f9396c7f31f83aa6f36c Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@arm.com>
|
||||
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 <ross.burton@arm.com>
|
||||
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 "
|
||||
|
||||
|
||||
@@ -1,11 +1,19 @@
|
||||
From ede03b847038afc294e206ca345d12d75bbba844 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@arm.com>
|
||||
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 <ross.burton@arm.com>
|
||||
---
|
||||
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 @@
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user