[Pkg-gnupg-commit] [gnupg2] 183/185: import bugfixes from upstream
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Aug 7 11:55:40 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit 31dc3404a5e3c4a3f80cb4e82e8a31a4884805cd
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Mon Aug 7 01:16:49 2017 -0400
import bugfixes from upstream
---
...lain-the-server-is-older-than-xxx-warning.patch | 98 ++++++++++++++++++++++
...save-standard-revocation-certificate-in-f.patch | 38 +++++++++
...ouble-fingerprint-printing-with-import-sh.patch | 27 ++++++
debian/patches/series | 3 +
4 files changed, 166 insertions(+)
diff --git a/debian/patches/0013-Explain-the-server-is-older-than-xxx-warning.patch b/debian/patches/0013-Explain-the-server-is-older-than-xxx-warning.patch
new file mode 100644
index 0000000..76b31e0
--- /dev/null
+++ b/debian/patches/0013-Explain-the-server-is-older-than-xxx-warning.patch
@@ -0,0 +1,98 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Mon, 31 Jul 2017 11:20:47 +0200
+Subject: Explain the "server is older than xxx warning".
+
+* g10/call-agent.c (warn_version_mismatch): Print a note on how to
+restart the servers.
+* g10/call-dirmngr.c (warn_version_mismatch): Ditto.
+* sm/call-agent.c (warn_version_mismatch): Ditto.
+* sm/call-dirmngr.c (warn_version_mismatch): Ditto.
+--
+
+We should move this fucntion to common. However, the status output
+functions are different and would need to be streamlined too.
+
+GnuPG-bug-id: 3117
+Debian-bug-id: 860745
+Signed-off-by: Werner Koch <wk at gnupg.org>
+(cherry picked from commit 4ad5bc1b6d72483123963c894ee1412b2ceb99b4)
+---
+ g10/call-agent.c | 7 +++++++
+ g10/call-dirmngr.c | 8 ++++++++
+ sm/call-agent.c | 7 +++++++
+ sm/call-dirmngr.c | 7 +++++++
+ 4 files changed, 29 insertions(+)
+
+diff --git a/g10/call-agent.c b/g10/call-agent.c
+index 1ce6641..545b244 100644
+--- a/g10/call-agent.c
++++ b/g10/call-agent.c
+@@ -209,6 +209,13 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode)
+ else
+ {
+ log_info (_("WARNING: %s\n"), warn);
++ if (!opt.quiet)
++ {
++ log_info (_("Note: Outdated servers may lack important"
++ " security fixes.\n"));
++ log_info (_("Note: Use the command \"%s\" to restart them.\n"),
++ "gpgconf --kill all");
++ }
+ write_status_strings (STATUS_WARNING, "server_version_mismatch 0",
+ " ", warn, NULL);
+ xfree (warn);
+diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c
+index 9bae59f..362731e 100644
+--- a/g10/call-dirmngr.c
++++ b/g10/call-dirmngr.c
+@@ -157,6 +157,14 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername)
+ else
+ {
+ log_info (_("WARNING: %s\n"), warn);
++ if (!opt.quiet)
++ {
++ log_info (_("Note: Outdated servers may lack important"
++ " security fixes.\n"));
++ log_info (_("Note: Use the command \"%s\" to restart them.\n"),
++ "gpgconf --kill all");
++ }
++
+ write_status_strings (STATUS_WARNING, "server_version_mismatch 0",
+ " ", warn, NULL);
+ xfree (warn);
+diff --git a/sm/call-agent.c b/sm/call-agent.c
+index ba8fb12..772c9c3 100644
+--- a/sm/call-agent.c
++++ b/sm/call-agent.c
+@@ -108,6 +108,13 @@ warn_version_mismatch (ctrl_t ctrl, assuan_context_t ctx,
+ else
+ {
+ log_info (_("WARNING: %s\n"), warn);
++ if (!opt.quiet)
++ {
++ log_info (_("Note: Outdated servers may lack important"
++ " security fixes.\n"));
++ log_info (_("Note: Use the command \"%s\" to restart them.\n"),
++ "gpgconf --kill all");
++ }
+ gpgsm_status2 (ctrl, STATUS_WARNING, "server_version_mismatch 0",
+ warn, NULL);
+ xfree (warn);
+diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
+index 5ee15b7..9301940 100644
+--- a/sm/call-dirmngr.c
++++ b/sm/call-dirmngr.c
+@@ -175,6 +175,13 @@ warn_version_mismatch (ctrl_t ctrl, assuan_context_t ctx,
+ else
+ {
+ log_info (_("WARNING: %s\n"), warn);
++ if (!opt.quiet)
++ {
++ log_info (_("Note: Outdated servers may lack important"
++ " security fixes.\n"));
++ log_info (_("Note: Use the command \"%s\" to restart them.\n"),
++ "gpgconf --kill all");
++ }
+ gpgsm_status2 (ctrl, STATUS_WARNING, "server_version_mismatch 0",
+ warn, NULL);
+ xfree (warn);
diff --git a/debian/patches/0014-g10-Always-save-standard-revocation-certificate-in-f.patch b/debian/patches/0014-g10-Always-save-standard-revocation-certificate-in-f.patch
new file mode 100644
index 0000000..3877c5b
--- /dev/null
+++ b/debian/patches/0014-g10-Always-save-standard-revocation-certificate-in-f.patch
@@ -0,0 +1,38 @@
+From: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+Date: Wed, 2 Aug 2017 15:19:04 +0200
+Subject: g10: Always save standard revocation certificate in file.
+
+* g10/revoke.c (gen_standard_revocation): Set opt.outfile to NULL
+temporarily to create certificate in right place.
+
+Signed-off-by: Marcus Brinkmann <mb at g10code.com>
+GnuPG-bug-id: 3015
+(cherry picked from commit dcfb01959802b27869528dda1d9a4f5e79574bb5)
+---
+ g10/revoke.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/g10/revoke.c b/g10/revoke.c
+index 1dea6ae..4578700 100644
+--- a/g10/revoke.c
++++ b/g10/revoke.c
+@@ -532,6 +532,7 @@ gen_standard_revoke (ctrl_t ctrl, PKT_public_key *psk, const char *cache_nonce)
+ u32 keyid[2];
+ int kl;
+ char *orig_codeset;
++ char *old_outfile;
+
+ dir = get_openpgp_revocdir (gnupg_homedir ());
+ tmpstr = hexfingerprint (psk, NULL, 0);
+@@ -586,8 +587,11 @@ gen_standard_revoke (ctrl_t ctrl, PKT_public_key *psk, const char *cache_nonce)
+
+ reason.code = 0x00; /* No particular reason. */
+ reason.desc = NULL;
++ old_outfile = opt.outfile;
++ opt.outfile = NULL;
+ rc = create_revocation (ctrl,
+ fname, &reason, psk, NULL, leadin, 3, cache_nonce);
++ opt.outfile = old_outfile;
+ if (!rc && !opt.quiet)
+ log_info (_("revocation certificate stored as '%s.rev'\n"), fname);
+
diff --git a/debian/patches/0015-gpg-Avoid-double-fingerprint-printing-with-import-sh.patch b/debian/patches/0015-gpg-Avoid-double-fingerprint-printing-with-import-sh.patch
new file mode 100644
index 0000000..6c4c229
--- /dev/null
+++ b/debian/patches/0015-gpg-Avoid-double-fingerprint-printing-with-import-sh.patch
@@ -0,0 +1,27 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Fri, 4 Aug 2017 17:09:17 +0200
+Subject: gpg: Avoid double fingerprint printing with import-show.
+
+* g10/import.c (import_one) <IMPORT_SHOW>: Take care of fingerprint
+options.
+
+Signed-off-by: Werner Koch <wk at gnupg.org>
+(cherry picked from commit b54d75fb1dcfa2cebb3a2497b81ffb49acac2056)
+---
+ g10/import.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/g10/import.c b/g10/import.c
+index 8136625..144bec7 100644
+--- a/g10/import.c
++++ b/g10/import.c
+@@ -1774,7 +1774,8 @@ import_one (ctrl_t ctrl,
+ merge_keys_done = 1;
+ /* Note that we do not want to show the validity because the key
+ * has not yet imported. */
+- list_keyblock_direct (ctrl, keyblock, 0, 0, 1, 1);
++ list_keyblock_direct (ctrl, keyblock, 0, 0,
++ opt.fingerprint || opt.with_fingerprint, 1);
+ es_fflush (es_stdout);
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index ea6811b..1880c40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,6 @@ gpg-agent-idling/0009-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
gpg-agent-idling/0011-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch
+0013-Explain-the-server-is-older-than-xxx-warning.patch
+0014-g10-Always-save-standard-revocation-certificate-in-f.patch
+0015-gpg-Avoid-double-fingerprint-printing-with-import-sh.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list