From 317b39563ede7f5ef2c7d97d8570241dc3dc8f84 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 18 Feb 2012 22:51:54 +0100
Subject: update package gnutls

---
 src/gnutls-1-fixes.patch | 49 +++++++++++++-----------------------------------
 src/gnutls.mk            |  6 +++---
 2 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch
index ac66844..c54197f 100644
--- a/src/gnutls-1-fixes.patch
+++ b/src/gnutls-1-fixes.patch
@@ -3,17 +3,17 @@ See doc/index.html for further information.
 
 Contains ad hoc patches for cross building.
 
-From 69dd3870644eab761258bb27156af01dd29fb970 Mon Sep 17 00:00:00 2001
+From 81a760cf478becfaae88f6a8b2482c1ba1d2e18c Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Fri, 28 Oct 2011 09:23:41 +0200
-Subject: [PATCH 1/3] add missing static library linking
+Subject: [PATCH 1/2] add missing static library linking
 
 
 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
-index 32170b6..de032a2 100644
+index c45f8f3..57d0dbb 100644
 --- a/lib/gnutls.pc.in
 +++ b/lib/gnutls.pc.in
-@@ -20,6 +20,6 @@ Description: Transport Security Layer implementation for the GNU system
+@@ -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
@@ -22,51 +22,28 @@ index 32170b6..de032a2 100644
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}
 -- 
-1.7.8
+1.7.9
 
 
-From 11b726a91ae04db0158c47cf4ce218fd823d7f4c Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Thu, 24 Nov 2011 14:40:11 +0100
-Subject: [PATCH 2/3] don't try to build crywrap for windows
-
-
-diff --git a/configure.ac b/configure.ac
-index 78eb975..cd00934 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -437,7 +437,7 @@ else
- libidn=no
- fi
- 
--AM_CONDITIONAL(ENABLE_CRYWRAP, test "x$libidn" != "xno")
-+AM_CONDITIONAL(ENABLE_CRYWRAP, test "x$have_win" != "xyes" && test "x$libidn" != "xno")
- 
- dnl end of crywrap requirements
- 
--- 
-1.7.8
-
-
-From 020af519332485a21948e6662d347e33ecea7685 Mon Sep 17 00:00:00 2001
+From 1991251f013c43bbe3315a567c01d7c071b67192 Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Thu, 24 Nov 2011 15:06:06 +0100
-Subject: [PATCH 3/3] disable doc and test (mingw-cross-env specific)
+Subject: [PATCH 2/2] disable doc and test (mingw-cross-env specific)
 
 
 diff --git a/Makefile.am b/Makefile.am
-index 16861a2..d48abdf 100644
+index dd4bf17..10cb436 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -21,7 +21,7 @@
+@@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests
  
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests
+ SUBDIRS = gl lib extra po
  
--SUBDIRS = gl lib extra po src doc tests
-+SUBDIRS = gl lib extra po src
+-SUBDIRS += src doc tests
++SUBDIRS += src
  
  if HAVE_GUILE
  SUBDIRS += guile
 -- 
-1.7.8
+1.7.9
 
diff --git a/src/gnutls.mk b/src/gnutls.mk
index f72cb73..0c2113b 100644
--- a/src/gnutls.mk
+++ b/src/gnutls.mk
@@ -3,8 +3,8 @@
 
 # GnuTLS
 PKG             := gnutls
-$(PKG)_VERSION  := 3.0.11
-$(PKG)_CHECKSUM := 62a5c4c3777e5ed707de740667306a583cb0a118
+$(PKG)_VERSION  := 3.0.13
+$(PKG)_CHECKSUM := 8271de0f76ee4a35c238309ed4fb8a94bd1ac53b
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.xz
 $(PKG)_WEBSITE  := http://www.gnu.org/software/gnutls/
@@ -23,7 +23,7 @@ endef
 
 define $(PKG)_BUILD
     $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am'
-    cd '$(1)' && aclocal -I m4 -I gl/m4 --install
+    cd '$(1)' && aclocal -I m4 -I gl/m4 -I src/libopts/m4 --install
     cd '$(1)' && autoconf
     cd '$(1)' && automake
     # AI_ADDRCONFIG referenced by src/serv.c but not provided by mingw.
-- 
cgit v0.12