From ee2ea948e3627a0721fc6e88067370cd8b7e6b5f Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 3 Jun 2013 19:45:44 +0200
Subject: [PATCH] gnutls: update to gnutls-3.2.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/security/gnutls/meta                 |  4 +--
 .../patches/gnutls-3.1.6-automake-1.13.patch  | 26 -------------------
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 packages/security/gnutls/patches/gnutls-3.1.6-automake-1.13.patch

diff --git a/packages/security/gnutls/meta b/packages/security/gnutls/meta
index 9230a3df64..d46c247fc8 100644
--- a/packages/security/gnutls/meta
+++ b/packages/security/gnutls/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="gnutls"
-PKG_VERSION="3.1.6"
+PKG_VERSION="3.2.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gnutls.org/"
-PKG_URL="ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="cryptodev-linux zlib"
 PKG_BUILD_DEPENDS="toolchain cryptodev-linux zlib nettle"
 PKG_PRIORITY="optional"
diff --git a/packages/security/gnutls/patches/gnutls-3.1.6-automake-1.13.patch b/packages/security/gnutls/patches/gnutls-3.1.6-automake-1.13.patch
deleted file mode 100644
index fa29af85a6..0000000000
--- a/packages/security/gnutls/patches/gnutls-3.1.6-automake-1.13.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gnutls-3.1.6/configure.ac gnutls-3.1.6.patch/configure.ac
---- gnutls-3.1.6/configure.ac	2013-01-02 19:01:38.000000000 +0100
-+++ gnutls-3.1.6.patch/configure.ac	2013-01-16 00:59:04.022275973 +0100
-@@ -25,9 +25,9 @@
- 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 dist-lzip -Wall -Wno-override])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AC_MSG_RESULT([***
- *** Checking for compilation programs...
-@@ -35,6 +35,10 @@
- 
- dnl Checks for programs.
- AC_PROG_CC
-+
-+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-+m4_pattern_allow([AM_PROG_AR])
-+AM_PROG_AR
- AM_PROG_AS
- AC_PROG_CXX
- gl_EARLY