[vlc-commits] GnuTLS: update to 3.3.22

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Mar 10 16:31:56 2016 +0100| [c8d93f1f5fc8f9c3d2ede50b6efc6f58f933144f] | committer: Jean-Baptiste Kempf

GnuTLS: update to 3.3.22

This is a move from 3.2 to 3.3.
EGD is reactivated

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c8d93f1f5fc8f9c3d2ede50b6efc6f58f933144f
---

 contrib/src/gnutls/SHA512SUMS                 |    2 +-
 contrib/src/gnutls/gnutls-pkgconfig-osx.patch |   12 +++++++-----
 contrib/src/gnutls/gnutls-win32.patch         |   25 ++++---------------------
 contrib/src/gnutls/rules.mak                  |    5 ++---
 4 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/contrib/src/gnutls/SHA512SUMS b/contrib/src/gnutls/SHA512SUMS
index 172a548..fd5b905 100644
--- a/contrib/src/gnutls/SHA512SUMS
+++ b/contrib/src/gnutls/SHA512SUMS
@@ -1 +1 @@
-8f89ac887d6bbe9ffec43a5a5e576daca563f3c1a7806e9a23963ef947b121b1d9562ee624a0bc427eda92652e24c83700fbfca283f29bbcf399ebcfe1fc218b  gnutls-3.2.21.tar.xz
+9cfbf4057b0728afde8465a4c10a8d1fbcb615e07210abab158a3008c73b71ddfbad1b2d67b92d8d5facb4bcd8298a3fb7e9ce6629bda1c6dd35d7f9e4b74a9d  gnutls-3.3.22.tar.xz
diff --git a/contrib/src/gnutls/gnutls-pkgconfig-osx.patch b/contrib/src/gnutls/gnutls-pkgconfig-osx.patch
index 82305ec..7c83ac9 100644
--- a/contrib/src/gnutls/gnutls-pkgconfig-osx.patch
+++ b/contrib/src/gnutls/gnutls-pkgconfig-osx.patch
@@ -39,12 +39,14 @@
  Libs.private: @UNBOUND_LIBS@
  Requires.private: gnutls
  Cflags: -I${includedir}
---- gnutls-3.2.17/lib/gnutls.pc.in.orig	2014-09-02 02:11:18.408515190 +0200
-+++ gnutls-3.2.17/lib/gnutls.pc.in	2014-09-02 02:11:45.615686000 +0200
-@@ -20,5 +20,5 @@
+--- gnutls/lib/gnutls.pc.in.orig	2016-03-10 16:33:20.547831009 +0100
++++ gnutls/lib/gnutls.pc.in	2016-03-10 16:33:47.747832306 +0100
+@@ -18,7 +18,7 @@
+ Description: Transport Security Layer implementation for the GNU system
+ URL: http://www.gnutls.org/
  Version: @VERSION@
- Libs: -L${libdir} -lgnutls
- Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
 - at GNUTLS_REQUIRES_PRIVATE@
 + at GNUTLS_REQUIRES_PRIVATE@ @INTL_MACOSX_LIBS@
  Cflags: -I${includedir}
+ Libs:  -L${libdir} -lgnutls  @LIBZ@ @LIBINTL@ @LIBSOCKET@ -lcrypt32 @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
+ Requires:  
diff --git a/contrib/src/gnutls/gnutls-win32.patch b/contrib/src/gnutls/gnutls-win32.patch
index f0c05d3..5347d35 100644
--- a/contrib/src/gnutls/gnutls-win32.patch
+++ b/contrib/src/gnutls/gnutls-win32.patch
@@ -1,27 +1,10 @@
---- gnutls-2.12.20/gl/gai_strerror.c.orig	2012-03-01 16:45:12.000000000 +0100
-+++ gnutls-2.12.20/gl/gai_strerror.c	2012-09-27 14:39:30.273584236 +0200
-@@ -75,7 +75,7 @@
-     { EAI_IDN_ENCODE, N_("Parameter string not correctly encoded") }
- #endif
-   };
--
-+#ifndef _WIN32
- const char *
- gai_strerror (int code)
- {
-@@ -89,4 +89,5 @@
- # ifdef _LIBC
- libc_hidden_def (gai_strerror)
- # endif
-+#endif
- #endif /* !HAVE_DECL_GAI_STRERROR */
---- gnutls-3.2.17/lib/gnutls.pc.in.orig	2014-08-30 06:48:22.371307704 +0200
-+++ gnutls-3.2.17/lib/gnutls.pc.in	2014-08-30 06:48:40.504956268 +0200
+--- gnutls-3.3.22/lib/gnutls.pc.in.orig	2016-03-10 16:17:25.955785469 +0100
++++ gnutls-3.3.22/lib/gnutls.pc.in	2016-03-10 16:20:49.979795202 +0100
 @@ -19,6 +19,6 @@
  URL: http://www.gnutls.org/
  Version: @VERSION@
  Libs: -L${libdir} -lgnutls
--Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
-+Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ -lcrypt32 @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
+-Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
++Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ -lcrypt32 @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index ef0818c..7b414d6 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -1,7 +1,7 @@
 # GnuTLS
 
-GNUTLS_VERSION := 3.2.21
-GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-$(GNUTLS_VERSION).tar.xz
+GNUTLS_VERSION := 3.3.22
+GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-$(GNUTLS_VERSION).tar.xz
 
 ifdef BUILD_NETWORK
 ifndef HAVE_DARWIN_OS
@@ -25,7 +25,6 @@ endif
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/gnutls/no-create-time-h.patch
 endif
-	$(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch
 	$(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
 	$(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch
 ifdef HAVE_MACOSX