Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e26cc0823d1ccdecb517006228ecb359346f4d8c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e26cc0823d1ccdecb517006228ecb359346f4d8c)
  • Date: Sun, 28 Sep 2014 13:37:45 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

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

New commits:
commit e26cc0823d1ccdecb517006228ecb359346f4d8c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gnutls: Update stable branch to 3.2.18

commit 3fc6aedff7a8e0564011d67cefb1fe4d9f6ca02c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gnutls: Simplify branch version handling

diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 86acf00..d5326b6 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -1,20 +1,17 @@
SPELL=gnutls
case $GNUTLS_BRANCH in
stable)
- VERSION=3.2.17
- SOURCE=$SPELL-$VERSION.tar.xz
+ VERSION=3.2.18
;;
stable-old)
VERSION=3.1.26
- SOURCE=$SPELL-$VERSION.tar.xz
;;
esac
- BRANCH_VER=$(awk 'BEGIN{FS="."}{print $1"."$2}' <<< $VERSION)
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SECURITY_PATCH=12
- SOURCE_DIR_VER=$(awk 'BEGIN{FS="."}{print $1"."$2"."$3}' <<< $VERSION)
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$SOURCE_DIR_VER
- SOURCE_URL[0]=ftp://ftp.gnutls.org/gcrypt/gnutls/v$BRANCH_VER/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=ftp://ftp.gnutls.org/gcrypt/gnutls/v${VERSION%.*}/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index efe27f2..f15bcec 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,7 @@
+2014-09-28 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Simplified branch version handling
+ * DETAILS: updated stable branch to 3.2.18
+
2014-08-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.2.17 and 3.1.26

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



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e26cc0823d1ccdecb517006228ecb359346f4d8c), Ismael Luceno, 09/28/2014

Archive powered by MHonArc 2.6.24.

Top of Page