[packages/libgcrypt] up to 1.9.1 (critical security fix)

[atler]

commit d766691b701c8b22a3dfd12409fe879b78463bc4
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Jan 29 12:32:04 2021 +0100

    up to 1.9.1 (critical security fix)
    
    bug affects libgcrypt 1.9.0

 ...sic-fix-build-on-ARM32-when-NEON-disabled.patch | 41 ----------------------
 kdf-selftest.patch                                 | 31 ----------------
 libgcrypt-poll.patch                               |  6 ++--
 libgcrypt.spec                                     |  8 ++---
 4 files changed, 5 insertions(+), 81 deletions(-)
---
diff --git a/libgcrypt.spec b/libgcrypt.spec
index dfcb18b..b744044 100644
--- a/libgcrypt.spec
+++ b/libgcrypt.spec
@@ -8,17 +8,15 @@ Summary(es.UTF-8):	Libgcrypt es una biblioteca general de desarrole embasada em
 Summary(pl.UTF-8):	Biblioteka kryptograficzna oparta na kodzie GnuPG
 Summary(pt_BR.UTF-8):	libgcrypt é uma biblioteca de criptografia de uso geral baseada no GnuPG
 Name:		libgcrypt
-Version:	1.9.0
+Version:	1.9.1
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.gnupg.org/gcrypt/libgcrypt/%{name}-%{version}.tar.bz2
-# Source0-md5:	5ef99d1838092bc15c0ddafb22830a02
+# Source0-md5:	8805f3e466af315222b6e1864f52b79a
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-libgcrypt_config.patch
 Patch2:		%{name}-poll.patch
-Patch3:		kdf-selftest.patch
-Patch4:		0001-tests-basic-fix-build-on-ARM32-when-NEON-disabled.patch
 URL:		https://directory.fsf.org/wiki/Libgcrypt
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.14
@@ -123,8 +121,6 @@ Biblioteka statyczna dietlibc libgcrypt.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %{__rm} m4/libtool.m4
diff --git a/0001-tests-basic-fix-build-on-ARM32-when-NEON-disabled.patch b/0001-tests-basic-fix-build-on-ARM32-when-NEON-disabled.patch
deleted file mode 100644
index 7e6cdd1..0000000
--- a/0001-tests-basic-fix-build-on-ARM32-when-NEON-disabled.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From eb1aa965124ddd831fe569c70acc3459a6a93f87 Mon Sep 17 00:00:00 2001
-From: Jussi Kivilinna <jussi.kivilinna at iki.fi>
-Date: Tue, 19 Jan 2021 20:50:58 +0200
-Subject: [PATCH] tests/basic: fix build on ARM32 when NEON disabled
-
-* tests/basic.c (CLUTTER_VECTOR_REGISTER_NEON)
-(CLUTTER_VECTOR_REGISTER_AARCH64): Remove check for __ARM_FEATURE_SIMD32.
---
-
-Cluttering of NEON vector registers was enabled even if NEON was
-not active for current compiler target. Issue was caused by
-enabling NEON cluttering by wrong feature macro __ARM_FEATURE_SIMD32.
-
-GnuPG-bug-id: 5251
-Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
----
- tests/basic.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/basic.c b/tests/basic.c
-index 46e4c0f8..8b333bae 100644
---- a/tests/basic.c
-+++ b/tests/basic.c
-@@ -223,12 +223,12 @@ progress_handler (void *cb_data, const char *what, int printchar,
- # define CLUTTER_VECTOR_REGISTER_COUNT 8
- #elif defined(HAVE_COMPATIBLE_GCC_AARCH64_PLATFORM_AS) && \
-       defined(HAVE_GCC_INLINE_ASM_AARCH64_NEON) && \
--      (defined(__ARM_FEATURE_SIMD32) || defined(__ARM_NEON))
-+      defined(__ARM_NEON)
- # define CLUTTER_VECTOR_REGISTER_AARCH64 1
- # define CLUTTER_VECTOR_REGISTER_COUNT 32
- #elif defined(HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS) && \
-       defined(HAVE_GCC_INLINE_ASM_NEON) && \
--      (defined(__ARM_FEATURE_SIMD32) || defined(__ARM_NEON))
-+      defined(__ARM_NEON)
- # define CLUTTER_VECTOR_REGISTER_NEON 1
- # define CLUTTER_VECTOR_REGISTER_COUNT 16
- #endif
--- 
-2.27.0
-
diff --git a/kdf-selftest.patch b/kdf-selftest.patch
deleted file mode 100644
index 72e9721..0000000
--- a/kdf-selftest.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Jussi Kivilinna <jussi.kivilinna at iki.fi>
-Date: Tue, 19 Jan 2021 19:13:32 +0100
-Subject: [PATCH 1/2] kdf: add missing null-terminator for self-test test-vector array
-
-* cipher/kdf.c (selftest_pbkdf2): Add null-terminator to TV array.
---
-
-This was causing kdf sefl-test to fail on s390x builds.
-
-Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
----
- cipher/kdf.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/cipher/kdf.c b/cipher/kdf.c
-index 3d707bd0..b916a3f8 100644
---- a/cipher/kdf.c
-+++ b/cipher/kdf.c
-@@ -452,7 +452,8 @@ selftest_pbkdf2 (int extended, selftest_report_func_t report)
-       "\x34\x8c\x89\xdb\xcb\xd3\x2b\x2f\x32\xd8\x14\xb8\x11\x6e\x84\xcf"
-       "\x2b\x17\x34\x7e\xbc\x18\x00\x18\x1c\x4e\x2a\x1f\xb8\xdd\x53\xe1"
-       "\xc6\x35\x51\x8c\x7d\xac\x47\xe9"
--    }
-+    },
-+    { NULL }
-   };
-   const char *what;
-   const char *errtxt;
--- 
-2.27.0
-
diff --git a/libgcrypt-poll.patch b/libgcrypt-poll.patch
index e8896b1..64a169c 100644
--- a/libgcrypt-poll.patch
+++ b/libgcrypt-poll.patch
@@ -5,9 +5,9 @@
  #include <unistd.h>
  #include <fcntl.h>
 +#include <poll.h>
- #if defined(__linux__) || !defined(HAVE_GETENTROPY)
- #ifdef HAVE_SYSCALL
- # include <sys/syscall.h>
+ #if defined(__APPLE__) && defined(__MACH__)
+ extern int getentropy (void *buf, size_t buflen) __attribute__ ((weak_import));
+ #define HAVE_GETENTROPY
 @@ -216,8 +217,7 @@
                   return with something we will actually use 100ms. */
    while (length)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgcrypt.git/commitdiff/d766691b701c8b22a3dfd12409fe879b78463bc4