Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (62f5b0d5bdbc723721ac4b5ba5b1f1d289f570fa)

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 master grimoire by Vlad Glagolev (62f5b0d5bdbc723721ac4b5ba5b1f1d289f570fa)
  • Date: Sun, 21 Mar 2010 13:44:13 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

crypto/gpgme/DEPENDS | 4 ++++
crypto/gpgme/DETAILS | 23 +++++------------------
crypto/gpgme/HISTORY | 5 +++++
crypto/gpgme/PREPARE | 19 ++++++++++++++++++-
4 files changed, 32 insertions(+), 19 deletions(-)

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

gpgme: => 1.3.0

p.s. do we really need all these branches (like in gnutls)?

diff --git a/crypto/gpgme/DEPENDS b/crypto/gpgme/DEPENDS
index 3e1aee9..a321cd5 100755
--- a/crypto/gpgme/DEPENDS
+++ b/crypto/gpgme/DEPENDS
@@ -1,4 +1,8 @@
depends gnupg &&
depends libgpg-error &&

+if [[ $GPGME_BRANCH == 1.3 ]]; then
+ depends libassuan
+fi &&
+
optional_depends gnupg-exp "" "" "to support the S/MIME variant of gpg -
GpgSM"
diff --git a/crypto/gpgme/DETAILS b/crypto/gpgme/DETAILS
index 3446fbe..013126b 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -1,23 +1,6 @@
SPELL=gpgme
SECURITY_PATCH=1

-###
-# 2006-07-07
-# GPGME_OLD -> GPGME_BRANCH
-
-if [[ $GPGME_OLD == y ]]; then
- GPGME_BRANCH="0.3"
-fi
-
-if [[ $GPGME_OLD == n ]]; then
- GPGME_BRANCH="DEFAULT"
-fi
-###
-
-if [[ -z "$GPGME_BRANCH" ]] || [[ $GPGME_BRANCH == DEFAULT ]]; then
- GPGME_BRANCH="1.2"
-fi
-
case $GPGME_BRANCH in
0.3)
VERSION=0.3.16
@@ -35,11 +18,15 @@ case $GPGME_BRANCH in
VERSION=1.2.0

SOURCE_HASH=sha512:ef91a8c19b93ed126f3347c09b7de22b472d9d5aa795755be014803130f4bbbfab991ecbd784eee5196f8d4853aa85addc3d5af19fe9ee0b7ae3037f42d91192
;;
+ 1.3)
+ VERSION=1.3.0
+
SOURCE_HASH=sha512:707e27e79d3ae3b4fd3fbbe0854dc932650a499bd767812261d384743eb04fbc4346a39ec55bfc401cc3cb6635ace09a692ed7ae39349392de099f65c452ac9c
+ ;;
esac

SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/$SPELL/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=GPL
WEB_SITE=http://www.gnupg.org/gpgme.html
ENTERED=20011031
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index e5066af..f686f69 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,8 @@
+2010-03-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, PREPARE: added 1.3 branch, updated spell to 1.3.0; moved
+ branch redefinition to PREPARE from DETAILS
+ * DEPENDS: added libassuan as req dep
+
2009-08-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: set default GPGME_BRANCH to 1.2 [Bug 15326]

diff --git a/crypto/gpgme/PREPARE b/crypto/gpgme/PREPARE
index f31a70f..4d04fb4 100755
--- a/crypto/gpgme/PREPARE
+++ b/crypto/gpgme/PREPARE
@@ -13,4 +13,21 @@ if [[ $GPGME_OLD == n ]]; then
persistent_remove GPGME_OLD
fi

-config_query_list GPGME_BRANCH "Which branch of GPGME do you want to build?"
DEFAULT 0.3 1.0 1.1 1.2
+config_query_list GPGME_BRANCH "Which branch of GPGME do you want to build?"
DEFAULT 0.3 1.0 1.1 1.2 1.3
+
+###
+# 2006-07-07
+# GPGME_OLD -> GPGME_BRANCH
+
+if [[ $GPGME_OLD == y ]]; then
+ GPGME_BRANCH="0.3"
+fi
+
+if [[ $GPGME_OLD == n ]]; then
+ GPGME_BRANCH="DEFAULT"
+fi
+###
+
+if [[ -z "$GPGME_BRANCH" ]] || [[ $GPGME_BRANCH == DEFAULT ]]; then
+ GPGME_BRANCH="1.3"
+fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (62f5b0d5bdbc723721ac4b5ba5b1f1d289f570fa), Vlad Glagolev, 03/21/2010

Archive powered by MHonArc 2.6.24.

Top of Page