mirror of
https://git.yoctoproject.org/poky
synced 2026-05-07 16:59:22 +00:00
libgcrypt: upgrade 1.10.3 -> 1.11.0
Changelog: ========== https://lists.gnu.org/archive/html/info-gnu/2024-06/msg00004.html License-Update: -Add 3-clause BSD license for poly1305-amd64-avx512.S. -cipher/Makefile.am: Add 'poly1305-amd64-avx512.S'. -cipher/poly1305-amd64-avx512.S: New. -cipher/poly1305-internal.h (POLY1305_USE_AVX512): New. -Add 'cipher/keccak-amd64-avx512.S'. -Update license docs for FSF new address and update gcrypt.texi. Apart from upgrade also refreshed the patches like 0001-libgcrypt-fix-m4-file-for-oe-core.patch 0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch no-bench-slope.patch In 0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch reverted back the change in cipher/Makefile.am related to o_flag_munging (From OE-Core rev: aa50e6bc8dcb3f5870e1fa285ec5ab997a7a59cf) Signed-off-by: simit.ghane <simit.ghane@lge.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
simit.ghane
committed by
Richard Purdie
Richard Purdie
parent
4e1b106c07
commit
1dda68d7f2
@@ -17,13 +17,13 @@ Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
|
||||
1 file changed, 4 insertions(+), 86 deletions(-)
|
||||
|
||||
diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
|
||||
index cd4249e..e53a36f 100644
|
||||
index 353df81b6d..b195e22894 100644
|
||||
--- a/src/libgcrypt.m4
|
||||
+++ b/src/libgcrypt.m4
|
||||
@@ -29,41 +29,6 @@ dnl is added to the gpg_config_script_warn variable.
|
||||
dnl
|
||||
@@ -116,41 +116,6 @@ dnl
|
||||
AC_DEFUN([AM_PATH_LIBGCRYPT],
|
||||
[ AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
[ AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
|
||||
- AC_ARG_WITH(libgcrypt-prefix,
|
||||
- AS_HELP_STRING([--with-libgcrypt-prefix=PFX],
|
||||
- [prefix where LIBGCRYPT is installed (optional)]),
|
||||
@@ -62,7 +62,7 @@ index cd4249e..e53a36f 100644
|
||||
|
||||
tmp=ifelse([$1], ,1:1.2.0,$1)
|
||||
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
|
||||
@@ -74,56 +39,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
||||
@@ -161,56 +126,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
||||
min_libgcrypt_version="$tmp"
|
||||
fi
|
||||
|
||||
@@ -122,7 +122,7 @@ index cd4249e..e53a36f 100644
|
||||
if test "$tmp" -gt 0 ; then
|
||||
AC_MSG_CHECKING([LIBGCRYPT API version])
|
||||
if test "$req_libgcrypt_api" -eq "$tmp" ; then
|
||||
@@ -136,11 +58,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
||||
@@ -223,11 +145,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
||||
fi
|
||||
fi
|
||||
if test $ok = yes; then
|
||||
@@ -135,7 +135,7 @@ index cd4249e..e53a36f 100644
|
||||
else
|
||||
libgcrypt_config_host=`$LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none`
|
||||
fi
|
||||
@@ -158,8 +78,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
||||
@@ -245,8 +165,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
||||
fi
|
||||
fi
|
||||
else
|
||||
@@ -144,3 +144,6 @@ index cd4249e..e53a36f 100644
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(LIBGCRYPT_CFLAGS)
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
||||
+15
-36
@@ -1,40 +1,19 @@
|
||||
From 7d9817ca935a35fe6c8e2c2c7615825fa08a3a19 Mon Sep 17 00:00:00 2001
|
||||
From e96df0c82e086bf348753d2d0fa37fa6191b4b14 Mon Sep 17 00:00:00 2001
|
||||
From: "simit.ghane" <simit.ghane@lge.com>
|
||||
Date: Tue, 7 May 2024 14:09:03 +0530
|
||||
Subject: [PATCHV2] Fix building error with '-O2' in sysroot path
|
||||
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=7d9817ca935a35fe6c8e2c2c7615825fa08a3a19
|
||||
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=e96df0c82e086bf348753d2d0fa37fa6191b4b14
|
||||
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=5afadba008918d651afefb842ae123cc18454c74]
|
||||
|
||||
* cipher/Makefile.am (o_flag_munging): Tweak the sed script.
|
||||
* random/Makefile.am (o_flag_munging): Ditto.
|
||||
--
|
||||
|
||||
Characters like '-O2' or '-Ofast' will be replaced by '-O1' and '-O0'
|
||||
respectively when compiling cipher and random in the filesystem
|
||||
paths as well if they happen to contain '-O2' or '-Ofast
|
||||
|
||||
If we are cross compiling libgcrypt and sysroot contains such
|
||||
characters, we would
|
||||
get compile errors because the sysroot path has been modified.
|
||||
|
||||
Fix this by adding blank spaces and tabs before the original matching
|
||||
pattern in the sed command.
|
||||
|
||||
Signed-off-by: simit.ghane <simit.ghane@lge.com>
|
||||
|
||||
ChangeLog entries added by wk
|
||||
|
||||
Note that there is also the configure option --disable-O-flag-munging;
|
||||
see the README.
|
||||
|
||||
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>
|
||||
---
|
||||
@@ -43,27 +22,27 @@ Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
|
||||
index c3d642b2ac..f1c3971c40 100644
|
||||
index ea9014cc98..149c9f2101 100644
|
||||
--- a/cipher/Makefile.am
|
||||
+++ b/cipher/Makefile.am
|
||||
@@ -153,7 +153,7 @@ gost-s-box: gost-s-box.c
|
||||
@@ -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/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g'
|
||||
+o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g'
|
||||
-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 0c935a0595..340df38a79 100644
|
||||
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/-O\([1-9sgz][1-9sgz]*\)/-O0/g' -e 's/-Ofast/-O0/g'
|
||||
-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
|
||||
|
||||
@@ -5,9 +5,12 @@ Until this has been root-caused, disable the test.
|
||||
|
||||
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..d3455186 100644
|
||||
index bfca4c2314..5a755f512e 100644
|
||||
--- a/tests/testdrv.c
|
||||
+++ b/tests/testdrv.c
|
||||
@@ -77,7 +77,6 @@ static struct {
|
||||
@@ -15,6 +18,7 @@ index 0ccde326..d3455186 100644
|
||||
{ "t-ed448" },
|
||||
{ "benchmark" },
|
||||
- { "bench-slope" },
|
||||
{ "hashtest-256g", "hashtest", "--gigs 256 SHA1 SHA256 SHA512 SM3",
|
||||
LONG_RUNNING },
|
||||
{ NULL }
|
||||
{ "hashtest-6g", "hashtest", "--hugeblock --gigs 6 SHA1 SHA256 SHA512 "
|
||||
"SHA3-512 SM3 BLAKE2S_256 "
|
||||
"BLAKE2B_512 CRC32 "
|
||||
|
||||
|
||||
+6
-7
@@ -6,14 +6,13 @@ HOMEPAGE = "http://directory.fsf.org/project/libgcrypt/"
|
||||
BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
|
||||
SECTION = "libs"
|
||||
|
||||
# helper program gcryptrnd and getrandom are under GPL, rest LGPL
|
||||
LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
|
||||
LICENSE:${PN} = "LGPL-2.1-or-later"
|
||||
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=94d55d512a9ba36caa9b7df079bae19f \
|
||||
file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
|
||||
file://LICENSES;md5=ef545b6cc717747072616519a1256d69 \
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
|
||||
file://LICENSES;md5=034b4e369944ad4b52a68368f1cf98b8 \
|
||||
"
|
||||
|
||||
DEPENDS = "libgpg-error"
|
||||
@@ -27,7 +26,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
|
||||
file://no-bench-slope.patch \
|
||||
file://run-ptest \
|
||||
"
|
||||
SRC_URI[sha256sum] = "8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa"
|
||||
SRC_URI[sha256sum] = "09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c"
|
||||
|
||||
BINCONFIG = "${bindir}/libgcrypt-config"
|
||||
|
||||
Reference in New Issue
Block a user