From ca6b4d75ff2a3bdf03c93f83249914747d0ba5a1 Mon Sep 17 00:00:00 2001
From: Pavlov Konstantin <thresh@videolan.org>
Date: Wed, 2 Apr 2008 01:13:32 +0400
Subject: [PATCH] Contrib: bump gnutls to 2.2.2, bump libgcrypt to 1.4.0.
 Update gcrypt patch as well.

---
 extras/contrib/src/Patches/gcrypt.patch | 15 ++++++++-------
 extras/contrib/src/packages.mak         | 11 ++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/extras/contrib/src/Patches/gcrypt.patch b/extras/contrib/src/Patches/gcrypt.patch
index a4abf1798d..e39f3aad88 100644
--- a/extras/contrib/src/Patches/gcrypt.patch
+++ b/extras/contrib/src/Patches/gcrypt.patch
@@ -1,11 +1,12 @@
---- libgcrypt/Makefile.am.orig	2006-03-02 16:46:35.000000000 +0100
-+++ libgcrypt/Makefile.am	2006-03-02 16:47:19.000000000 +0100
-@@ -21,7 +21,7 @@
- AUTOMAKE_OPTIONS = dist-bzip2
+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
+@@ -23,7 +23,7 @@
+   --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
  
- DIST_SUBDIRS = mpi cipher src doc tests w32-dll
+ DIST_SUBDIRS = m4 mpi cipher src doc tests
 -SUBDIRS = mpi cipher src doc tests
-+SUBDIRS = mpi cipher src 
- EXTRA_DIST = BUGS autogen.sh README.apichanges README.SVN
++SUBDIRS = mpi cipher src
+ EXTRA_DIST = BUGS autogen.sh README.SVN
  DISTCLEANFILES = 
  
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 6b81165e87..462c410c4e 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -140,11 +140,12 @@ 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.2.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=1.6.3
-GNUTLS_URL=$(VIDEOLAN)/testing/contrib/gnutls-$(GNUTLS_VERSION).tar.bz2
+GCRYPT_VERSION=1.4.0
+#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.2.2
+GNUTLS_URL=http://josefsson.org/gnutls/releases/gnutls-$(GNUTLS_VERSION).tar.bz2
+#GNUTLS_URL=$(VIDEOLAN)/testing/contrib/gnutls-$(GNUTLS_VERSION).tar.bz2
 #GNUTLS_URL=ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
 DAAP_VERSION=0.4.0
 DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2
-- 
2.39.2