diff --git a/contrib/src/gnutls/SHA512SUMS b/contrib/src/gnutls/SHA512SUMS index 0324811ca1b0cb1f070d17bb6170241833a0ad80..5c136299a095e551b9ffa6d46b6a8c2a103b4ac5 100644 --- a/contrib/src/gnutls/SHA512SUMS +++ b/contrib/src/gnutls/SHA512SUMS @@ -1 +1 @@ -c81da5bba3b28ab17ef762d8c6a6607745f1fa7177e0fdaacd374ac0ee64c14cd804e048aeb965383fafaa677ba2ed256c709a117f8a95012f8494c650d29c81 gnutls-3.4.6.tar.xz +e5cd60240ebbcac9d8f7c28fdbf023a499e3c58a352a43c24d075b248a0a903161b1745641bf263519293c0014424cc23dbb67274c8934aaf273a523ad0a2925 gnutls-3.4.10.tar.xz diff --git a/contrib/src/gnutls/downgrade-automake-requirement.patch b/contrib/src/gnutls/downgrade-automake-requirement.patch deleted file mode 100644 index 5e977a4c95ca2a0d09b333807e325e18ffbc851d..0000000000000000000000000000000000000000 --- a/contrib/src/gnutls/downgrade-automake-requirement.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnutls-3.4.0/configure.ac.orig 2013-09-17 18:17:09.840217108 +0200 -+++ gnutls-3.4.0/configure.ac 2013-09-17 18:19:36.609535012 +0200 -@@ -26,7 +26,7 @@ - AC_CONFIG_MACRO_DIR([m4]) - AC_CANONICAL_HOST - --AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz dist-lzip -Wall -Wno-override]) -+AM_INIT_AUTOMAKE([1.11.1 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - AC_CONFIG_HEADERS([config.h]) - diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index 35df76cd0e8dd4cd69108448dd09150fa4842601..3ca0a80d195ad2f826fed678bfdd960e6dc8d96c 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -1,6 +1,6 @@ # GnuTLS -GNUTLS_VERSION := 3.4.6 +GNUTLS_VERSION := 3.4.10 GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-$(GNUTLS_VERSION).tar.xz PKGS += gnutls @@ -28,7 +28,6 @@ endif #endif $(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch $(APPLY) $(SRC)/gnutls/read-file-limits.h.patch - $(APPLY) $(SRC)/gnutls/downgrade-automake-requirement.patch $(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch $(APPLY) $(SRC)/gnutls/format-security.patch $(call pkg_static,"lib/gnutls.pc.in")