From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 27 Jul 2008 12:34:42 +0000 (+0000)
Subject: Update gnults to 2.4.1, package psktool as well (#3787)
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=0b8459e07c83fd3a22529303ef3f9ad950b11140;p=packages.git

Update gnults to 2.4.1, package psktool as well (#3787)


git-svn-id: svn://svn.openwrt.org/openwrt/packages@11958 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 5009eaade..f7cb18fea 100644
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnutls
-PKG_VERSION:=2.4.0
+PKG_VERSION:=2.4.1
 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:=dce4000841ba5f80d310c4972b5f3efe
+PKG_MD5SUM:=573db36cb3f8472b0293cfa1f52c607a
 
 PKG_FIXUP = libtool
 
@@ -62,8 +62,8 @@ endef
 
 define Package/gnutls-utils/description
 $(call Package/gnutls/Default/description)
- This package contains the GnuTLS gnutls-cli, gnutls-serv and psktool
- utilities.
+ This package contains the GnuTLS gnutls-cli, gnutls-serv, psktool,
+ and srptool utilities.
 endef
 
 
@@ -106,13 +106,10 @@ CONFIGURE_ARGS+= \
 	--enable-shared \
 	--enable-static \
 	--disable-openpgp-authentication \
-	--disable-psk-authentication \
-	--disable-srp-authentication \
 	--with-libgcrypt-prefix="$(STAGING_DIR)/usr" \
 	--with-libreadline-prefix="$(STAGING_DIR)/usr" \
 	--with-libz-prefix="$(STAGING_DIR)/usr" \
-	--with-libtasn1-prefix="$(STAGING_DIR)/usr" \
-	--without-lzo
+	--with-libtasn1-prefix="$(STAGING_DIR)/usr"
 
 # XXX: AM_CFLAGS duplicates with CFLAGS
 MAKE_ARGS:= \
@@ -152,6 +149,7 @@ 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/
 endef