Re: [OpenWrt-Devel] OpenWrt as non-profit

2008-09-23 Thread Simon Josefsson
Gregers Petersen <[EMAIL PROTECTED]> writes:

> Dear all
>
> There has for a while been discussions amongst the dev-group about
> making the big step towards OpenWrt.org achieving non-profit status.
>
> This would imply a number of future benifits and organizational changes
> to the project itself - but, there are also several practical hurdles
> which have to be crossed before the imagined line can be crossed.
>
> The primary challenge is if OpenWrt.org should either:
>
> 1. Build an independent non-profit foundation

This is a lot of work, so personally I'd prefer if you kept focused on
improving openwrt rather than dealing with paper work.  My home network
depends on it. ;)

> 2. Join on eof the exisitng umbrella entities, such as;
>
>   www.fsfeurope.org/projects/ftf/fiduciary.en.html

As far as I understand, this is only about copyright assignment, not
about getting a non-profit status.

If you believe getting a non-profit status in the US will help getting
donations (and I believe that is likely), I think you need an umbrella
with US-presence and non-profit registration.  Which leaves these two:

>   - SPI (donations, legal service + european partner) 
>   www.spi-inc.org/

Does SPI really have a european partner?  If so that may be an
advantage, but I haven't heard about it.

>   - Software Freedom Conservancy (legal help, donations)
>   conservancy.softwarefreedom.org/

Comparing SPI and SFC seems difficult.  Even looking at the projects
suggest both would be appropriate for OpenWRT: SFC has BusyBox and
uClibc, and SPI has madwifi.org.

One technical difference between SPI and SFC seem to be that SPI uses
Click&Pledge and SFC uses GoogleCheckout for donations.

Perhaps asking the busybox/uclibc/madwifi projects how well their
umbrellas work for them could give some insight.

Good luck,
/Simon
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] link status monitor (lsm) port for openwrt?

2009-03-17 Thread Simon Josefsson
Hi!  I've found the Link Status Monitor project:

http://lsm.foobar.fi/

Such a tool seems like it could be quite useful to switch between a
ethernet WAN and a backup 3G connection in OpenWRT routers, depending on
network connectivity, for example.

Do you know if anyone is working on a openwrt port of lsm?

(Or, is there already any other tool in openwrt that can achieve the
same thing easily?)

/Simon
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] Upgrade libgpg-error from v1.6 to v1.7.

2009-03-17 Thread Simon Josefsson
Signed-off-by: Simon Josefsson 
---
 libs/libgpg-error/Makefile |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile
index 4b4eb80..4e738f5 100644
--- a/libs/libgpg-error/Makefile
+++ b/libs/libgpg-error/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2005-2008 OpenWrt.org
+# Copyright (C) 2005-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,15 +9,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgpg-error
-PKG_VERSION:=1.6
-PKG_RELEASE:=2
+PKG_VERSION:=1.7
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
http://mirrors.rootmode.com/ftp.gnupg.org/libgpg-error/ \
http://gulus.usherbrooke.ca/pub/appl/GnuPG/libgpg-error/ \
http://gnupg.unixmexico.org/ftp/libgpg-error/
-PKG_MD5SUM:=f3e9870e213518b407a959f8d29cd554
+PKG_MD5SUM:=62c0d09d1e76c5b6da8fff92314c4665
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
-- 
1.5.6.5

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] Upgrade libgcrypt from 1.4.1 to 1.4.4.

2009-03-17 Thread Simon Josefsson
In case the patch is unclear, the file 001-handle-minimal-build.patch is
no longer needed.  The 002-no_docs_tests.patch file is just refreshed
with new paths.

Signed-off-by: Simon Josefsson 
---
 libs/libgcrypt/Makefile|8 +-
 .../patches/001-handle-minimal-build.patch |  215 
 libs/libgcrypt/patches/002-no_docs_tests.patch |   32 ++--
 3 files changed, 19 insertions(+), 236 deletions(-)
 delete mode 100644 libs/libgcrypt/patches/001-handle-minimal-build.patch

diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile
index 2da5aad..ce321c4 100644
--- a/libs/libgcrypt/Makefile
+++ b/libs/libgcrypt/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2005-2008 OpenWrt.org
+# Copyright (C) 2005-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgcrypt
-PKG_VERSION:=1.4.1
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-PKG_MD5SUM:=26703ecef4bbe113b8e6a87572b80b32
+PKG_MD5SUM:=34105aa927e23c217741966496b97e67
 
 PKG_FIXUP:=libtool
 
