Source Mage code commit list

[Ladislav Hagara <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara AT unob.cz>:

 crypto/gnutls/DETAILS |   33 ++++++++++++++++++++++++++++++---
 crypto/gnutls/HISTORY |    4 ++++
 crypto/gnutls/PREPARE |   17 ++++++++++++++++-
 3 files changed, 50 insertions(+), 4 deletions(-)

New commits:
commit e8eb28a28f7a31b57d82c84d8de6f850f3ce0bab
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

    gnutls: integrated from devel grimoire (support for new 1.4 branch)

diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index c0800f4..ffe3063 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -1,14 +1,41 @@
            SPELL=gnutls
 
-if [ "$GNUTLS_OLD" == "y" ];then
+###
+# 2006-05-19
+# GNUTLS_OLD -> GNUTLS_BRANCH
+
+if [ "$GNUTLS_OLD" == "y" ]; then
+  GNUTLS_BRANCH="1.0"
+fi
+
+if [ "$GNUTLS_OLD" == "n" ]; then
+  GNUTLS_BRANCH="DEFAULT"
+fi
+###
+
+
+if [ -z "$GNUTLS_BRANCH" ] || [ "$GNUTLS_BRANCH" == "DEFAULT" ]; then
+  GNUTLS_BRANCH="1.2"
+fi
+
+case $GNUTLS_BRANCH in
+  1.0)
          VERSION=1.0.25
           SOURCE=$SPELL-$VERSION.tar.gz
           MD5[0]=f4959398d22ade4bf6ec54752e18ba86
-else
+  ;;
+  1.2)
          VERSION=1.2.11
           SOURCE=$SPELL-$VERSION.tar.bz2
      
SOURCE_HASH=sha512:d2cd6b1e3b15206a37d3db3bc9a7489dc951fef0d290c3244caa490839cf7be1e3f0197dcc1e634562d0d3449f21aa32a276d256eaa473e3c0e87905e54921bd
-fi
+  ;;
+  1.4)
+         VERSION=1.4.0
+          SOURCE=$SPELL-$VERSION.tar.bz2
+     
SOURCE_HASH=sha512:d77bf91e77a87afb4af981dea5c51268b9ce7533b6f9efed014f66efd780ff2e4f6275dcab0994f7f0611bf0a08e71fd2e27b167166c4be2cff289642692f2ef
+  ;;
+esac
+
 
        BUILD_API=2
   SECURITY_PATCH=1
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 3932fe6..d4f61d4 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,7 @@
+2006-05-19 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS, PREPARE: added support for new 1.4 branch (version 1.4.0)
+         GNUTLS_OLD -> GNUTLS_BRANCH
+
 2006-05-13 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: SECURITY_PATCH=1 [Bug 10892]
 
diff --git a/crypto/gnutls/PREPARE b/crypto/gnutls/PREPARE
index 10e5b02..2b62b9b 100755
--- a/crypto/gnutls/PREPARE
+++ b/crypto/gnutls/PREPARE
@@ -1 +1,16 @@
-config_query GNUTLS_OLD "Some spells may depend on OLD 1.0 branch of GnuTLS. 
Build 1.0 branch?" n
+# 2006-05-19
+# GNUTLS_OLD -> GNUTLS_BRANCH
+
+if [ "$GNUTLS_OLD" == "y" ]; then
+  persistent_add  GNUTLS_BRANCH  &&
+  GNUTLS_BRANCH="1.0"            &&
+  persistent_remove GNUTLS_OLD
+fi
+
+if [ "$GNUTLS_OLD" == "n" ]; then
+  persistent_add  GNUTLS_BRANCH  &&
+  GNUTLS_BRANCH="DEFAULT"        &&
+  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