update package gnutls

1 files changed, 45 insertions, 43 deletions

diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch
index 039f94e..4cc1612 100644
--- a/src/gnutls-1-fixes.patch
+++ b/src/gnutls-1-fixes.patch
@@ -3,32 +3,10 @@ See index.html for further information.
 
 Contains ad hoc patches for cross building.
 
-From 887091de2615a1c4dc366240c6b196a0f26210cf Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Fri, 28 Oct 2011 09:23:41 +0200
-Subject: [PATCH 1/6] add missing static library linking
-
-
-diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
-index c45f8f3..57d0dbb 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.gnu.org/software/gnutls/
- Version: @VERSION@
- Libs: -L${libdir} -lgnutls
--Libs.private: @LTLIBNETTLE@
-+Libs.private: @LTLIBNETTLE@ @LIBS@
- @GNUTLS_REQUIRES_PRIVATE@
- Cflags: -I${includedir}
--- 
-1.7.10.4
-
-
-From 8473646fd0cd2727fc807dd82ebdd720d2bfc2ae Mon Sep 17 00:00:00 2001
+From 36503de724d45b8c5dc9ea06a306d6648cf444aa Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 24 Nov 2011 15:06:06 +0100
-Subject: [PATCH 2/6] disable doc and test (mingw-cross-env specific)
+Subject: [PATCH 1/6] disable doc and test (mingw-cross-env specific)
 
 
 diff --git a/Makefile.am b/Makefile.am
@@ -48,41 +26,41 @@ index c4a4bfa..78943a7 100644
 1.7.10.4
 
 
-From ca3da89b7439af0d3e27db03c8a8a5c4675b6eab Mon Sep 17 00:00:00 2001
+From 53dee0b90e8018b27ebd91ce44606d69ad18eb97 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 3 Apr 2012 13:58:42 +0200
-Subject: [PATCH 3/6] Revert "make dist will also make lzip compressed
+Subject: [PATCH 2/6] Revert "make dist will also make lzip compressed
  tarball"
 
 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f.
 
 diff --git a/configure.ac b/configure.ac
-index a9fe3c1..c5c0fa4 100644
+index 1047442..cff91bb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.1.5], [bug-gnutls@gnu.org])
+@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.1.7], [bug-gnutls@gnu.org])
  AC_CONFIG_AUX_DIR([build-aux])
  AC_CONFIG_MACRO_DIR([m4])
  
 -AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override])
 +AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz -Wall -Werror -Wno-override])
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AM_CONFIG_HEADER(config.h)
+ AC_CONFIG_HEADERS([config.h])
  
 -- 
 1.7.10.4
 
 
-From 9938080f06e10dc1159344599fb5fb64e024b4a5 Mon Sep 17 00:00:00 2001
+From ec72b114f6a07986a71880707cb6cc197e7ed674 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 6 Jun 2012 09:57:24 +0200
-Subject: [PATCH 4/6] AM_PROG_AR for automake 1.12 compatibility
+Subject: [PATCH 3/6] AM_PROG_AR for automake 1.12 compatibility
 
 Taken from
 http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html
 
 diff --git a/configure.ac b/configure.ac
-index c5c0fa4..c6cb8d3 100644
+index cff91bb..847bcdb 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -37,6 +37,7 @@ dnl Checks for programs.
@@ -97,45 +75,69 @@ index c5c0fa4..c6cb8d3 100644
 1.7.10.4
 
 
-From f4e75cb77ca027fc4433f095e82690521262c485 Mon Sep 17 00:00:00 2001
+From 2d8e156262d39aa281988f844f40d3f006b12e63 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 16 Aug 2012 11:13:47 +0200
-Subject: [PATCH 5/6] allow automake warnings not to be errors
+Subject: [PATCH 4/6] allow automake warnings not to be errors
 
 
 diff --git a/configure.ac b/configure.ac
-index c6cb8d3..9e03936 100644
+index 847bcdb..38465c4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.1.5], [bug-gnutls@gnu.org])
+@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.1.7], [bug-gnutls@gnu.org])
  AC_CONFIG_AUX_DIR([build-aux])
  AC_CONFIG_MACRO_DIR([m4])
  
 -AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz -Wall -Werror -Wno-override])
 +AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz -Wall -Wno-override])
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AM_CONFIG_HEADER(config.h)
+ AC_CONFIG_HEADERS([config.h])
+ 
+-- 
+1.7.10.4
+
+
+From 4376d4f5bc04f3118babb5eed7c4bb67fd2d8c1b Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Mon, 4 Feb 2013 18:12:31 +0100
+Subject: [PATCH 5/6] Corrected typo. Reported by Mark Brand. (cherry picked
+ from commit b94c3e7c6e8fba6a66a83efabd6376726eac3ba6)
+
+
+diff --git a/lib/nettle/rnd.c b/lib/nettle/rnd.c
+index 4c91827..b2883ee 100644
+--- a/lib/nettle/rnd.c
++++ b/lib/nettle/rnd.c
+@@ -164,7 +164,7 @@ do_device_source (int init)
+     }
+ 
+   if ((device_fd != 0)
+-      && (init || timespec_sub_sec(&current_time, &device_last_read) > DEVICE_READ_INTERVAL)))
++      && (init || timespec_sub_sec(&current_time, &device_last_read) > DEVICE_READ_INTERVAL))
+     {
  
+       /* More than 20 minutes since we last read the device */
 -- 
 1.7.10.4
 
 
-From 70c8cd64f1b4b3cf6d02d3d3f833bf5181db4fe4 Mon Sep 17 00:00:00 2001
+From 5a063bc916d00fc40d2f3f53a76d78e5ac638cba Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
-Date: Thu, 20 Sep 2012 12:59:19 +0200
-Subject: [PATCH 6/6] add missing libs to Libs.private
+Date: Mon, 4 Feb 2013 16:11:12 +0100
+Subject: [PATCH 6/6] add missing private lib to pc file
 
 
 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
-index 57d0dbb..b94179a 100644
+index 5e2ae11..1b9952a 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.gnu.org/software/gnutls/
  Version: @VERSION@
  Libs: -L${libdir} -lgnutls
--Libs.private: @LTLIBNETTLE@ @LIBS@
-+Libs.private: @LTLIBNETTLE@ @LIBS@ -liconv -lcrypt32 -lws2_32
+-Libs.private: @LTLIBNETTLE@ @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @LIB_CLOCK_GETTIME@
++Libs.private: @LTLIBNETTLE@ @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @LIB_CLOCK_GETTIME@ -lcrypt32
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}
 --