Skip to Content.
Sympa Menu

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

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 (be83fbe865eaa2c80da95072acc58c74d821487e)
  • Date: Sun, 17 May 2015 04:52:07 -0500

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

crypto/gnupg/DETAILS | 3 ++-
crypto/gnupg/HISTORY | 6 ++++++
crypto/gnupg/PRE_BUILD | 2 ++
crypto/gnupg/debug.patch | 24 ++++++++++++++++++++++++
4 files changed, 34 insertions(+), 1 deletion(-)

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

gnupg: fixed debug info output via official patch

diff --git a/crypto/gnupg/DETAILS b/crypto/gnupg/DETAILS
index d7b94bf..6edf3ca 100755
--- a/crypto/gnupg/DETAILS
+++ b/crypto/gnupg/DETAILS
@@ -1,5 +1,7 @@
SPELL=gnupg
VERSION=1.4.19
+ SECURITY_PATCH=12
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/$SPELL/$SOURCE

SOURCE_URL[1]=ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/$SPELL/$SOURCE
@@ -13,7 +15,6 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.gnupg.org/
ENTERED=20010922
- SECURITY_PATCH=12
LICENSE[0]=GPL
KEYWORDS="crypto"
SHORT="Tool for secure secure communication and data storage"
diff --git a/crypto/gnupg/HISTORY b/crypto/gnupg/HISTORY
index 5953087..0ee1571 100644
--- a/crypto/gnupg/HISTORY
+++ b/crypto/gnupg/HISTORY
@@ -1,3 +1,9 @@
+2015-05-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply patch
+ * debug.patch: backported official patch to fix debug info output
+ introduced in 1.4.19
+
2015-02-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.19; SECURITY_PATCH++ (CVE-2014-3591,
CVE-2015-0837); dropped broken mirrors; quoting paths
diff --git a/crypto/gnupg/PRE_BUILD b/crypto/gnupg/PRE_BUILD
index 8d04715..ac6d55a 100755
--- a/crypto/gnupg/PRE_BUILD
+++ b/crypto/gnupg/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+patch -p1 < "$SPELL_DIRECTORY/debug.patch" &&
+
sed -i "s:sparc9:sparcv9:;s:sparc8:sparcv8:" mpi/config.links
diff --git a/crypto/gnupg/debug.patch b/crypto/gnupg/debug.patch
new file mode 100644
index 0000000..5317d77
--- /dev/null
+++ b/crypto/gnupg/debug.patch
@@ -0,0 +1,24 @@
+From f34d88364a984947bcd7c344f9532f683b856353 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk AT gnupg.org>
+Date: Thu, 26 Feb 2015 09:38:58 +0100
+Subject: [PATCH] gpg: Remove left-over debug message.
+
+* g10/armor.c (check_input): Remove log_debug.
+---
+ g10/armor.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/g10/armor.c b/g10/armor.c
+index 4332d70..be03692 100644
+--- a/g10/armor.c
++++ b/g10/armor.c
+@@ -538,9 +538,6 @@ check_input( armor_filter_context_t *afx, IOBUF a )
+ /* This is probably input from a keyserver helper and we
+ have not yet seen an error line. */
+ afx->key_failed_code = parse_key_failed_line (line+4, len-4);
+- log_debug ("armor-keys-failed (%.*s) ->%d\n",
+- (int)len, line,
+- afx->key_failed_code);
+ }
+ if( i >= 0 && !(afx->only_keyblocks && i != 1 && i != 5 && i != 6 )) {
+ hdr_line = i;



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (be83fbe865eaa2c80da95072acc58c74d821487e), Vlad Glagolev, 05/17/2015

Archive powered by MHonArc 2.6.24.

Top of Page