* gcc 4.0 fixes for libgcrypt

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 5e29c363b685209a75c055a1ae4539a7f4b999e3..6751ccc85eddb68f08e49e466ed1eeb634180194 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1082,6 +1082,7 @@ libgcrypt-$(GCRYPT_VERSION).tar.gz:
 
 libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p 0 < Patches/gcrypt.patch
 
 .gcrypt: libgcrypt
        (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install )

diff --git a/extras/contrib/src/Patches/gcrypt.patch b/extras/contrib/src/Patches/gcrypt.patch
new file mode 100644 (file)
index 0000000..e86a19c
--- /dev/null
+++ b/extras/contrib/src/Patches/gcrypt.patch
@@ -0,0 +1,34 @@
+diff -ruN libgcrypts.orig/cipher/serpent.c libgcrypt/cipher/serpent.c
+--- libgcrypts.orig/cipher/serpent.c   2003-12-11 15:29:14.000000000 +0100
++++ libgcrypt/cipher/serpent.c 2005-04-09 18:58:57.000000000 +0200
+@@ -55,6 +55,10 @@
+   serpent_subkeys_t keys;     /* Generated subkeys.  */
+ } serpent_context_t;
+ 
++/* A prototype.  */
++static const char *serpent_test (void);
++
++
+ #define byte_swap_32(x) \
+   (0 \
+    | (((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) \
+@@ -687,8 +691,6 @@
+   if (! serpent_init_done)
+     {
+       /* Execute a self-test the first time, Serpent is used.  */
+-      static const char *serpent_test (void);
+-      
+       serpent_test_ret = serpent_test ();
+       if (serpent_test_ret)
+       log_error ("Serpent test failure: %s\n", serpent_test_ret);
+diff -ruN libgcrypts.orig/src/gcrypt.h libgcrypt/src/gcrypt.h
+--- libgcrypts.orig/src/gcrypt.h       2004-04-15 11:10:37.000000000 +0200
++++ libgcrypt/src/gcrypt.h     2005-04-09 18:57:14.000000000 +0200
+@@ -29,6 +29,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <sys/time.h>
+ 
+ /* This is required for error code compatibility. */
+ #define _GCRY_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GCRYPT