From 1e7f5587236831893f25d2147cdc939136c23c7e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 26 Apr 2022 13:38:35 +0200 Subject: [PATCH] package/libgcrypt: bump to version 1.10.1 remove upstream patch Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...re.ac-add-an-option-to-disable-tests.patch | 2 +- ...entropy-Include-fcntl-h-and-limits-h.patch | 38 ------------------- package/libgcrypt/libgcrypt.hash | 4 +- package/libgcrypt/libgcrypt.mk | 2 +- 4 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch diff --git a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch index e32f938634..5ddde9df1b 100644 --- a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch +++ b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch @@ -44,7 +44,7 @@ diff --git a/configure.ac b/configure.ac index e8c8cd39..1a6b61e5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3230,6 +3230,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], +@@ -3231,6 +3231,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno]) diff --git a/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch deleted file mode 100644 index 8f76f24c64..0000000000 --- a/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ffaef0be613121d3ee37867d82932a7a30c2bc6d Mon Sep 17 00:00:00 2001 -From: Heiko Becker -Date: Thu, 3 Feb 2022 22:46:41 +0000 -Subject: [PATCH] jitterentropy: Include and - -* random/jitterentropy-base-user.h: Include for O_RDONLY -* random/jitterentropy-base-user.h: Include for LONG_MAX - --- - -Fixes the build with musl libc. - -Signed-off-by: Heiko Becker - -[Retrieved from: -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=ffaef0be613121d3ee37867d82932a7a30c2bc6d] -Signed-off-by: Fabrice Fontaine ---- - random/jitterentropy-base-user.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/random/jitterentropy-base-user.h b/random/jitterentropy-base-user.h -index 326dfbed..389106ff 100644 ---- a/random/jitterentropy-base-user.h -+++ b/random/jitterentropy-base-user.h -@@ -39,6 +39,9 @@ - * DAMAGE. - */ - -+#include -+#include -+ - #ifndef GCRYPT_JITTERENTROPY_BASE_USER_H - #define GCRYPT_JITTERENTROPY_BASE_USER_H - --- -2.11.0 - diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 2ea4d74c2e..96f5e6b76c 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.0.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.1.tar.bz2.sig # using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81 libgcrypt-1.10.0.tar.bz2 +sha256 ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de libgcrypt-1.10.1.tar.bz2 sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index c6c88f6076..f28552c6e7 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.10.0 +LIBGCRYPT_VERSION = 1.10.1 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB