Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (f3edbcbc0cbdc406c0a6a6ee7e3f24e24a235f99)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (f3edbcbc0cbdc406c0a6a6ee7e3f24e24a235f99)
  • Date: Thu, 23 Apr 2015 16:03:50 -0500

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

crypto/gnutls/DETAILS | 5 +++++
crypto/gnutls/HISTORY | 4 ++++
crypto/gnutls/PREPARE | 9 +++++----
3 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit f3edbcbc0cbdc406c0a6a6ee7e3f24e24a235f99
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gnutls: resurrected migration procedure

(cherry picked from commit 7f157fb36bcdb18d2a19c00ce724131a8f39a2af)

Conflicts:
crypto/gnutls/HISTORY

diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 454077b..b71abf1 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -1,4 +1,9 @@
SPELL=gnutls
+
+if [[ -z $GNUTLS_BRANCH ]]; then
+ GNUTLS_BRANCH="stable"
+fi
+
case $GNUTLS_BRANCH in
stable)
VERSION=3.3.12
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 33db28f..d13e6d5 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,7 @@
+2015-04-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, PREPARE: resurrected migration procedure which was killed
+ more than a year ago by commit (e743363)
+
2015-02-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: update stable to 3.3.12

diff --git a/crypto/gnutls/PREPARE b/crypto/gnutls/PREPARE
index 3c7353f..a121a3f 100755
--- a/crypto/gnutls/PREPARE
+++ b/crypto/gnutls/PREPARE
@@ -1,6 +1,7 @@
. ${GRIMOIRE}/FUNCTIONS &&
-case "$GNUTLS_BRANCH" in
-3.2) GNUTLS_BRANCH=stable;;
-3.1) GNUTLS_BRANCH=stable-old;;
-esac &&
+
+# backporting legacy branch selection
+if [[ "$GNUTLS_BRANCH" != stable ]] || [[ "$GNUTLS_BRANCH" != stable-old ]];
then
+ GNUTLS_BRANCH="stable"
+fi &&
prepare_select_branch stable stable-old



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (f3edbcbc0cbdc406c0a6a6ee7e3f24e24a235f99), Vlad Glagolev, 04/23/2015

Archive powered by MHonArc 2.6.24.

Top of Page