[vlc-commits] Contribs: update GnuTLS to 3.4.13

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jun 29 15:38:26 2016 +0200| [21e9ad924f909fcf781897ec149215cd3bdd4766] | committer: Jean-Baptiste Kempf

Contribs: update GnuTLS to 3.4.13

Ref #16154

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

 contrib/src/gnutls/SHA512SUMS           |    2 +-
 contrib/src/gnutls/gnutls-mingw64.patch |   14 +++++++-------
 contrib/src/gnutls/rules.mak            |    4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contrib/src/gnutls/SHA512SUMS b/contrib/src/gnutls/SHA512SUMS
index fd5b905..0024953 100644
--- a/contrib/src/gnutls/SHA512SUMS
+++ b/contrib/src/gnutls/SHA512SUMS
@@ -1 +1 @@
-9cfbf4057b0728afde8465a4c10a8d1fbcb615e07210abab158a3008c73b71ddfbad1b2d67b92d8d5facb4bcd8298a3fb7e9ce6629bda1c6dd35d7f9e4b74a9d  gnutls-3.3.22.tar.xz
+bec4832560945ca127524a7b529757aa36b7eb9a070d7385f8e5d10628e39b76ae20c1c146fab286860c70add8755f17a4b61bfa1a266eeb30d481f259120406  gnutls-3.4.13.tar.xz
diff --git a/contrib/src/gnutls/gnutls-mingw64.patch b/contrib/src/gnutls/gnutls-mingw64.patch
index d8eb852..9f6bd38 100644
--- a/contrib/src/gnutls/gnutls-mingw64.patch
+++ b/contrib/src/gnutls/gnutls-mingw64.patch
@@ -1,16 +1,16 @@
---- gnutls/lib/system.c.orig	2016-04-01 17:15:48.424481273 +0200
-+++ gnutls/lib/system.c	2016-04-01 17:15:57.200493470 +0200
+--- gnutls-3.4.13/lib/system.c.orig	2016-05-27 22:40:06.000000000 +0200
++++ gnutls-3.4.13/lib/system.c	2016-06-29 15:36:26.645190212 +0200
 @@ -34,7 +34,7 @@
  #ifdef _WIN32
  # include <windows.h>
  # include <wincrypt.h>
 -# if defined(__MINGW32__) && !defined(__MINGW64__) && __MINGW32_MAJOR_VERSION <= 3 && __MINGW32_MINOR_VERSION <= 20
 +# if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) && __MINGW32_MAJOR_VERSION <= 3 && __MINGW32_MINOR_VERSION <= 20
- typedef PCCRL_CONTEXT WINAPI(*Type_CertEnumCRLsInStore) (HCERTSTORE
+ typedef PCCRL_CONTEXT WINAPI(*CertEnumCRLsInStoreFunc) (HCERTSTORE
  							 hCertStore,
  							 PCCRL_CONTEXT
-@@ -289,7 +289,7 @@
- int gnutls_system_global_init()
+@@ -300,7 +300,7 @@
+ int gnutls_system_global_init(void)
  {
  #ifdef _WIN32
 -#if defined(__MINGW32__) && !defined(__MINGW64__) && __MINGW32_MAJOR_VERSION <= 3 && __MINGW32_MINOR_VERSION <= 20
@@ -18,8 +18,8 @@
  	HMODULE crypto;
  	crypto = LoadLibraryA("Crypt32.dll");
  
-@@ -313,7 +313,7 @@
- void gnutls_system_global_deinit()
+@@ -325,7 +325,7 @@
+ void gnutls_system_global_deinit(void)
  {
  #ifdef _WIN32
 -#if defined(__MINGW32__) && !defined(__MINGW64__) && __MINGW32_MAJOR_VERSION <= 3 && __MINGW32_MINOR_VERSION <= 20
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 75c6420..85d3a49 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -1,7 +1,7 @@
 # GnuTLS
 
-GNUTLS_VERSION := 3.3.22
-GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-$(GNUTLS_VERSION).tar.xz
+GNUTLS_VERSION := 3.4.13
+GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-$(GNUTLS_VERSION).tar.xz
 
 ifdef BUILD_NETWORK
 ifndef HAVE_DARWIN_OS