Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

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

New commits:
commit 2576af64a09bc386832f06a803135122cac6609d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    gnutls: => 3.1.5

commit 60fbc185cdef02130ddcb2b884dc9053b39a9c0e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    libtasn1: => 3.2

diff --git a/crypto/gnutls/DEPENDS b/crypto/gnutls/DEPENDS
index 41d38c6..83c5712 100755
--- a/crypto/gnutls/DEPENDS
+++ b/crypto/gnutls/DEPENDS
@@ -1,6 +1,6 @@
 depends libgcrypt "--with-libgcrypt" &&
 
-if [[ $GNUTLS_BRANCH == "3.0" ]];then
+if [[ $GNUTLS_BRANCH == "3.0" ]] || [[ $GNUTLS_BRANCH == "3.1" ]];then
   depends LZMA &&
   depends nettle
 fi &&
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 9bb3801..9fb384f 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -50,6 +50,10 @@ case $GNUTLS_BRANCH in
          VERSION=3.0.21
           SOURCE=$SPELL-$VERSION.tar.xz
   ;;
+  3.1)
+         VERSION=3.1.5
+          SOURCE=$SPELL-$VERSION.tar.xz
+  ;;
 esac
 
          SOURCE2=$SOURCE.sig
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 679fd65..0a39617 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,8 @@
+2012-12-29 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: 3.1,5
+       * PREPARE: add new branch 3.1
+       * DEPENDS: test for 3.1 branch
+
 2012-12-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: updated WEB_SITE
 
diff --git a/crypto/gnutls/PREPARE b/crypto/gnutls/PREPARE
index 02d7781..afbc189 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 2.2 2.4 2.6 2.8 2.10 2.12 3.0
+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
diff --git a/libs/libtasn1/DETAILS b/libs/libtasn1/DETAILS
index 835c43a..3a737ae 100755
--- a/libs/libtasn1/DETAILS
+++ b/libs/libtasn1/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libtasn1
-         VERSION=2.14
+         VERSION=3.2
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
   SOURCE2_IGNORE=signature
diff --git a/libs/libtasn1/HISTORY b/libs/libtasn1/HISTORY
index f71cdca..e098c12 100644
--- a/libs/libtasn1/HISTORY
+++ b/libs/libtasn1/HISTORY
@@ -1,3 +1,6 @@
+2012-12-29 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 3.2
+
 2012-10-16 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.14