Bump gnutls to 2.8.1

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 676910b9c9cb4e5aaff8dcd874a63d759ba73e23..2fa673d7e2a1420f197a7fd25191ff4100597f54 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1907,13 +1907,12 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 ifdef HAVE_WIN32
        patch -p0 < Patches/gnutls-win32.patch
-       (cd $@; cd lgl; ln -sf alloca_.h alloca.h;)
-       (cd $@; autoconf)
+       (cd $@; autoreconf)
 endif
 
 .gnutls: gnutls .gcrypt .gpg-error
 ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --disable-cxx -disable-shared --enable-static --disable-nls   --with-included-opencdk --with-included-libtasn1 && cd lgl && make && cd ../gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --disable-cxx -disable-shared --enable-static --disable-nls --with-included-opencdk --with-included-libtasn1 &&  cd gl && make && cd ../lib && make && make install )
 else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-included-opencdk --disable-guile && make && make install)
 endif

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index f4d90b4b9e84240cbcd3e9de1061cc1a05c17a31..0103e3bfb37e4a398cfc988ba4272419aad13ff0 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -143,7 +143,7 @@ GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VER
 GCRYPT_VERSION=1.4.4
 #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.6.3
+GNUTLS_VERSION=2.8.1
 GNUTLS_URL=http://ftp.gnu.org/pub/gnu/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
 OPENCDK_VERSION=0.6.6
 OPENCDK_URL=http://www.gnu.org/software/gnutls/releases/opencdk/opencdk-$(OPENCDK_VERSION).tar.bz2