From 7459237b4313116a18ec4f322ac3e3138cc05c4f Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 6 Jul 2008 16:52:34 +0000
Subject: [PATCH 1/1] Update gnutls to 2.4.0 (#3584)

SVN-Revision: 11722
---
 libs/gnutls/Makefile                          |  4 ++--
 libs/gnutls/patches/001-no_doc_tests_po.patch | 10 ++++------
 libs/gnutls/patches/002-disable_openpgp.patch | 20 -------------------
 3 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 libs/gnutls/patches/002-disable_openpgp.patch

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 94372eee88..5009eaadef 100644
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnutls
-PKG_VERSION:=2.2.3
+PKG_VERSION:=2.4.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://www.mirrors.wiretapped.net/security/network-security/gnut
 	ftp://ftp.gnutls.org/pub/gnutls/ \
 	ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ \
 	http://josefsson.org/gnutls/releases/
-PKG_MD5SUM:=71d9b7ec32a2a67854940a8848c2b229
+PKG_MD5SUM:=dce4000841ba5f80d310c4972b5f3efe
 
 PKG_FIXUP = libtool
 
diff --git a/libs/gnutls/patches/001-no_doc_tests_po.patch b/libs/gnutls/patches/001-no_doc_tests_po.patch
index 9697520747..ec8d0d3442 100644
--- a/libs/gnutls/patches/001-no_doc_tests_po.patch
+++ b/libs/gnutls/patches/001-no_doc_tests_po.patch
@@ -1,8 +1,6 @@
-Index: gnutls-2.2.3/Makefile.in
-===================================================================
---- gnutls-2.2.3.orig/Makefile.in	2008-05-08 21:18:29.000000000 +0200
-+++ gnutls-2.2.3/Makefile.in	2008-05-08 21:18:29.000000000 +0200
-@@ -537,7 +537,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -573,7 +573,7 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
@@ -10,4 +8,4 @@ Index: gnutls-2.2.3/Makefile.in
 +SUBDIRS = lgl gl includes lib libextra src \
  	$(am__append_1)
  ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lgl/m4
- tag = $(PACKAGE)_`echo $(VERSION) | sed 's/\./_/g'`
+ EXTRA_DIST = cfg.mk maint.mk .clcopying
diff --git a/libs/gnutls/patches/002-disable_openpgp.patch b/libs/gnutls/patches/002-disable_openpgp.patch
deleted file mode 100644
index f8bb535bbd..0000000000
--- a/libs/gnutls/patches/002-disable_openpgp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: gnutls-2.2.3/libextra/gnutls_extra.c
-===================================================================
---- gnutls-2.2.3.orig/libextra/gnutls_extra.c	2008-05-08 21:18:29.000000000 +0200
-+++ gnutls-2.2.3/libextra/gnutls_extra.c	2008-05-08 21:18:29.000000000 +0200
-@@ -137,6 +137,7 @@
-     }
- #endif
- 
-+#ifdef ENABLE_OPENPGP
-   /* Register the openpgp functions. This is because some
-    * of them are defined to be NULL in the main library.
-    */
-@@ -152,6 +153,7 @@
- 				 gnutls_openpgp_crt_deinit,
- 				 gnutls_openpgp_keyring_deinit,
- 				 gnutls_openpgp_privkey_deinit);
-+#endif
- 
-   return 0;
- }
-- 
2.30.2