update gnutls (new stable branch 3.5)

2 files changed, 22 insertions, 25 deletions

diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch
index 33f4822..17c0164 100644
--- a/src/gnutls-1-fixes.patch
+++ b/src/gnutls-1-fixes.patch
@@ -1,33 +1,31 @@
 This file is part of MXE. See LICENSE.md for licensing information.
 
-Contains ad hoc patches for cross building.
-
-From a769aa5f4edb5a4a7b6dc36d5d9a889f2249a48f Mon Sep 17 00:00:00 2001
+From 7b62567c0820dd34afc177502638c702177dac39 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 4 Feb 2013 16:11:12 +0100
-Subject: [PATCH 1/3] add missing private lib to pc file
+Subject: [PATCH 1/2] add missing private lib to pc file
 
 
 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
-index f1a4157..9b1ed59 100644
+index 441b45d..9e2880a 100644
 --- a/lib/gnutls.pc.in
 +++ b/lib/gnutls.pc.in
 @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
  URL: http://www.gnutls.org/
  Version: @VERSION@
  Libs: -L${libdir} -lgnutls
--Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @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@ -lcrypt32
+-Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBNSL@ @LTLIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LTLIBUNISTRING@
++Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBNSL@ @LTLIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LTLIBUNISTRING@ -lcrypt32
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}
 -- 
-2.5.0
+2.9.3
 
 
-From 8afb001057028f6a3c671406c8914540c3b9b6e6 Mon Sep 17 00:00:00 2001
+From ed39e9884ea4a2ce8bd76e66d85d0579312517cd Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 24 Nov 2014 08:56:48 +0100
-Subject: [PATCH 2/3] windows build fix: ws2tcpip.h supplies inet_ntop
+Subject: [PATCH 2/2] windows build fix: ws2tcpip.h supplies inet_ntop
 
 Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a
 
@@ -35,12 +33,12 @@ Signed-off-by: Mark Brand <mabrand@mabrand.nl>
 
 taken from: http://lists.gnutls.org/pipermail/gnutls-devel/2014-November/007250.html
 
-diff --git a/lib/x509/output.c b/lib/x509/output.c
-index b126c30..a97d445 100644
---- a/lib/x509/output.c
-+++ b/lib/x509/output.c
-@@ -34,7 +34,11 @@
- #include <gnutls-idna.h>
+diff --git a/lib/x509/ip.c b/lib/x509/ip.c
+index b4b31a4..85f1300 100644
+--- a/lib/x509/ip.c
++++ b/lib/x509/ip.c
+@@ -26,7 +26,11 @@
+ #include <gnutls/x509.h>
  
  #ifdef HAVE_INET_NTOP
 -# include <arpa/inet.h>
@@ -51,8 +49,7 @@ index b126c30..a97d445 100644
 +# endif
  #endif
  
- #define addf _gnutls_buffer_append_printf
+ /*-
 -- 
-2.5.0
-
+2.9.3
 
diff --git a/src/gnutls.mk b/src/gnutls.mk
index ee41ddd..d1f4dc2 100644
--- a/src/gnutls.mk
+++ b/src/gnutls.mk
@@ -3,16 +3,16 @@
 PKG             := gnutls
 $(PKG)_WEBSITE  := https://www.gnu.org/software/gnutls/
 $(PKG)_DESCR    := GnuTLS
-$(PKG)_VERSION  := 3.4.17
-$(PKG)_CHECKSUM := 9b50e8a670d5e950425d96935c7ddd415eb6f8079615a36df425f09a3143172e
+$(PKG)_VERSION  := 3.5.8
+$(PKG)_CHECKSUM := 0e97f243ae72b70307d684b84c7fe679385aa7a7a0e37e5be810193dcc17d4ff
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4//$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc gettext gmp libgnurx libidn nettle zlib
+$(PKG)_URL      := http://mirrors.dotsrc.org/gnupg/gnutls/v3.5/$($(PKG)_FILE)
+$(PKG)_URL_2    := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5//$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc gettext gmp libgnurx libidn libunistring nettle zlib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/ | \
+    $(WGET) -q -O- ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/ | \
     $(SED) -n 's,.*gnutls-\([1-9]\+\.[0-9]\+.[0-9]\+\)\..*,\1,p' | \
     $(SORT) -V | \
     tail -1