libgcrypt: update to 1.10.2

update 1.8.7 (2020-10-23) to 1.10.1 (2023-04-07)
changelog:
- https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob_plain;f=NEWS
- https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;h=32b580a8d2823e066a59853ac2ae59a3b7b610a5;hb=05422ca24a0391dad2a0b7790a904ce348819c10
- https://github.com/gpg/libgcrypt/tags

In review this - http://lists.busybox.net/pipermail/buildroot/2019-July/253921.html
in relation to the removal of the patch.

The upstream patch that is included in >= 1.9.0 fixes the issue.
0f4545b441
This commit is contained in:
heitbaum 2021-01-21 05:34:54 +00:00 committed by Rudi Heitbaum
parent 19dacd58ae
commit f5f014985b
3 changed files with 12 additions and 39 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libgcrypt"
PKG_VERSION="1.8.7"
PKG_SHA256="03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748"
PKG_VERSION="1.10.2"
PKG_SHA256="3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03"
PKG_LICENSE="GPLv2"
PKG_SITE="https://www.gnupg.org/"
PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgcrypt/${PKG_NAME}-${PKG_VERSION}.tar.bz2"

View File

@ -1,24 +1,24 @@
diff -Naur libgcrypt-1.4.6/cipher/Makefile.am libgcrypt-1.4.6.patch/cipher/Makefile.am
--- libgcrypt-1.4.6/cipher/Makefile.am 2009-12-11 16:31:38.000000000 +0100
+++ libgcrypt-1.4.6.patch/cipher/Makefile.am 2011-05-08 03:21:56.463021968 +0200
@@ -68,7 +68,7 @@
camellia.c camellia.h camellia-glue.c
@@ -153,7 +153,7 @@
if ENABLE_O_FLAG_MUNGING
-o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g'
+o_flag_munging = sed -e 's/-O\([2-9s][2-9s]\)/-O1/' -e 's/-Ofast/-O1/g'
-o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g'
+o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]\)/-O1/' -e 's/-Ofast/-O1/g'
else
o_flag_munging = cat
endif
diff -Naur libgcrypt-1.4.6/cipher/Makefile.in libgcrypt-1.4.6.patch/cipher/Makefile.in
--- libgcrypt-1.4.6/cipher/Makefile.in 2010-07-13 17:42:20.000000000 +0200
+++ libgcrypt-1.4.6.patch/cipher/Makefile.in 2011-05-08 03:22:12.059208971 +0200
@@ -274,7 +274,7 @@
camellia.c camellia.h camellia-glue.c
@@ -602,7 +602,7 @@
blake2b-amd64-avx2.S blake2s-amd64-avx.S
@ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat
-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g'
+@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9s][2-9s]\)/-O1/' -e 's/-Ofast/-O1/g'
all: all-am
-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g'
+@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]\)/-O1/' -e 's/-Ofast/-O1/g'
@ENABLE_INSTRUMENTATION_MUNGING_FALSE@instrumentation_munging = cat
.SUFFIXES:
# We need to disable instrumentation for these modules as they use cc as

View File

@ -1,27 +0,0 @@
diff --git a/acinclude.m4 b/acinclude.m4
index a7bc0fa..1a5bffc 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -76,13 +76,14 @@ case "${host}" in
i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp)
ac_cv_sys_symbol_underscore=yes
;;
- *)
- if test "$cross_compiling" = yes; then
- if test "x$ac_cv_sys_symbol_underscore" = x ; then
- ac_cv_sys_symbol_underscore=yes
- fi
- else
- tmp_do_check="yes"
+ *) if test -z "$ac_cv_sys_symbol_underscore"; then
+ if test "$cross_compiling" = yes; then
+ if test "x$ac_cv_sys_symbol_underscore" = x ; then
+ ac_cv_sys_symbol_underscore=yes
+ fi
+ else
+ tmp_do_check="yes"
+ fi
fi
;;
esac