diff --git a/libs/libgcrypt/patches/001-handle-minimal-build.patch 
b/libs/libgcrypt/patches/001-handle-minimal-build.patch
deleted file mode 100644
index 46a5f70..000
--- a/libs/libgcrypt/patches/001-handle-minimal-build.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-diff -ur libgcrypt-1.4.1.orig/cipher/pubkey.c libgcrypt-1.4.1/cipher/pubkey.c
 libgcrypt-1.4.1.orig/cipher/pubkey.c   2007-12-13 13:40:38.0 
+0100
-+++ libgcrypt-1.4.1/cipher/pubkey.c2008-05-09 22:34:14.0 +0200
-@@ -1,6 +1,6 @@
- /* pubkey.c  -pubkey dispatcher
-  * Copyright (C) 1998, 1999, 2000, 2002, 2003,
-- *   2005, 2007 Free Software Foundation, Inc.
-+ *   2005, 2007, 2008 Free Software Foundation, Inc.
-  *
-  * This file is part of Libgcrypt.
-  *
-@@ -805,6 +805,7 @@
-   return err;
- }
- 
-+#if USE_ECC
- /* Internal function used for ecc.  Note, that this function makes use
-of its intimate knowledge about the ECC parameters from ecc.c. */
- static gcry_err_code_t
-@@ -887,7 +888,7 @@
- }
-   return err;
- }
--
-+#endif
- 
- 
- /
-@@ -978,9 +979,11 @@
- err = gpg_err_code_from_errno (errno);
-   if (!err)
- {
-+#if USE_ECC
-   if (is_ecc)
- err = sexp_elements_extract_ecc (list, elems, array);
-   else
-+#endif
- err = sexp_elements_extract (list, elems, array, pubkey->name);
- }
-   
-diff -ur libgcrypt-1.4.1.orig/tests/basic.c libgcrypt-1.4.1/tests/basic.c
 libgcrypt-1.4.1.orig/tests/basic.c 2008-04-22 11:03:33.0 +0200
