- workaround for build on S390 (#548825)

- spec file cleanups
- upgrade to new minor upstream release

.cvsignore

@@ -1 +1 @@
-libgcrypt-1.4.4-hobbled.tar.bz2
+libgcrypt-1.4.5-hobbled.tar.bz2

libgcrypt-1.4.4-fips-no-access.patch

@@ -1,13 +0,0 @@
-Do not abort when the fips mode flag is simply inaccessible because of
-insufficient permissions.
-diff -up libgcrypt-1.4.4/src/fips.c.no-access libgcrypt-1.4.4/src/fips.c
---- libgcrypt-1.4.4/src/fips.c.no-access	2009-01-29 17:37:12.000000000 +0100
-+++ libgcrypt-1.4.4/src/fips.c	2009-01-29 17:37:15.000000000 +0100
-@@ -155,6 +155,7 @@ _gcry_initialize_fips_mode (int force)
-         fclose (fp);
-       }
-     else if ((saved_errno = errno) != ENOENT
-+             && saved_errno != EACCES
-              && !access ("/proc/version", F_OK) )
-       {
-         /* Problem reading the fips file despite that we have the proc

libgcrypt-1.4.4-padlock.patch

@@ -1,28 +0,0 @@
-diff -up libgcrypt-1.4.4/random/rndhw.c.padlock libgcrypt-1.4.4/random/rndhw.c
---- libgcrypt-1.4.4/random/rndhw.c.padlock	2008-09-03 12:04:43.000000000 +0200
-+++ libgcrypt-1.4.4/random/rndhw.c	2009-06-17 20:11:42.000000000 +0200
-@@ -41,7 +41,7 @@ static size_t
- poll_padlock (void (*add)(const void*, size_t, enum random_origins),
-               enum random_origins origin, int fast)
- {
--  char buffer[64+8] __attribute__ ((aligned (8)));
-+  volatile char buffer[64+8] __attribute__ ((aligned (8)));
-   char *p;
-   unsigned int nbytes, status;
-   
-@@ -55,12 +55,11 @@ poll_padlock (void (*add)(const void*, s
-   nbytes = 0;
-   while (nbytes < 64)
-     {
--      asm volatile 
-+      asm volatile
-         ("movl %1, %%edi\n\t"         /* Set buffer.  */
-          "xorl %%edx, %%edx\n\t"      /* Request up to 8 bytes.  */
--         ".byte 0x0f, 0xa7, 0xc0\n\t" /* XSTORE RNG. */
--         "movl %%eax, %0\n"           /* Return the status.  */
--         : "=g" (status)
-+         ".byte 0x0f, 0xa7, 0xc0\n"   /* XSTORE RNG. */
-+         : "=a" (status)
-          : "g" (p)
-          : "%edx", "%edi", "cc"
-          );

libgcrypt.spec

@@ -1,6 +1,6 @@
 Name: libgcrypt
-Version: 1.4.4
-Release: 9%{?dist}
+Version: 1.4.5
+Release: 1%{?dist}
 URL: http://www.gnupg.org/
 Source0: libgcrypt-%{version}-hobbled.tar.bz2
 # The original libgcrypt sources now contain potentially patented ECC
@@ -10,9 +10,7 @@ Source0: libgcrypt-%{version}-hobbled.tar.bz2
 #Source1: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
 Source2: wk@g10code.com
 Source3: hobble-libgcrypt
-Patch1: libgcrypt-1.4.4-fips-no-access.patch
 Patch2: libgcrypt-1.4.4-use-fipscheck.patch
-Patch3: libgcrypt-1.4.4-padlock.patch
 
 # Technically LGPLv2.1+, but Fedora's table doesn't draw a distinction.
 License: LGPLv2+
@@ -42,9 +40,7 @@ applications using libgcrypt.
 %prep
 %setup -q
 %{SOURCE3}
-%patch1 -p1 -b .no-access
 %patch2 -p1 -b .use-fipscheck
-%patch3 -p1 -b .padlock
 
 %build
 %ifarch s390
@@ -56,7 +52,8 @@ applications using libgcrypt.
 %endif
      --enable-noexecstack \
      --enable-hmac-binary-check \
-     --enable-pubkey-ciphers='dsa elgamal rsa'
+     --enable-pubkey-ciphers='dsa elgamal rsa' \
+     --disable-O-flag-munging
 make %{?_smp_mflags}
 
 %check
@@ -153,10 +150,10 @@ exit 0
 %{_infodir}/gcrypt.info*
 
 %changelog
-
-* Mon Dec 21 2009 Tomas Mraz <tmraz@redhat.com> 1.4.4-9
-- Workaround for build on S390 (#548825)
-- Spec file cleanups
+* Mon Dec 21 2009 Tomas Mraz <tmraz@redhat.com> 1.4.5-1
+- workaround for build on S390 (#548825)
+- spec file cleanups
+- upgrade to new minor upstream release
 
 * Tue Aug 11 2009 Tomas Mraz <tmraz@redhat.com> 1.4.4-8
 - fix warning when installed with --excludedocs (#515961)

sources

@@ -1 +1 @@
-12d3fec91c663b541d63e34eabddacc5  libgcrypt-1.4.4-hobbled.tar.bz2
+56a36e06fff2ed0a3b07c901a907db5f  libgcrypt-1.4.5-hobbled.tar.bz2