Contribs: update to Gcrypt 1.5.0

diff --git a/contrib/src/gcrypt/SHA512SUMS b/contrib/src/gcrypt/SHA512SUMS
index 65f63a67da99dfa51161510eb1941066e5116700..a2c7001584d75145b3e282347a71d03251df845d 100644 (file)
--- a/contrib/src/gcrypt/SHA512SUMS
+++ b/contrib/src/gcrypt/SHA512SUMS
@@ -1 +1 @@
-d219b23b36870a526d378a4ce784abc044bcb3a547a5e667b8185f2aceffab707918a6be6420d8473fc0c4d293968be5824b5dcf0cc5f0ef0866490f250b101c  libgcrypt-1.4.6.tar.bz2
+1422ca739d41952b71ea4512d6c7f2a76924867671bec35f92e573a7f02a9569938daf109d7ecaf6b1cfd45425511d2bae068d6945e5792dfd1bb15434ff27a8  libgcrypt-1.5.0.tar.bz2

diff --git a/contrib/src/gcrypt/gcrypt-nodocs.patch b/contrib/src/gcrypt/gcrypt-nodocs.patch
deleted file mode 100644 (file)
index 6fed569..0000000
--- a/contrib/src/gcrypt/gcrypt-nodocs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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 random src doc tests
--SUBDIRS = mpi cipher random src doc tests
-+SUBDIRS = mpi cipher random src
- EXTRA_DIST = autogen.sh README.SVN
- DISTCLEANFILES = 
- 
-diff -ur libgcrypt.orig//Makefile.in libgcrypt/Makefile.in
---- libgcrypt.orig//Makefile.in        2011-09-23 01:27:00.000000000 +0200
-+++ libgcrypt/Makefile.in      2011-09-23 01:28:03.000000000 +0200
-@@ -240,7 +240,7 @@
-   --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
- 
- 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 = 
- all: config.h

diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index a5a99dcc19aa347ae0958a7093f8358ae8acff59..6079f7227d788deb6a958ff76c125e3d2dcd0b2f 100644 (file)
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -1,5 +1,5 @@
 # GCRYPT
-GCRYPT_VERSION := 1.4.6
+GCRYPT_VERSION := 1.5.0
 GCRYPT_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 
 PKGS += gcrypt
@@ -11,7 +11,6 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
 
 libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
        $(UNPACK)
-       $(APPLY) $(SRC)/gcrypt/gcrypt-nodocs.patch
        $(MOVE)
 
 DEPS_gcrypt = gpg-error