Hi! This patch updates the gnutls package to v2.4.0. It also enables
PSK+SRP. Before the psktool was shipped in openwrt, but PSK was
disabled in the library which seemed rather pointless. Also, I think
PSK/SRP can be useful features on openwrt boxes, so it makes sense to
enable it. Further, LZO compression has been disabled by default in
v2.4, so the --without-lzo flag can be removed too, which the patch
does.
In case the patch isn't clear, the 002-disable_openpgp.patch file is
removed.
Thanks,
Simon
Signed-off-by: Simon Josefsson <[EMAIL PROTECTED]>
Index: patches/002-disable_openpgp.patch
===================================================================
--- patches/002-disable_openpgp.patch (revision 11539)
+++ patches/002-disable_openpgp.patch (working copy)
@@ -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;
- }
Index: Makefile
===================================================================
--- Makefile (revision 11539)
+++ Makefile (working copy)
@@ -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 @@
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
@@ -62,8 +62,8 @@
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 @@
--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 @@
$(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
_______________________________________________
openwrt-devel mailing list
[email protected]
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
