Source Mage code commit list

[Ladislav Hagara <scm AT sourcemage.org>]

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

 crypto/gnutls/DEPENDS |    2 +-
 crypto/gnutls/DETAILS |    5 +++++
 crypto/gnutls/HISTORY |    3 +++
 crypto/gnutls/PREPARE |    2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 19caceb16e4d73cb1f9fab682a229d4d4259e28d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    gnutls 2.12.1

diff --git a/crypto/gnutls/DEPENDS b/crypto/gnutls/DEPENDS
index f10d56d..119197f 100755
--- a/crypto/gnutls/DEPENDS
+++ b/crypto/gnutls/DEPENDS
@@ -1,4 +1,4 @@
-depends  libgcrypt  &&
+depends libgcrypt "--with-libgcrypt" &&
 
 optional_depends  "zlib"                          \
                   "--with-zlib"                   \
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index ff73ff7..ae2f0ee 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -69,6 +69,11 @@ case $GNUTLS_BRANCH in
           SOURCE=$SPELL-$VERSION.tar.bz2
      
SOURCE_HASH=sha512:2856827ebf9e85592d373d1b0031257da6a3ce9256a51fa0d1a1661c6778f913b51ba1a51c919ef14b3f1737c7babc37bc0eb13524be981c8059bebe94e2ece3
   ;;
+  2.12)
+         VERSION=2.12.1
+          SOURCE=$SPELL-$VERSION.tar.bz2
+     
SOURCE_HASH=sha512:0cdd4b9973a2202047a820f0a6e58bba0d4fcf3aa8eca429bdd86d60150addc034b7a64f4764774a649a8b90f11382f7add4450d451863dba14b8c84e1cb10e8
+  ;;
 esac
 
 
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index ec778c3..6479754 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2011-04-04 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS, PREPARE, DEPENDS: 2.12.1, support for new stable 2.12 
branch
+
 2011-03-01 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.10.5, SECURITY_PATCH=7
 
diff --git a/crypto/gnutls/PREPARE b/crypto/gnutls/PREPARE
index 55bedf3..66848fc 100755
--- a/crypto/gnutls/PREPARE
+++ b/crypto/gnutls/PREPARE
@@ -13,4 +13,4 @@ if [ "$GNUTLS_OLD" == "n" ]; then
   persistent_remove GNUTLS_OLD
 fi
 
-config_query_list GNUTLS_BRANCH "Which branch of GnuTLS do you want to 
build?" DEFAULT 1.0 1.2 1.4 1.6 2.0 2.2 2.4 2.6 2.8 2.10
+config_query_list GNUTLS_BRANCH "Which branch of GnuTLS do you want to 
build?" DEFAULT 1.0 1.2 1.4 1.6 2.0 2.2 2.4 2.6 2.8 2.10 2.12