From 107bfbbac18a8747a7258ea96d23229e5dd390c6 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 17 Feb 2021 13:10:23 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libgcrypt.git#af59e404ea6d424994d28f56e5067c555a5c6a98 --- .gitignore | 1 + libgcrypt-1.8.4-use-poll.patch | 4 ++-- libgcrypt.spec | 5 ++++- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0288827..9fe7a79 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ libgcrypt-1.4.5-hobbled.tar.bz2 /libgcrypt-1.8.7-hobbled.tar.xz /libgcrypt-1.9.0-hobbled.tar.xz /libgcrypt-1.9.1-hobbled.tar.xz +/libgcrypt-1.9.2-hobbled.tar.xz diff --git a/libgcrypt-1.8.4-use-poll.patch b/libgcrypt-1.8.4-use-poll.patch index 01dcf82..8032992 100644 --- a/libgcrypt-1.8.4-use-poll.patch +++ b/libgcrypt-1.8.4-use-poll.patch @@ -7,8 +7,8 @@ diff -up libgcrypt-1.8.4/random/rndlinux.c.use-poll libgcrypt-1.8.4/random/rndli #include +#include #if defined(__APPLE__) && defined(__MACH__) - extern int getentropy (void *buf, size_t buflen) __attribute__ ((weak_import)); - #define HAVE_GETENTROPY + #include + #ifdef __MAC_10_11 @@ -241,9 +242,8 @@ _gcry_rndlinux_gather_random (void (*add return with something we will actually use 100ms. */ while (length) diff --git a/libgcrypt.spec b/libgcrypt.spec index 971a4b1..470bf62 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -1,5 +1,5 @@ Name: libgcrypt -Version: 1.9.1 +Version: 1.9.2 Release: 1%{?dist} URL: https://www.gnupg.org/ Source0: libgcrypt-%{version}-hobbled.tar.xz @@ -201,6 +201,9 @@ install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/gcrypt/random.conf %license COPYING %changelog +* Wed Feb 17 2021 Jakub Jelen - 1.9.2-1 +- New upstream release (#1929630) + * Fri Jan 29 2021 Jakub Jelen - 1.9.1-1 - New upstream release (#1922156, #1922097) diff --git a/sources b/sources index 3fb2e74..9ebeb2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgcrypt-1.9.1-hobbled.tar.xz) = 87c474c7b5054d7d6c75ca0d2458b2be197d7b8131b1e0a2017f391287a9e7bca666a9ac743c24210df869839518294c0091858245c96d10c5856f2473f35943 +SHA512 (libgcrypt-1.9.2-hobbled.tar.xz) = b89f1e2ea76a6efb5e503264b4ebd843f410e188cf4fad4da4607ae77b247349f031e1e8e4340f4d3d0b03197f110e14dcca9d693f8971c086f6d8be3de403e6