[Pkg-gnupg-commit] [gnupg2] 01/02: Avoid spurious warnings when sharing a keybox with gpg >= 2.1.20

[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 90b328afeb99cdde3111d2887b350ccf5a7d6777
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri May 5 22:45:00 2017 -0400

    Avoid spurious warnings when sharing a keybox with gpg >= 2.1.20
---
 ...oid-spurious-warnings-about-trust-packets.patch | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 40 insertions(+)

diff --git a/debian/patches/avoid-spurious-warnings/0078-gpg-Avoid-spurious-warnings-about-trust-packets.patch b/debian/patches/avoid-spurious-warnings/0078-gpg-Avoid-spurious-warnings-about-trust-packets.patch
new file mode 100644
index 0000000..d0d7921
--- /dev/null
+++ b/debian/patches/avoid-spurious-warnings/0078-gpg-Avoid-spurious-warnings-about-trust-packets.patch
@@ -0,0 +1,39 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Fri, 5 May 2017 22:37:23 -0400
+Subject: gpg: Avoid spurious warnings about trust packets.
+
+* g10/keydb.c (parse_keyblock_image): Do not emit a warning when
+skipping a trust packet.
+
+--
+
+2.1.20 and later store trust packets in the keybox.  If an older
+version (like 2.1.18) ends up accessing a keybox that 2.1.20 or later
+has used, it produces many spurious warnings like:
+
+    gpg: skipped packet of type 12 in keybox
+
+This is a temporary cleanup to avoid these specific warnings; it can
+be dropped when moving to 2.1.20 or later.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+---
+ g10/keydb.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/g10/keydb.c b/g10/keydb.c
+index aab90e3..81dd32e 100644
+--- a/g10/keydb.c
++++ b/g10/keydb.c
+@@ -1205,8 +1205,9 @@ parse_keyblock_image (iobuf_t iobuf, int pk_no, int uid_no,
+         default:
+           /* Note that can't allow ring trust packets here and some of
+              the other GPG specific packets don't make sense either.  */
+-          log_error ("skipped packet of type %d in keybox\n",
+-                     (int)pkt->pkttype);
++          if (pkt->pkttype != PKT_RING_TRUST)
++            log_error ("skipped packet of type %d in keybox\n",
++                       (int)pkt->pkttype);
+           free_packet(pkt);
+           init_packet(pkt);
+           continue;
diff --git a/debian/patches/series b/debian/patches/series
index 5458128..4ec24b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -75,3 +75,4 @@ gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
 0075-dirmngr-Fix-aliasing-problem-in-dns.c.patch
 skip-missing-signing-keys/0076-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch
 skel-file-removal/0077-g10-remove-skeleton-options-files.patch
+avoid-spurious-warnings/0078-gpg-Avoid-spurious-warnings-about-trust-packets.patch

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