From e944fe331527203eeeb938bd02cb20de0c975c2c Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 19 Apr 2010 09:08:33 +0000
Subject: [PATCH] gnutls: update to 2.8.6

SVN-Revision: 21029
---
 libs/gnutls/Makefile                          | 58 ++++++++++---------
 libs/gnutls/patches/001-no_doc_tests_po.patch |  8 +--
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index f6232e3b2..1316842b1 100644
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2005-2009 OpenWrt.org
+# Copyright (C) 2005-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,20 +8,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnutls
-PKG_VERSION:=2.8.5
+PKG_VERSION:=2.8.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNU/gnutls \
 	ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
-PKG_MD5SUM:=e3b2788b79bfc82acbe717e3c54d4e92
+PKG_MD5SUM:=eb0a6d7d3cb9ac684d971c14f9f6d3ba
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_LIBTOOL_PATHS:=. lib libextra
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/gnutls/Default
+  SUBMENU:=SSL
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=GNU TLS
@@ -66,9 +68,8 @@ endef
 
 define Package/libgnutls
 $(call Package/gnutls/Default)
- TITLE+= (library)
- DEPENDS+= +zlib +libgcrypt +libgpg-error
- SUBMENU:=SSL
+  TITLE+= (library)
+  DEPENDS+= +zlib +libgcrypt +libgpg-error
 endef
 
 define Package/libgnutls/description
@@ -79,9 +80,8 @@ endef
 
 define Package/libgnutls-extra
 $(call Package/gnutls/Default)
- TITLE+= (extra library)
- DEPENDS+= +libgnutls
- SUBMENU:=SSL
+  TITLE+= (extra library)
+  DEPENDS+= +libgnutls
 endef
 
 define Package/libgnutls-extra/description
@@ -92,9 +92,8 @@ endef
 
 define Package/libgnutls-openssl
 $(call Package/gnutls/Default)
- TITLE+= (OpenSSL compat library)
- DEPENDS+= +libgnutls
- SUBMENU:=SSL
+  TITLE+= (OpenSSL compat library)
+  DEPENDS+= +libgnutls
 endef
 
 define Package/libgnutls-openssl/description
@@ -102,8 +101,6 @@ $(call Package/gnutls/Default/description)
  This package contains the GnuTLS OpenSSL compatibility layer shared library.
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
 CONFIGURE_ARGS+= \
 	--enable-shared \
 	--enable-static \
@@ -114,26 +111,31 @@ CONFIGURE_ARGS+= \
 	--with-libgcrypt-prefix="$(STAGING_DIR)/usr" \
 	--with-libreadline-prefix="$(STAGING_DIR)/usr" \
 	--with-libz-prefix="$(STAGING_DIR)/usr" \
+	--without-lzo \
 
 # XXX: AM_CFLAGS duplicates with CFLAGS
-MAKE_ARGS:= \
+MAKE_FLAGS:= \
 	AM_CFLAGS="" \
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Configure
 	$(SED) 's,-I$$$${includedir},,g' $(PKG_BUILD_DIR)/configure
 	$(SED) 's,-L$$$${libdir},,g' $(PKG_BUILD_DIR)/configure
 	$(call Build/Configure/Default)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(1)/usr/lib/pkgconfig/
+	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/gnutls \
+		$(1)/usr/include/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} \
+		$(1)/usr/lib/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc \
+		$(1)/usr/lib/pkgconfig/
 endef
 
 define Package/certtool/conffiles
@@ -144,15 +146,17 @@ define Package/certtool/install
 	$(INSTALL_DIR) $(1)/etc/gnutls
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/certtool.cfg $(1)/etc/gnutls/
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/
 endef
 
 
 define Package/gnutls-utils/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/psktool $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/srptool $(1)/usr/bin/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} \
+		$(PKG_INSTALL_DIR)/usr/bin/psktool \
+		$(PKG_INSTALL_DIR)/usr/bin/srptool \
+		$(1)/usr/bin/
 endef
 
 
diff --git a/libs/gnutls/patches/001-no_doc_tests_po.patch b/libs/gnutls/patches/001-no_doc_tests_po.patch
index aa15ee00a..ebae7d465 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.8.5/Makefile.in
-===================================================================
---- gnutls-2.8.5.orig/Makefile.in	2009-11-02 11:36:03.000000000 +0100
-+++ gnutls-2.8.5/Makefile.in	2009-11-28 00:12:19.000000000 +0100
-@@ -147,7 +147,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -147,7 +147,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
  	distdir dist dist-all distcheck
  ETAGS = etags
  CTAGS = ctags
-- 
2.30.2