From 5768e24e768e333268ee60e6e16b4e88f71fecf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Wed, 21 Mar 2018 18:21:28 -0400 Subject: [PATCH] contrib: bump GnuTLS to 3.6.2 Change-Id: Ic2410ea2c4015383a0cff84f9ba0131b0168b61e Reviewed-by: Philippe Gorley <philippe.gorley@savoirfairelinux.com> --- contrib/src/gnutls/SHA512SUMS | 4 +++- contrib/src/gnutls/rules.mak | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/contrib/src/gnutls/SHA512SUMS b/contrib/src/gnutls/SHA512SUMS index b26cf09c16..7f13fd81a2 100644 --- a/contrib/src/gnutls/SHA512SUMS +++ b/contrib/src/gnutls/SHA512SUMS @@ -1,2 +1,4 @@ -60fc3409ee81932bc2672c68eb65748b88da4b9307764fb395dbadc06120e1011207a04d5f540e77a4d07649ffaed0789c04d57692eeca6ab24ac79d72418906 gnutls-3.5.10.tar.xz \ No newline at end of file +60fc3409ee81932bc2672c68eb65748b88da4b9307764fb395dbadc06120e1011207a04d5f540e77a4d07649ffaed0789c04d57692eeca6ab24ac79d72418906 gnutls-3.5.10.tar.xz +1f2bd3203ea96844c531be700b44623b79f46743143edf97011aab07895ca18d62f1659c7fafc5e1c4b0686fde490836f00358bdd60d6ac0b842526db002da23 gnutls-3.6.1.tar.xz +6a574d355226bdff6198ab3f70633ff2a3cff4b5d06793bdaf19d007063bd4dd515d1bd3f331a9eb1a9ad01f83007801cfa55e5fd16c1cd3461ac33d1813fb06 gnutls-3.6.2.tar.xz diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index 4441fcf910..8d7a98d963 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -1,11 +1,11 @@ # GnuTLS -GNUTLS_VERSION := 3.5.10 -GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-$(GNUTLS_VERSION).tar.xz +GNUTLS_VERSION := 3.6.2 +GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-$(GNUTLS_VERSION).tar.xz PKGS += gnutls -ifeq ($(call need_pkg,"gnutls == 3.5.10"),) +ifeq ($(call need_pkg,"gnutls >= 3.5.17"),) PKGS_FOUND += gnutls endif @@ -49,7 +49,7 @@ GNUTLS_CONF := \ --disable-nls \ --disable-dtls-srtp-support \ --without-libintl-prefix \ - --disable-non-suiteb-curves \ + --without-idn \ $(HOSTCONF) ifdef HAVE_ANDROID -- GitLab