Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4d4755600152e798abc61d9c86215635d919718e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4d4755600152e798abc61d9c86215635d919718e)
  • Date: Tue, 4 Apr 2017 18:20:09 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

crypto/gnupg-2.1/DETAILS | 2 +-
crypto/gnupg-2.1/HISTORY | 3 +++
crypto/gpgme/CONFIGURE | 2 +-
crypto/gpgme/DETAILS | 4 ++++
crypto/gpgme/HISTORY | 9 +++++++--
crypto/gpgme/PREPARE | 25 +++----------------------
6 files changed, 19 insertions(+), 26 deletions(-)

New commits:
commit 4d4755600152e798abc61d9c86215635d919718e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

crypto/gpgme: version 1.9.0

commit 91f7e39b2beb85ad0347a85d2b9d50f39d434330
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

crypto/gnupg-2.1: version 2.1.20

diff --git a/crypto/gnupg-2.1/DETAILS b/crypto/gnupg-2.1/DETAILS
index c2fc63f..d337381 100755
--- a/crypto/gnupg-2.1/DETAILS
+++ b/crypto/gnupg-2.1/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnupg-2.1
- VERSION=2.1.19
+ VERSION=2.1.20
SECURITY_PATCH=0
PATCHLEVEL=0

diff --git a/crypto/gnupg-2.1/HISTORY b/crypto/gnupg-2.1/HISTORY
index f41efd4..46834e3 100644
--- a/crypto/gnupg-2.1/HISTORY
+++ b/crypto/gnupg-2.1/HISTORY
@@ -1,3 +1,6 @@
+2017-04-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 2.1.20
+
2017-03-01 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.1.19

diff --git a/crypto/gpgme/CONFIGURE b/crypto/gpgme/CONFIGURE
index 4fb5ebf..7bedd0c 100755
--- a/crypto/gpgme/CONFIGURE
+++ b/crypto/gpgme/CONFIGURE
@@ -1,6 +1,6 @@
source $GRIMOIRE/config_query_multi.function
case $GPGME_BRANCH in
- 1.7 | 1.8)
+ 1.[7-9])
config_query_multi GPG_LANG "which languages bindings to support" \
qt c++ python
;;
diff --git a/crypto/gpgme/DETAILS b/crypto/gpgme/DETAILS
index 82d9652..4073a5f 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -44,6 +44,10 @@ case $GPGME_BRANCH in
PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
;;
+ 1.9)
+ VERSION=1.9.0
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+ ;;
esac

SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/$SPELL/$SOURCE
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index a21ed37..cb11868 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,8 @@
+2017-04-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.9.0
+ * CONFIGURE: adjusted
+ * PREPARE: added 1.9 branch, simplified and corrected logic
+
2016-11-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.0
* PREPARE CONFIGURE DEPENDS: add 1.8 branch
@@ -35,8 +40,8 @@
* DEPENDS: gnupg-exp => GNUPG

2014-08-21 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.5.1
- SECURITY_PATCH++,, fixs CVE-2014-3564
+ * DETAILS: version 1.5.1,
+ SECURITY_PATCH++, fixes CVE-2014-3564
* DEPENDS: fix libassuan dependency

2014-06-03 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/crypto/gpgme/PREPARE b/crypto/gpgme/PREPARE
index bf2a292..1e2d4b8 100755
--- a/crypto/gpgme/PREPARE
+++ b/crypto/gpgme/PREPARE
@@ -1,33 +1,14 @@
# 2006-07-07
# GPGME_OLD -> GPGME_BRANCH

-if [[ $GPGME_OLD == y ]]; then
+if [[ ! -z "${GPGME_OLD}" ]]; then
persistent_add GPGME_BRANCH &&
GPGME_BRANCH="0.3" &&
persistent_remove GPGME_OLD
-fi
-
-if [[ $GPGME_OLD == n ]]; then
- persistent_add GPGME_BRANCH &&
- GPGME_BRANCH="DEFAULT" &&
- persistent_remove GPGME_OLD
-fi
+fi &&

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 1.4 1.5 1.6 1.7 1.8
-
-###
-# 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
-###
+ DEFAULT 0.3 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 &&

if [[ -z "$GPGME_BRANCH" ]] || [[ $GPGME_BRANCH == DEFAULT ]]; then
GPGME_BRANCH="1.3"



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4d4755600152e798abc61d9c86215635d919718e), Pavel Vinogradov, 04/04/2017

Archive powered by MHonArc 2.6.24.

Top of Page