diff --git a/.gitignore b/.gitignore index c1202bb..e3596b3 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ libgcrypt-1.4.5-hobbled.tar.bz2 /libgcrypt-1.7.8-hobbled.tar.xz /libgcrypt-1.8.0-hobbled.tar.xz /libgcrypt-1.8.1-hobbled.tar.xz +/libgcrypt-1.8.2-hobbled.tar.xz diff --git a/libgcrypt-1.8.0-build.patch b/libgcrypt-1.8.0-build.patch deleted file mode 100644 index 02d8821..0000000 --- a/libgcrypt-1.8.0-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up libgcrypt-1.8.0/tests/t-secmem.c.build libgcrypt-1.8.0/tests/t-secmem.c ---- libgcrypt-1.8.0/tests/t-secmem.c.build 2017-01-18 15:24:25.000000000 +0100 -+++ libgcrypt-1.8.0/tests/t-secmem.c 2017-08-16 15:12:48.948224849 +0200 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #define PGM "t-secmem" - -@@ -37,17 +38,21 @@ test_secmem (void) - { - void *a[28]; - void *b; -+ long oversize; - int i; - - memset (a, 0, sizeof a); - -+ oversize = sysconf (_SC_PAGESIZE); -+ oversize = oversize <= 16384 ? 2048 : oversize - (16384 - 2048); -+ - /* Allocating 28*512=14k should work in the default 16k pool even - * with extrem alignment requirements. */ - for (i=0; i < DIM(a); i++) - a[i] = gcry_xmalloc_secure (512); - - /* Allocating another 2k should fail for the default 16k pool. */ -- b = gcry_malloc_secure (2048); -+ b = gcry_malloc_secure (oversize); - if (b) - fail ("allocation did not fail as expected\n"); - diff --git a/libgcrypt.spec b/libgcrypt.spec index 822aeba..25a1fce 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -1,6 +1,6 @@ Name: libgcrypt -Version: 1.8.1 -Release: 3%{?dist} +Version: 1.8.2 +Release: 1%{?dist} URL: http://www.gnupg.org/ Source0: libgcrypt-%{version}-hobbled.tar.xz # The original libgcrypt sources now contain potentially patented ECC @@ -33,8 +33,6 @@ Patch14: libgcrypt-1.7.3-ecc-test-fix.patch Patch18: libgcrypt-1.6.2-fips-ctor.patch # Block some operations if in FIPS non-operational state Patch22: libgcrypt-1.7.3-fips-reqs.patch -# Fix the t-secmem on PPC64 -Patch23: libgcrypt-1.8.0-build.patch # Do not try to open /dev/urandom if getrandom() works Patch24: libgcrypt-1.8.1-getrandom.patch @@ -80,7 +78,6 @@ applications using libgcrypt. %patch14 -p1 -b .eccfix %patch18 -p1 -b .fips-ctor %patch22 -p1 -b .fips-reqs -%patch23 -p1 -b .build %patch24 -p1 -b .getrandom cp %{SOURCE4} cipher/ @@ -195,6 +192,9 @@ exit 0 %license COPYING %changelog +* Thu Dec 21 2017 Tomáš Mráz 1.8.2-1 +- new upstream version 1.8.2 + * Tue Dec 5 2017 Tomáš Mráz 1.8.1-3 - do not try to access() /dev/urandom either if getrandom() works diff --git a/sources b/sources index c36a315..43e7786 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgcrypt-1.8.1-hobbled.tar.xz) = d9c2119e4a43fa4d0e5b55fbd128965a9dc153fd2ad36fcda4c205d409380aa7361dcfec1e5a1279060d8db94b4e9970cf4b97b12299506d014813a100fff4e1 +SHA512 (libgcrypt-1.8.2-hobbled.tar.xz) = a44a5fc1205e9d9eaaabd07be1a079a5a1d59c729cd13310e9bbd30da0c24ad98c40e23ea8a2db22c43aca818745e95004e51f6eb1d63ae4e259506aeecfb692