# HG changeset patch
# User Mark Brand <mabrand@mabrand.nl>
# Date 1333454749 -7200
# Node ID d850f952f766b8f4bb73b82c3850f990bdec8e9a
# Parent  1f418794d59f39dabf914a61a0719388401e0c97
update package gnutls

diff -r 1f418794d59f -r d850f952f766 index.html
--- a/index.html	Fri Apr 13 22:46:12 2012 +0200
+++ b/index.html	Tue Apr 03 14:05:49 2012 +0200
@@ -1164,7 +1164,7 @@
     </tr>
     <tr>
         <td id="gnutls-package">gnutls</td>
-        <td id="gnutls-version">3.0.17</td>
+        <td id="gnutls-version">3.0.18</td>
         <td id="gnutls-website"><a href="http://www.gnu.org/software/gnutls/">GnuTLS</a></td>
     </tr>
     <tr>
diff -r 1f418794d59f -r d850f952f766 src/gnutls-1-fixes.patch
--- a/src/gnutls-1-fixes.patch	Fri Apr 13 22:46:12 2012 +0200
+++ b/src/gnutls-1-fixes.patch	Tue Apr 03 14:05:49 2012 +0200
@@ -3,11 +3,14 @@
 
 Contains ad hoc patches for cross building.
 
-From 6e89465f1e792f5d527708544cce1ef92ae4669b Mon Sep 17 00:00:00 2001
-From: MXE
+From ef8ca0b0c163a5fbca686a292890479c498607c8 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/2] add missing static library linking
+Subject: [PATCH 1/3] add missing static library linking
 
+---
+ lib/gnutls.pc.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
 index c45f8f3..57d0dbb 100644
@@ -25,11 +28,14 @@
 1.7.9.2
 
 
-From aa11a6f645ce93f80fbffd7e72c6964bdfd68542 Mon Sep 17 00:00:00 2001
-From: MXE
+From e90e7ac3a472b0bef5475966ac06d7f2f12c712b 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/2] disable doc and test (MXE specific)
+Subject: [PATCH 2/3] disable doc and test (mingw-cross-env specific)
 
+---
+ Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
 index 0afe4bd..da7436a 100644
@@ -47,3 +53,31 @@
 -- 
 1.7.9.2
 
+
+From 5f92acf7123fed0e7a2c617a8abea48f00d83c19 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
+ tarball"
+
+This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f.
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ba60ce8..9af1253 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.0.18], [bug-gnutls@gnu.org])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override])
++AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wall -Werror -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AM_CONFIG_HEADER(config.h)
+ 
+-- 
+1.7.9.2
+
diff -r 1f418794d59f -r d850f952f766 src/gnutls.mk
--- a/src/gnutls.mk	Fri Apr 13 22:46:12 2012 +0200
+++ b/src/gnutls.mk	Tue Apr 03 14:05:49 2012 +0200
@@ -2,7 +2,7 @@
 # See index.html for further information.
 
 PKG             := gnutls
-$(PKG)_CHECKSUM := 2e2adc41e0c75d8170fdca5955bd007ae93ceada
+$(PKG)_CHECKSUM := 2aeac620a26e6c8f266954110578d8817939b084
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnutls.org/pub/gnutls/$($(PKG)_FILE)