-+++ libgcrypt-1.4.1/tests/basic.c  2008-05-09 22:41:41.0 +0200
-@@ -1,5 +1,5 @@
- /* basic.c  -  basic regression tests
-- *Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+ *Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, 
Inc.
-  *
-  * This file is part of Libgcrypt.
-  *
-@@ -1137,12 +1137,15 @@
- const char *expect;
-   } algos[] =
- {
-+#if USE_MD4
-   { GCRY_MD_MD4, "",
-   "\x31\xD6\xCF\xE0\xD1\x6A\xE9\x31\xB7\x3C\x59\xD7\xE0\xC0\x89\xC0" },
-   { GCRY_MD_MD4, "a",
-   "\xbd\xe5\x2c\xb3\x1d\xe3\x3e\x46\x24\x5e\x05\xfb\xdb\xd6\xfb\x24" },
-   {   GCRY_MD_MD4, "message digest",
-   "\xd9\x13\x0a\x81\x64\x54\x9f\xe8\x18\x87\x48\x06\xe1\xc7\x01\x4b" },
-+#endif
-+#if USE_MD4
-   {   GCRY_MD_MD5, "",
-   "\xD4\x1D\x8C\xD9\x8F\x00\xB2\x04\xE9\x80\x09\x98\xEC\xF8\x42\x7E" },
-   {   GCRY_MD_MD5, "a",
-@@ -1151,6 +1154,8 @@
-   "\x90\x01\x50\x98\x3C\xD2\x4F\xB0\xD6\x96\x3F\x7D\x28\xE1\x7F\x72" },
-   { GCRY_MD_MD5, "message digest",
-   "\xF9\x6B\x69\x7D\x7C\xB7\x93\x8D\x52\x5A\x2F\x31\xAA\xF1\x61\xD0" },
-+#endif
-+#if USE_SHA1
-   { GCRY_MD_SHA1, "abc",
-   "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E"
-   "\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" },
-@@ -1161,6 +1166,8 @@
-   { GCRY_MD_SHA1, "!" /* kludge for "a"*100 */ ,
-   "\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E"
-   "\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" },
-+#endif
-+#if USE_SHA224
-   /* From RFC3874 */
-   {   GCRY_MD_SHA224, "abc",
-   "\x23\x09\x7d\x22\x34\x05\xd8\x22\x86\x42\xa4\x77\xbd\xa2\x55\xb3"
-@@ -1172,6 +1179,8 @@
-   {   GCRY_MD_SHA224, "!",
-   "\x20\x79\x46\x55\x98\x0c\x91\xd8\xbb\xb4\xc1\xea\x97\x61\x8a\x4b"
-   "\xf0\x3f\x42\x58\x19\x48\xb2\xee\x4e\xe7\xad\x67" },
-+#endif
-+#if USE_SHA256
-   {   GCRY_MD_SHA256, "abc",
-  

[OpenWrt-Devel] [PATCH] Upgrade gnutls from 2.4.1 to 2.6.4.

2009-03-17 Thread Simon Josefsson
The upgrade fixes some known security vulnerabilities in the current
version.

Signed-off-by: Simon Josefsson 
---
 libs/gnutls/Makefile |   14 ++
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index a89c40e..81020f5 100644
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2005-2008 OpenWrt.org
+# Copyright (C) 2005-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,14 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnutls
-PKG_VERSION:=2.4.1
-PKG_RELEASE:=2
+PKG_VERSION:=2.6.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.gnu.org/pub/gnu/gnutls/ \
-   ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ \
-   http://josefsson.org/gnutls/releases/
-PKG_MD5SUM:=573db36cb3f8472b0293cfa1f52c607a
+   ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
+PKG_MD5SUM:=747111ab0d86e7b06a4bb120ba456ad8
 
 PKG_FIXUP = libtool
 
@@ -32,8 +31,7 @@ endef
 define Package/gnutls/Default/description
  GnuTLS is a project that aims to develop a library which provides a
  secure layer, over a reliable transport layer. Currently the GnuTLS
- library implements the proposed standards by the IETF's TLS working
- group.
+ library implements the SSL 3.0, TLS 1.0, and TLS 1.1 protocols.
 endef
 
 
-- 
1.5.6.5

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] Upgrade libidn from 1.12 to 1.13. Fix typo in description. Drop unneeded CC setting.

2009-03-17 Thread Simon Josefsson
Signed-off-by: Simon Josefsson 
---
 libs/libidn/Makefile |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile
index d61506f..4973e13 100644
--- a/libs/libidn/Makefile
+++ b/libs/libidn/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libidn
-PKG_VERSION:=1.12
+PKG_VERSION:=1.13
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=...@gnu/libidn
-PKG_MD5SUM:=49db2165868d3ec2af00e0b7d0924dd8
+PKG_MD5SUM:=101f13b1cb698080c77e38b8e8d4c6a4
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,14 +24,14 @@ define Package/libidn
   URL:=http://www.gnu.org/software/libidn/
 endef
 
-define Package/libgmp/description
+define Package/libidn/description
   GNU Libidn is a fully documented implementation of the Stringprep,
   Punycode and IDNA specifications. Libidn's purpose is to encode and
   decode internationalized domain names.
 endef
 
 TARGET_CFLAGS += $(FPIC)
-CONFIGURE_VARS += CC="$(TARGET_CROSS)gcc"
+
 CONFIGURE_ARGS += \
--enable-shared \
--enable-static \
-- 
1.5.6.5

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] opencdk update

2007-09-13 Thread Simon Josefsson
Hi!  Here is an update for the opencdk library, changes include:

* Use opencdk 0.6.4
* Depend on zlib.
* Remove patches/500-cross-compile.patch, not needed, and remove 'touch' calls
* Add patches/fix-tests-build which seems to be needed for some reason

The background why this is needed: Modern GnuTLS releases uses the
opencdk 0.6.x series.  GnuTLS ships with an internal copy of opencdk,
which is used if the system's opencdk is not found (that happens on
openwrt).  That makes libgnutls-extra on openwrt contain a copy of the
opencdk code.  It seems better to link with libopencdk instead.  I'll
send patches for gnutls later on.

Thanks,
Simon

Index: patches/500-cross-compile.patch
===
--- patches/500-cross-compile.patch (revision 8771)
+++ patches/500-cross-compile.patch (working copy)
@@ -1,28 +0,0 @@
-diff -ruN opencdk-0.5.5-orig/configure opencdk-0.5.5-1/configure
 opencdk-0.5.5-orig/configure   2004-06-20 15:54:29.0 +0200
-+++ opencdk-0.5.5-1/configure  2005-03-15 22:36:53.0 +0100
-@@ -19788,8 +19788,8 @@
- 
- 
- 
--LIBOPENCDK_LIBS="$LIBS -L${libdir} -lopencdk $LIBGCRYPT_LIBS"
--LIBOPENCDK_CFLAGS="$LIBGCRYPT_CFLAGS -I${includedir}"
-+LIBOPENCDK_LIBS="$LIBS -lopencdk $LIBGCRYPT_LIBS"
-+LIBOPENCDK_CFLAGS="$LIBGCRYPT_CFLAGS"
- 
- 
- 
-diff -ruN opencdk-0.5.5-orig/configure.ac opencdk-0.5.5-1/configure.ac
 opencdk-0.5.5-orig/configure.ac2004-06-05 19:46:31.0 +0200
