[Lunar-commits] <moonbase> gnutls: version bump to 2.12.4

[Christian Krause]

commit 45820f18e9f178ad713b06a17150d0684874f740
Author: Christian Krause <wookietreiber at lunar-linux.org>
Date:   Wed May 11 11:36:23 2011 +0200

    gnutls: version bump to 2.12.4
    
    this bump includes new dependencies, some of them were included before in
    gnutls
    
    nettle is now the main cryptographic library instead of libgcrypt
    
    according to configure --help, lzo compression is an experimental feature,
    so I've removed the hard --with-lzo from BUILD and put an mquery in CONFIGURE
    with a default of no
---
 crypto/gnutls/BUILD     |    3 ++-
 crypto/gnutls/CONFIGURE |    1 +
 crypto/gnutls/DEPENDS   |    9 +++++----
 crypto/gnutls/DETAILS   |    8 ++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/crypto/gnutls/BUILD b/crypto/gnutls/BUILD
index f3505dd..5345af8 100644
--- a/crypto/gnutls/BUILD
+++ b/crypto/gnutls/BUILD
@@ -1,6 +1,7 @@
 (
 
-  OPTS+=" --with-lzo --disable-static"  &&
+  OPTS+=" --disable-static --without-included-pakchois --without-included-libcfg --without-included-libtasn1"  &&
+  LDFLAGS+=" -lpakchois"  &&
 
   default_build
 
diff --git a/crypto/gnutls/CONFIGURE b/crypto/gnutls/CONFIGURE
new file mode 100644
index 0000000..9c4659c
--- /dev/null
+++ b/crypto/gnutls/CONFIGURE
@@ -0,0 +1 @@
+mquery LZO "Use LZO compression? (experimental)" n "--with-lzo" "--without-lzo"
diff --git a/crypto/gnutls/DEPENDS b/crypto/gnutls/DEPENDS
index c452835..7d06b83 100644
--- a/crypto/gnutls/DEPENDS
+++ b/crypto/gnutls/DEPENDS
@@ -1,7 +1,8 @@
 depends opencdk
 depends libtasn1
+depends pakchois
+depends libcfg+
+depends readline
 
-optional_depends "guile"             \
-                 "--enable-guile"    \
-                 "--disable-guile"   \
-                 "for guile support"
+optional_depends "nettle" "--without-libgcrypt" "--with-libgcrypt" "for nettle as cryptographic library (recommended)"
+optional_depends "guile"  "--enable-guile"      "--disable-guile"  "for Guile bindings"
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index be69175..42c8aa3 100644
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gnutls
-         VERSION=2.10.5
+         VERSION=2.12.4
           SOURCE=$MODULE-$VERSION.tar.bz2
    SOURCE_URL[0]=ftp://ftp.gnutls.org/pub/$MODULE
    SOURCE_URL[1]=ftp://ftp.gnupg.org/gcrypt/$MODULE
-      SOURCE_VFY=sha1:4530657082a0e754356de89a5529d1ad7a18e777
-        WEB_SITE=http://www.gnu.org/software/gnutls
+      SOURCE_VFY=sha1:4bf25442eab5b30e4a3eb8fa2ba6945660763869
+        WEB_SITE=http://www.gnu.org/software/gnutls/
          ENTERED=20020212
-         UPDATED=20110313
+         UPDATED=20110511
            SHORT="A TLS library"
 
 cat << EOF