Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 crypto/gnutls/DEPENDS |    9 +++----
 crypto/gnutls/DETAILS |   62 
++++----------------------------------------------
 crypto/gnutls/HISTORY |    4 +++
 crypto/gnutls/PREPARE |   24 +++++--------------
 4 files changed, 20 insertions(+), 79 deletions(-)

New commits:
commit e743363fdc7973458e56280f247fecb78024b9e3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    crypto/gnutls: remove unmaintained branches

diff --git a/crypto/gnutls/DEPENDS b/crypto/gnutls/DEPENDS
index dbbc96a..337a276 100755
--- a/crypto/gnutls/DEPENDS
+++ b/crypto/gnutls/DEPENDS
@@ -1,10 +1,9 @@
 depends libgcrypt "--with-libgcrypt" &&
 
-if [[ $GNUTLS_BRANCH == "3.0" ]] || [[ $GNUTLS_BRANCH == "3.1" ]] \
- || [[ $GNUTLS_BRANCH == "3.2" ]];then
-  depends LZMA &&
-  depends nettle
-fi &&
+depends LZMA   &&
+depends nettle &&
+depends gmp    &&
+
 optional_depends  "zlib"                          \
                   "--with-zlib"                   \
                   "--without-zlib"                \
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index f5fdd09..a233e1d 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -1,65 +1,14 @@
            SPELL=gnutls
-
-###
-# 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 [ ${GNUTLS_BRANCH%.*} == "1"] || [ "$GNUTLS_BRANCH" == "2.0" ]; then
-  GNUTLS_BRANCH="DEFAULT"
-fi
-
-if [ -z "$GNUTLS_BRANCH" ] || [ "$GNUTLS_BRANCH" == "DEFAULT" ]; then
-  GNUTLS_BRANCH="2.12"
-fi
-
 case $GNUTLS_BRANCH in
-  2.2)
-         VERSION=2.2.5
-          SOURCE=$SPELL-$VERSION.tar.bz2
-  ;;
-  2.4)
-         VERSION=2.4.2
-          SOURCE=$SPELL-$VERSION.tar.bz2
-  ;;
-  2.6)
-         VERSION=2.6.6
-          SOURCE=$SPELL-$VERSION.tar.bz2
-  ;;
-  2.8)
-         VERSION=2.8.6
-          SOURCE=$SPELL-$VERSION.tar.bz2
-  ;;
-  2.10)
-         VERSION=2.10.5
-          SOURCE=$SPELL-$VERSION.tar.bz2
-  ;;
-  2.12)
-         VERSION=2.12.23
-          SOURCE=$SPELL-$VERSION.tar.bz2
-  ;;
-  3.0)
-         VERSION=3.0.29
+  stable)
+         VERSION=3.2.12
           SOURCE=$SPELL-$VERSION.tar.xz
   ;;
-  3.1)
+  stable-old)
          VERSION=3.1.22
           SOURCE=$SPELL-$VERSION.tar.xz
   ;;
-  3.2)
-         VERSION=3.2.12
-          SOURCE=$SPELL-$VERSION.tar.xz
-  ;;
 esac
-
          SOURCE2=$SOURCE.sig
   SECURITY_PATCH=11
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -75,9 +24,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
            SHORT="GNU Transport Layer Security Library"
 cat << EOF
 GnuTLS (GNU Transport Layer Security Library) is a library which implements
-a secure
-layer over a reliable transport layer. Currently the GnuTLS library 
implements
-the proposed standards by the IETF's TLS working group.
+a secure layer over a reliable transport layer. Currently the GnuTLS library
+implements the proposed standards by the IETF's TLS working group.
 
 Quoting from RFC2246 - the TLS 1.0 protocol specification:
 
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index baf85bc..6cb0d17 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,6 +1,10 @@
 2014-03-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 3.2.12 and 3.1.22, this fixes CVE-2014-1959
          and CVE-2014-0092
+       * DEPENDS, DETAILS, PREPARE: remove support for unmaintained
+         versions
+       * PREPARE: switch to prepare_select_branch
+       * DEPENDS: add dependency on gmp
 
 2014-01-27 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: 3.2.9
diff --git a/crypto/gnutls/PREPARE b/crypto/gnutls/PREPARE
index 321c9a8..7f99c37 100755
--- a/crypto/gnutls/PREPARE
+++ b/crypto/gnutls/PREPARE
@@ -1,17 +1,7 @@
-# 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 2.2 2.4 2.6 2.8 2.10 2.12 3.0 3.1 3.2
+. ${GRIMOIRE}/FUNCTIONS &&
+if [[ "$GNUTLS_BRANCH" == "3.2" ]]; then
+  GNUTLS_BRANCH=stable
+elif [[ "$GNUTLS_BRANCH" == "3.1" ]]; then
+  GNUTLS_BRANCH=stable-old
+fi &&
+prepare_select_branch stable stable-old