[Contribs] Update libgcrypt to 1.4.3

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 89aff9d6e1f4efe692dd011be0b400b3e342d959..c22ca17eec6e8b2e4ab2b3279539afc86feaff0a 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1880,7 +1880,7 @@ CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd1
 
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
-       (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install)
+       (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && make && make install)
 else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install)
 endif

diff --git a/extras/contrib/src/Patches/gcrypt.patch b/extras/contrib/src/Patches/gcrypt.patch
index e39f3aad88e8b36a83d54637a968bc786a84df3e..c6ca79252d04bac731d281a2cde2fdf4bb7b0615 100644 (file)
--- a/extras/contrib/src/Patches/gcrypt.patch
+++ b/extras/contrib/src/Patches/gcrypt.patch
@@ -1,12 +1,11 @@
-diff -urN libgcrypt/Makefile.am libgcrypt.patched/Makefile.am
---- libgcrypt/Makefile.am      2008-04-02 00:27:11.000000000 +0400
-+++ libgcrypt.patched/Makefile.am      2008-04-02 00:34:34.000000000 +0400
+--- libgcrypt/Makefile.am.orig 2008-08-19 17:20:08.000000000 +0200
++++ libgcrypt/Makefile.am      2008-10-21 09:57:33.000000000 +0200
 @@ -23,7 +23,7 @@
    --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
  
- DIST_SUBDIRS = m4 mpi cipher src doc tests
--SUBDIRS = mpi cipher src doc tests
-+SUBDIRS = mpi cipher src
- EXTRA_DIST = BUGS autogen.sh README.SVN
+ DIST_SUBDIRS = m4 mpi cipher random src doc tests
+-SUBDIRS = mpi cipher random src doc tests
++SUBDIRS = mpi cipher random src
+ EXTRA_DIST = autogen.sh README.SVN
  DISTCLEANFILES = 
  

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 1dbad8666eddd9bbd07cc2ddf773bc9c09124c48..7521ea2da5f8910265fa5602cbf23a9ab14d94f8 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -144,7 +144,7 @@ PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
 GPGERROR_VERSION=1.6
 GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 #GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
-GCRYPT_VERSION=1.4.1
+GCRYPT_VERSION=1.4.3
 #GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 GNUTLS_VERSION=2.4.2