update package gnutls

1 files changed, 64 insertions, 8 deletions

diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch
index d6cebbc..c8874e9 100644
--- a/src/gnutls-1-fixes.patch
+++ b/src/gnutls-1-fixes.patch
@@ -3,10 +3,10 @@ See index.html for further information.
 
 Contains ad hoc patches for cross building.
 
-From ef8ca0b0c163a5fbca686a292890479c498607c8 Mon Sep 17 00:00:00 2001
+From 1f08b1e9d6f6a03e0fe5e62aef85aa1021014953 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/3] add missing static library linking
+Subject: [PATCH 1/5] add missing static library linking
 
 ---
  lib/gnutls.pc.in |    2 +-
@@ -28,10 +28,10 @@ index c45f8f3..57d0dbb 100644
 1.7.9.2
 
 
-From e90e7ac3a472b0bef5475966ac06d7f2f12c712b Mon Sep 17 00:00:00 2001
+From bbf2330693746cc45a3df65cba253ce44a353ac3 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/3] disable doc and test (MXE specific)
+Subject: [PATCH 2/5] disable doc and test (mingw-cross-env specific)
 
 ---
  Makefile.am |    2 +-
@@ -54,10 +54,10 @@ index 0afe4bd..da7436a 100644
 1.7.9.2
 
 
-From 5f92acf7123fed0e7a2c617a8abea48f00d83c19 Mon Sep 17 00:00:00 2001
+From 5ee5355a9b34821b99f3f2fa83eb8435ccb45702 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/3] Revert "make dist will also make lzip compressed
+Subject: [PATCH 3/5] Revert "make dist will also make lzip compressed
  tarball"
 
 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f.
@@ -66,10 +66,10 @@ This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index ba60ce8..9af1253 100644
+index f826704..bb4d044 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.0.18], [bug-gnutls@gnu.org])
+@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.0.20], [bug-gnutls@gnu.org])
  AC_CONFIG_AUX_DIR([build-aux])
  AC_CONFIG_MACRO_DIR([m4])
  
@@ -81,3 +81,59 @@ index ba60ce8..9af1253 100644
 -- 
 1.7.9.2
 
+
+From 7f22baaa57d160a22b49d25b8fa4024b754aedcd 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/5] AM_PROG_AR for automake 1.12 compatibility
+
+Taken from
+http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html
+---
+ configure.ac |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index bb4d044..4c9c13a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,6 +37,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AM_PROG_AS
+ AC_PROG_CXX
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ gl_EARLY
+ 
+ # For includes/gnutls/gnutls.h.in.
+-- 
+1.7.9.2
+
+
+From da583995c66f2df7cac31435d1609754a6853d07 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Wed, 6 Jun 2012 10:09:48 +0200
+Subject: [PATCH 5/5] add missing include wincrypt.h
+
+taken from
+http://lists.gnu.org/archive/html/gnutls-devel/2012-06/msg00001.html
+---
+ lib/gnutls_x509.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
+index 71e0d69..130d75c 100644
+--- a/lib/gnutls_x509.c
++++ b/lib/gnutls_x509.c
+@@ -42,6 +42,9 @@
+ #include "x509/x509_int.h"
+ #include <gnutls_str_array.h>
+ #include "read-file.h"
++#if defined _WIN32 || defined __WIN32__
++#include <wincrypt.h>
++#endif
+ 
+ /*
+  * some x509 certificate parsing functions.
+-- 
+1.7.9.2
+