-+++ opencdk-0.5.5-1/configure.ac   2005-03-15 22:36:26.0 +0100
-@@ -96,8 +96,8 @@
- ***
- ]]))
- 
--LIBOPENCDK_LIBS="$LIBS -L${libdir} -lopencdk $LIBGCRYPT_LIBS"
--LIBOPENCDK_CFLAGS="$LIBGCRYPT_CFLAGS -I${includedir}"
-+LIBOPENCDK_LIBS="$LIBS -lopencdk $LIBGCRYPT_LIBS"
-+LIBOPENCDK_CFLAGS="$LIBGCRYPT_CFLAGS"
- AC_SUBST(LIBOPENCDK_LIBS)
- AC_SUBST(LIBOPENCDK_CFLAGS)
- 
Index: patches/fix-tests-build
===
--- patches/fix-tests-build (revision 0)
+++ patches/fix-tests-build (revision 0)
@@ -0,0 +1,24 @@
+diff -ur opencdk-0.6.4-/tests/Makefile.am opencdk-0.6.4/tests/Makefile.am
+--- opencdk-0.6.4-/tests/Makefile.am   2007-06-11 12:16:37.0 +0200
 opencdk-0.6.4/tests/Makefile.am2007-09-13 19:54:03.0 +0200
+@@ -33,7 +33,7 @@
+ 
+ CLEANFILES = plain-test
+ 
+-LDADD = ../src/libopencdk.la
++LDADD = ../src/libopencdk.la $(LIBGCRYPT_LIBS)
+ 
+ if HAVE_W32_SYSTEM
+ # there is a problem with some tests and WINE
+diff -ur opencdk-0.6.4-/tests/Makefile.in opencdk-0.6.4/tests/Makefile.in
+--- opencdk-0.6.4-/tests/Makefile.in   2007-06-11 12:25:38.0 +0200
 opencdk-0.6.4/tests/Makefile.in2007-09-13 19:54:21.0 +0200
+@@ -257,7 +257,7 @@
+ AM_LDFLAGS = -no-install
+ AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS)
+ CLEANFILES = plain-test
+-LDADD = ../src/libopencdk.la
++LDADD = ../src/libopencdk.la $(LIBGCRYPT_LIBS)
+ noinst_HEADER = t-support.h
+ all: all-am
+ 
Index: Makefile
===
--- Makefile(revision 8771)
+++ Makefile(working copy)
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006, 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=opencdk
-PKG_VERSION:=0.5.5
+PKG_VERSION:=0.6.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -18,7 +18,7 @@

http://www.mirrors.wiretapped.net/security/network-security/gnutls/opencdk/ \

ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/opencdk/ \
http://josefsson.org/gnutls/releases/opencdk/
-PKG_MD5SUM:=aaff60107f0153873192ffda00699a96
+PKG_MD5SUM:=7bfc820bcdc08f0c31f860710368071e
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -29,7 +29,7 @@
 define Package/libopencdk
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libgcrypt
+  DEPENDS:=+libgcrypt zlib
   TITLE:=The Open Crypto Development Kit library
   DESCRIPTION:=\
This library provides basic parts of the OpenPGP message format.\\\
@@ -41,14 +41,6 @@
 endef
 
 define Build/Configure
-   (cd $(PKG_BUILD_DIR); touch \
-   configure.ac \
-   acinclude.m4 \
-   aclocal.m4 \
-   Makefile.in \
-   config.h.in \
-   configure \
-   );
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] offer to help co-maintain libgpg-error, libgcrypt, libtasn1, opencdk gnutls

2008-05-20 Thread Simon Josefsson
Hi!  I'm upstream maintainer for gnutls and libtasn1 (and some other
projects), and I have been sending updates for some package to get a
more modern gnutls version installed.  In one of the bug reports:

https://dev.openwrt.org/ticket/3424#comment:1

It was suggested to request svn access.  Now there has been a new gnutls
release that fixes some security fixes.  The patches for openwrt should
be trivial (change version and hash).

It would be simple for me to install a newer version myself if I got svn
write access to these projects, is that possible?

Thanks,
Simon
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] package/gnutls: update to 2.4.0

2008-06-19 Thread Simon Josefsson
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.0 
+0200
-+++ gnutls-2.2.3/libextra/gnutls_extra.c   2008-05-08 21:18:29.0 
+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
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel