[Pkg-gnupg-commit] [gnupg2] 01/03: restore keyid output in gpgv (Closes: #836144)

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 5a7acdfe561fdb31eeaec673bdc102e23d642a26
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Aug 31 12:24:03 2016 -0400

    restore keyid output in gpgv (Closes: #836144)
---
 ...egression-in-gpgv-s-printing-of-the-keyid.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0005-gpg-Fix-regression-in-gpgv-s-printing-of-the-keyid.patch b/debian/patches/0005-gpg-Fix-regression-in-gpgv-s-printing-of-the-keyid.patch
new file mode 100644
index 0000000..2635035
--- /dev/null
+++ b/debian/patches/0005-gpg-Fix-regression-in-gpgv-s-printing-of-the-keyid.patch
@@ -0,0 +1,26 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Wed, 31 Aug 2016 08:37:51 +0200
+Subject: gpg: Fix regression in gpgv's printing of the keyid.
+
+* g10/keyid.c (keystr): Take care of KF_NONE != KF_DEFAULT.
+--
+
+Debian-bug-id: 836144
+Signed-off-by: Werner Koch <wk at gnupg.org>
+---
+ g10/keyid.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/g10/keyid.c b/g10/keyid.c
+index 84990a3..bd396ee 100644
+--- a/g10/keyid.c
++++ b/g10/keyid.c
+@@ -403,6 +403,8 @@ keystr (u32 *keyid)
+   static char keyid_str[KEYID_STR_SIZE];
+   int format = opt.keyid_format;
+ 
++  if (format == KF_DEFAULT)
++    format = KF_NONE;
+   if (format == KF_NONE)
+     format = KF_LONG;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2698e89..3f854c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Avoid-simple-memory-dumps-via-ptrace.patch
 0003-avoid-regenerating-defsincdate-use-shipped-file.patch
 0004-spelling-s-achived-achieved-and-s-alternativly-alter.patch
+0005-gpg-Fix-regression-in-gpgv-s-printing-of-the-keyid.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git