gnutls nettle: update

libgsasl and nettle no longer conflict over memxor, so the workaround
is removed.

1 files changed, 16 insertions, 16 deletions

diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch
index eae67a9..325a69d 100644
--- a/src/gnutls-1-fixes.patch
+++ b/src/gnutls-1-fixes.patch
@@ -1,7 +1,7 @@
 This file is part of MXE.
 See index.html for further information.
 
-From 9b8bd267588f9c7e15b50bf6f7754837deb8b301 Mon Sep 17 00:00:00 2001
+From dfe54cbfbcff8b46285819ed38ddb5757d27a716 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 3 Apr 2012 13:58:42 +0200
 Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball"
@@ -9,7 +9,7 @@ Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball"
 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f.
 
 diff --git a/configure.ac b/configure.ac
-index 3e5b79d..99f3636 100644
+index 3f7ec24..ef9fd77 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux])
@@ -22,10 +22,10 @@ index 3e5b79d..99f3636 100644
  AC_CONFIG_HEADERS([config.h])
  
 -- 
-2.1.2
+2.1.4
 
 
-From da0afaf172601c7bc434f35a4d02c13811fcaee7 Mon Sep 17 00:00:00 2001
+From 5dc32c442c74e905a3d5199e658c77b6de44cde1 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 6 Jun 2012 09:57:24 +0200
 Subject: [PATCH 2/5] AM_PROG_AR for automake 1.12 compatibility
@@ -34,7 +34,7 @@ Taken from
 http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html
 
 diff --git a/configure.ac b/configure.ac
-index 99f3636..8c1b4fd 100644
+index ef9fd77..7c3436a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -42,6 +42,7 @@ ggl_EARLY
@@ -46,10 +46,10 @@ index 99f3636..8c1b4fd 100644
  AC_PROG_YACC
  AC_PROG_SED
 -- 
-2.1.2
+2.1.4
 
 
-From 4a98dd8e1a9c6d2d1f1e190f94582ab259435c84 Mon Sep 17 00:00:00 2001
+From ab7fa52f69829b65e693723fade982cf372d5f27 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 4 Feb 2013 16:11:12 +0100
 Subject: [PATCH 3/5] add missing private lib to pc file
@@ -68,17 +68,17 @@ index a25fcdf..3860c68 100644
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}
 -- 
-2.1.2
+2.1.4
 
 
-From 57ffca60a0d61c4b58e27f6ee7f9b2770b0011b6 Mon Sep 17 00:00:00 2001
+From a4ef8a481bee4ddd1102138d2e304595c5eb1828 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Wed, 6 Feb 2013 08:43:43 +0100
 Subject: [PATCH 4/5] relax automake version check
 
 
 diff --git a/configure.ac b/configure.ac
-index 8c1b4fd..efa13e8 100644
+index 7c3436a..406db3a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux])
@@ -91,10 +91,10 @@ index 8c1b4fd..efa13e8 100644
  AC_CONFIG_HEADERS([config.h])
  
 -- 
-2.1.2
+2.1.4
 
 
-From e6872f0073970fabe4cc267feebb8bad98756f72 Mon Sep 17 00:00:00 2001
+From 2314330147f966d2dcd192b73dff822533ccab4e Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 24 Nov 2014 08:56:48 +0100
 Subject: [PATCH 5/5] windows build fix: ws2tcpip.h supplies inet_ntop
@@ -106,11 +106,11 @@ 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 bf01834..1ec18de 100644
+index 5cef68c..96ad795 100644
 --- a/lib/x509/output.c
 +++ b/lib/x509/output.c
-@@ -32,7 +32,11 @@
- #include <extras/randomart.h>
+@@ -34,7 +34,11 @@
+ #include <gnutls-idna.h>
  
  #ifdef HAVE_INET_NTOP
 -# include <arpa/inet.h>
@@ -123,5 +123,5 @@ index bf01834..1ec18de 100644
  
  #define addf _gnutls_buffer_append_printf
 -- 
-2.1.2
+2.1.4