[Pkg-gnupg-commit] [gnupg2] 158/159: dropping patches merged upstream
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Jan 27 13:24:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit b39ddf82911b48d2f6eed100d118e97c8922ff3c
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Wed Jan 27 01:39:15 2016 -0500
dropping patches merged upstream
---
debian/patches/0001-rename-gnupg2.patch | 4 +-
debian/patches/0002-avoid-beta-warning.patch | 2 +-
...0003-Avoid-simple-memory-dumps-via-ptrace.patch | 8 +-
...en-when-no-keyid-format-option-has-been-g.patch | 34 ----
...-keyservers-CA-where-it-should-have-been-.patch | 47 ------
...eyservers-CA-by-default-for-the-hkps-pool.patch | 130 ---------------
...ite-loop-when-doing-gen-revoke-by-fingerp.patch | 26 ---
...rror-out-if-a-key-occurs-multiple-times-i.patch | 182 ---------------------
debian/patches/series | 5 -
9 files changed, 7 insertions(+), 431 deletions(-)
diff --git a/debian/patches/0001-rename-gnupg2.patch b/debian/patches/0001-rename-gnupg2.patch
index b5b34c0..0ded98e 100644
--- a/debian/patches/0001-rename-gnupg2.patch
+++ b/debian/patches/0001-rename-gnupg2.patch
@@ -7,7 +7,7 @@ Subject: rename gnupg2
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 412ea8b..de3d842 100644
+index 266eae5..323d1c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ min_automake_version="1.14"
@@ -18,7 +18,7 @@ index 412ea8b..de3d842 100644
+m4_define([mym4_package],[gnupg2])
m4_define([mym4_major], [2])
m4_define([mym4_minor], [1])
- m4_define([mym4_micro], [10])
+ m4_define([mym4_micro], [11])
@@ -73,7 +73,7 @@ NEED_SQLITE_VERSION=3.7
development_version=mym4_isbeta
diff --git a/debian/patches/0002-avoid-beta-warning.patch b/debian/patches/0002-avoid-beta-warning.patch
index 1189fbd..acae1ff 100644
--- a/debian/patches/0002-avoid-beta-warning.patch
+++ b/debian/patches/0002-avoid-beta-warning.patch
@@ -19,7 +19,7 @@ See discussion at:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autogen.sh b/autogen.sh
-index 3fe24ea..0bdb019 100755
+index 7d843bd..0ad720a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -228,8 +228,8 @@ if [ "$myhost" = "find-version" ]; then
diff --git a/debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch b/debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch
index 84c7fea..805a478 100644
--- a/debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch
+++ b/debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch
@@ -21,7 +21,7 @@ Upstream bug: https://bugs.gnupg.org/gnupg/issue1211
2 files changed, 9 insertions(+)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index b60287d..233e848 100644
+index 8aab2b9..0f23a4a 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -48,6 +48,9 @@
@@ -34,7 +34,7 @@ index b60287d..233e848 100644
#define GNUPG_COMMON_NEED_AFLOCAL
#include "agent.h"
-@@ -713,6 +716,11 @@ main (int argc, char **argv )
+@@ -746,6 +749,11 @@ main (int argc, char **argv )
struct assuan_malloc_hooks malloc_hooks;
early_system_init ();
@@ -47,10 +47,10 @@ index b60287d..233e848 100644
/* Before we do anything else we save the list of currently open
file descriptors and the signal mask. This info is required to
diff --git a/configure.ac b/configure.ac
-index de3d842..457ec81 100644
+index 323d1c4..dd16763 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1311,6 +1311,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
+@@ -1322,6 +1322,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
AC_CHECK_FUNCS([strcasecmp strncasecmp ctermid times gmtime_r strtoull])
AC_CHECK_FUNCS([setenv unsetenv fcntl ftruncate inet_ntop])
AC_CHECK_FUNCS([canonicalize_file_name])
diff --git a/debian/patches/0004-fix-keystrlen-when-no-keyid-format-option-has-been-g.patch b/debian/patches/0004-fix-keystrlen-when-no-keyid-format-option-has-been-g.patch
deleted file mode 100644
index edaa037..0000000
--- a/debian/patches/0004-fix-keystrlen-when-no-keyid-format-option-has-been-g.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Wed, 9 Dec 2015 12:51:45 -0500
-Subject: fix keystrlen when no keyid-format option has been given
-
-* g10/keyid.c (keystrlen): if opt.keyid_format has not been set,
- default to 0xLONG, as is done in format_keyid.
-
---
-Without this fix, gpgv2 fails with:
-
-gpgv: Ohhhh jeeee: ... this is a bug (keyid.c:342:keystrlen)
-
-Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
----
- g10/keyid.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/g10/keyid.c b/g10/keyid.c
-index cb237ef..bb5c7b9 100644
---- a/g10/keyid.c
-+++ b/g10/keyid.c
-@@ -324,7 +324,11 @@ format_keyid (u32 *keyid, int format, char *buffer, int len)
- size_t
- keystrlen(void)
- {
-- switch(opt.keyid_format)
-+ int format = opt.keyid_format;
-+ if (format == KF_DEFAULT)
-+ format = KF_0xLONG;
-+
-+ switch(format)
- {
- case KF_SHORT:
- return 8;
diff --git a/debian/patches/0005-include-sks-keyservers-CA-where-it-should-have-been-.patch b/debian/patches/0005-include-sks-keyservers-CA-where-it-should-have-been-.patch
deleted file mode 100644
index c6262d5..0000000
--- a/debian/patches/0005-include-sks-keyservers-CA-where-it-should-have-been-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Thu, 10 Dec 2015 21:07:00 -0500
-Subject: include sks-keyservers CA where it should have been shipped
-
----
- dirmngr/sks-keyservers.netCA.pem | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
- create mode 100644 dirmngr/sks-keyservers.netCA.pem
-
-diff --git a/dirmngr/sks-keyservers.netCA.pem b/dirmngr/sks-keyservers.netCA.pem
-new file mode 100644
-index 0000000..24a2ad2
---- /dev/null
-+++ b/dirmngr/sks-keyservers.netCA.pem
-@@ -0,0 +1,32 @@
-+-----BEGIN CERTIFICATE-----
-+MIIFizCCA3OgAwIBAgIJAK9zyLTPn4CPMA0GCSqGSIb3DQEBBQUAMFwxCzAJBgNV
-+BAYTAk5PMQ0wCwYDVQQIDARPc2xvMR4wHAYDVQQKDBVza3Mta2V5c2VydmVycy5u
-+ZXQgQ0ExHjAcBgNVBAMMFXNrcy1rZXlzZXJ2ZXJzLm5ldCBDQTAeFw0xMjEwMDkw
-+MDMzMzdaFw0yMjEwMDcwMDMzMzdaMFwxCzAJBgNVBAYTAk5PMQ0wCwYDVQQIDARP
-+c2xvMR4wHAYDVQQKDBVza3Mta2V5c2VydmVycy5uZXQgQ0ExHjAcBgNVBAMMFXNr
-+cy1rZXlzZXJ2ZXJzLm5ldCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-+ggIBANdsWy4PXWNUCkS3L//nrd0GqN3dVwoBGZ6w94Tw2jPDPifegwxQozFXkG6I
-+6A4TK1CJLXPvfz0UP0aBYyPmTNadDinaB9T4jIwd4rnxl+59GiEmqkN3IfPsv5Jj
-+MkKUmJnvOT0DEVlEaO1UZIwx5WpfprB3mR81/qm4XkAgmYrmgnLXd/pJDAMk7y1F
-+45b5zWofiD5l677lplcIPRbFhpJ6kDTODXh/XEdtF71EAeaOdEGOvyGDmCO0GWqS
-+FDkMMPTlieLA/0rgFTcz4xwUYj/cD5e0ZBuSkYsYFAU3hd1cGfBue0cPZaQH2HYx
-+Qk4zXD8S3F4690fRhr+tki5gyG6JDR67aKp3BIGLqm7f45WkX1hYp+YXywmEziM4
-+aSbGYhx8hoFGfq9UcfPEvp2aoc8u5sdqjDslhyUzM1v3m3ZGbhwEOnVjljY6JJLx
-+MxagxnZZSAY424ZZ3t71E/Mn27dm2w+xFRuoy8JEjv1d+BT3eChM5KaNwrj0IO/y
-+u8kFIgWYA1vZ/15qMT+tyJTfyrNVV/7Df7TNeWyNqjJ5rBmt0M6NpHG7CrUSkBy9
-+p8JhimgjP5r0FlEkgg+lyD+V79H98gQfVgP3pbJICz0SpBQf2F/2tyS4rLm+49rP
-+fcOajiXEuyhpcmzgusAj/1FjrtlynH1r9mnNaX4e+rLWzvU5AgMBAAGjUDBOMB0G
-+A1UdDgQWBBTkwyoJFGfYTVISTpM8E+igjdq28zAfBgNVHSMEGDAWgBTkwyoJFGfY
-+TVISTpM8E+igjdq28zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAR
-+OXnYwu3g1ZjHyley3fZI5aLPsaE17cOImVTehC8DcIphm2HOMR/hYTTL+V0G4P+u
-+gH+6xeRLKSHMHZTtSBIa6GDL03434y9CBuwGvAFCMU2GV8w92/Z7apkAhdLToZA/
-+X/iWP2jeaVJhxgEcH8uPrnSlqoPBcKC9PrgUzQYfSZJkLmB+3jEa3HKruy1abJP5
-+gAdQvwvcPpvYRnIzUc9fZODsVmlHVFBCl2dlu/iHh2h4GmL4Da2rRkUMlbVTdioB
-+UYIvMycdOkpH5wJftzw7cpjsudGas0PARDXCFfGyKhwBRFY7Xp7lbjtU5Rz0Gc04
-+lPrhDf0pFE98Aw4jJRpFeWMjpXUEaG1cq7D641RpgcMfPFvOHY47rvDTS7XJOaUT
-+BwRjmDt896s6vMDcaG/uXJbQjuzmmx3W2Idyh3s5SI0GTHb0IwMKYb4eBUIpQOnB
-+cE77VnCYqKvN1NVYAqhWjXbY7XasZvszCRcOG+W3FqNaHOK/n/0ueb0uijdLan+U
-+f4p1bjbAox8eAOQS/8a3bzkJzdyBNUKGx1BIK2IBL9bn/HravSDOiNRSnZ/R3l9G
-+ZauX0tu7IIDlRCILXSyeazu0aj/vdT3YFQXPcvt5Fkf5wiNTo53f72/jYEJd6qph
-+WrpoKqrwGwTpRUCMhYIUt65hsTxCiJJ5nKe39h46sg==
-+-----END CERTIFICATE-----
diff --git a/debian/patches/0006-Use-sks-keyservers-CA-by-default-for-the-hkps-pool.patch b/debian/patches/0006-Use-sks-keyservers-CA-by-default-for-the-hkps-pool.patch
deleted file mode 100644
index ee3ac4b..0000000
--- a/debian/patches/0006-Use-sks-keyservers-CA-by-default-for-the-hkps-pool.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Mon, 19 Oct 2015 23:48:30 -0400
-Subject: Use sks-keyservers CA by default for the hkps pool.
-
-Ship the certificate for the sks-keyservers hkps pool. If the user
-has specified that they want to use
-hkps://hkps.pool.sks-keyservers.net, and they have not specified any
-hkp-cacert, then initialize the trust path with this targeted
-certificate.
----
- dirmngr/Makefile.am | 1 +
- dirmngr/http.c | 22 +++++++++++++++++++++-
- dirmngr/http.h | 3 ++-
- dirmngr/ks-engine-hkp.c | 2 +-
- dirmngr/ks-engine-http.c | 2 +-
- dirmngr/t-http.c | 2 +-
- 6 files changed, 27 insertions(+), 5 deletions(-)
-
-diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
-index c3bce0d..1c74d10 100644
---- a/dirmngr/Makefile.am
-+++ b/dirmngr/Makefile.am
-@@ -20,6 +20,7 @@
- ## Process this file with automake to produce Makefile.in
-
- EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem
-+dist_pkgdata_DATA = sks-keyservers.netCA.pem
-
- bin_PROGRAMS = dirmngr dirmngr-client
-
-diff --git a/dirmngr/http.c b/dirmngr/http.c
-index 74b6911..c4f7cbc 100644
---- a/dirmngr/http.c
-+++ b/dirmngr/http.c
-@@ -130,6 +130,8 @@
- "01234567890@" \
- "!\"#$%&'()*+,-./:;<=>?[\\]^_{|}~"
-
-+#define HKPS_POOL_CA_PEM GNUPG_DATADIR "/sks-keyservers.netCA.pem"
-+
- /* A long counter type. */
- #ifdef HAVE_STRTOULL
- typedef unsigned long long longcounter_t;
-@@ -562,7 +564,8 @@ http_session_release (http_session_t sess)
- /* Create a new session object which is currently used to enable TLS
- support. It may eventually allow reusing existing connections. */
- gpg_error_t
--http_session_new (http_session_t *r_session, const char *tls_priority)
-+http_session_new (http_session_t *r_session, const char *tls_priority,
-+ const char *intended_hostname)
- {
- gpg_error_t err;
- http_session_t sess;
-@@ -600,6 +603,23 @@ http_session_new (http_session_t *r_session, const char *tls_priority)
- goto leave;
- }
-
-+ /* if the user has not specified a CA list, and they are looking
-+ * for the hkps pool from sks-keyservers.net, then default to
-+ * Kristian's certificate authority:
-+ */
-+ if (!tls_ca_certlist)
-+ {
-+ if (intended_hostname &&
-+ 0 == strcasecmp("hkps.pool.sks-keyservers.net", intended_hostname))
-+ {
-+ rc = gnutls_certificate_set_x509_trust_file
-+ (sess->certcred, HKPS_POOL_CA_PEM, GNUTLS_X509_FMT_PEM);
-+ if (rc < 0)
-+ log_info ("setting CA from file '" HKPS_POOL_CA_PEM "' failed: %s\n",
-+ gnutls_strerror (rc));
-+
-+ }
-+ }
- for (sl = tls_ca_certlist; sl; sl = sl->next)
- {
- rc = gnutls_certificate_set_x509_trust_file
-diff --git a/dirmngr/http.h b/dirmngr/http.h
-index 64f55e1..58b8c1a 100644
---- a/dirmngr/http.h
-+++ b/dirmngr/http.h
-@@ -98,7 +98,8 @@ void http_register_tls_callback (gpg_error_t (*cb)(http_t,http_session_t,int));
- void http_register_tls_ca (const char *fname);
-
- gpg_error_t http_session_new (http_session_t *r_session,
-- const char *tls_priority);
-+ const char *tls_priority,
-+ const char *intended_hostname);
- http_session_t http_session_ref (http_session_t sess);
- void http_session_release (http_session_t sess);
-
-diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index e458899..f6af688 100644
---- a/dirmngr/ks-engine-hkp.c
-+++ b/dirmngr/ks-engine-hkp.c
-@@ -990,7 +990,7 @@ send_request (ctrl_t ctrl, const char *request, const char *hostportstr,
-
- *r_fp = NULL;
-
-- err = http_session_new (&session, NULL);
-+ err = http_session_new (&session, NULL, httphost);
- if (err)
- goto leave;
- http_session_set_log_cb (session, cert_log_cb);
-diff --git a/dirmngr/ks-engine-http.c b/dirmngr/ks-engine-http.c
-index ae128ee..c51c0ce 100644
---- a/dirmngr/ks-engine-http.c
-+++ b/dirmngr/ks-engine-http.c
-@@ -65,7 +65,7 @@ ks_http_fetch (ctrl_t ctrl, const char *url, estream_t *r_fp)
- estream_t fp = NULL;
- char *request_buffer = NULL;
-
-- err = http_session_new (&session, NULL);
-+ err = http_session_new (&session, NULL, NULL);
- if (err)
- goto leave;
- http_session_set_log_cb (session, cert_log_cb);
-diff --git a/dirmngr/t-http.c b/dirmngr/t-http.c
-index 63662a2..9d5ea5f 100644
---- a/dirmngr/t-http.c
-+++ b/dirmngr/t-http.c
-@@ -262,7 +262,7 @@ main (int argc, char **argv)
- http_register_tls_callback (verify_callback);
- http_register_tls_ca (cafile);
-
-- err = http_session_new (&session, NULL);
-+ err = http_session_new (&session, NULL, NULL);
- if (err)
- log_error ("http_session_new failed: %s\n", gpg_strerror (err));
-
diff --git a/debian/patches/0007-avoid-infinite-loop-when-doing-gen-revoke-by-fingerp.patch b/debian/patches/0007-avoid-infinite-loop-when-doing-gen-revoke-by-fingerp.patch
deleted file mode 100644
index 70a0db6..0000000
--- a/debian/patches/0007-avoid-infinite-loop-when-doing-gen-revoke-by-fingerp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Sat, 12 Dec 2015 16:52:17 -0500
-Subject: avoid infinite loop when doing --gen-revoke by fingerprint
-
-* g10/revoke.c (gen_revoke): avoid looping if search by full
- fingerprint finds the key in question.
-
-https://bugs.gnupg.org/gnupg/issue2187
----
- g10/revoke.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/g10/revoke.c b/g10/revoke.c
-index ba87f35..45fab7a 100644
---- a/g10/revoke.c
-+++ b/g10/revoke.c
-@@ -640,7 +640,8 @@ gen_revoke (const char *uname)
- }
-
- rc = keydb_search (kdbhd, &desc, 1, NULL);
-- if (gpg_err_code (rc) == GPG_ERR_NOT_FOUND)
-+ if (gpg_err_code (rc) == GPG_ERR_NOT_FOUND
-+ || desc.mode == KEYDB_SEARCH_MODE_FPR20)
- /* Not ambiguous. */
- {
- }
diff --git a/debian/patches/0008-gpg-Don-t-error-out-if-a-key-occurs-multiple-times-i.patch b/debian/patches/0008-gpg-Don-t-error-out-if-a-key-occurs-multiple-times-i.patch
deleted file mode 100644
index 93a1b79..0000000
--- a/debian/patches/0008-gpg-Don-t-error-out-if-a-key-occurs-multiple-times-i.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From: "Neal H. Walfield" <neal at g10code.com>
-Date: Fri, 11 Dec 2015 11:12:46 +0100
-Subject: gpg: Don't error out if a key occurs multiple times in the keyring.
-
-* g10/gpg.c (check_user_ids): Don't error out if a key occurs multiple
-times in the keyring. Instead, print a warning. When printing out
-fingerprint prints, use format_hexfingerprint to format them.
-
---
-Signed-off-by: Neal H. Walfield <neal at g10code.com>
----
- g10/gpg.c | 114 ++++++++++++++++++++++++++++++++++++++++++++------------------
- 1 file changed, 82 insertions(+), 32 deletions(-)
-
-diff --git a/g10/gpg.c b/g10/gpg.c
-index 2b48421..5c2a6c8 100644
---- a/g10/gpg.c
-+++ b/g10/gpg.c
-@@ -2116,6 +2116,8 @@ check_user_ids (strlist_t *sp,
-
- KEYDB_HANDLE hd = NULL;
-
-+ char fingerprint_formatted[MAX_FORMATTED_FINGERPRINT_LEN + 1];
-+
- /* A quick check to avoid allocating a new strlist if we can skip
- all keys. Handles also the case of !SP. See below for details. */
- for (t = s; t && (!(t->flags & PK_LIST_CONFIG)
-@@ -2135,6 +2137,9 @@ check_user_ids (strlist_t *sp,
- size_t fingerprint_bin_len = sizeof (fingerprint_bin);
- /* We also potentially need a ! at the end. */
- char fingerprint[2 * MAX_FINGERPRINT_LEN + 1 + 1];
-+ int added = 0;
-+ int dups = 0;
-+ int ambiguous = 0;
-
- /* If the key has been given on the command line and it has not
- been given by one of the encrypt-to options, we skip the
-@@ -2271,41 +2276,58 @@ check_user_ids (strlist_t *sp,
- i = strlen (fingerprint);
- fingerprint[i] = '!';
- fingerprint[i + 1] = '\0';
-+
-+ add_to_strlist (&s2, fingerprint);
-+ added = 1;
- }
-- else
-- {
-- fingerprint_from_pk (pk, fingerprint_bin, &fingerprint_bin_len);
-- assert (fingerprint_bin_len == sizeof (fingerprint_bin));
-- bin2hex (fingerprint_bin, MAX_FINGERPRINT_LEN, fingerprint);
-- }
-
-- add_to_strlist (&s2, fingerprint);
-+ /* We need the primary key's fingerprint to detect dups so
-+ always format it. */
-+ fingerprint_from_pk (pk, fingerprint_bin, &fingerprint_bin_len);
-+ assert (fingerprint_bin_len == sizeof (fingerprint_bin));
-+ bin2hex (fingerprint_bin, MAX_FINGERPRINT_LEN, fingerprint);
-+
-+ if (! added)
-+ add_to_strlist (&s2, fingerprint);
- s2->flags = s->flags;
-
- release_kbnode (kb);
-
- /* Continue the search. */
- if (DBG_LOOKUP)
-- log_debug ("%s: Check for duplicates for %s='%s'\n",
-+ log_debug ("%s: Checking if %s='%s' is ambiguous or there are dups\n",
- __func__, option, t->d);
-- err = keydb_search (hd, &desc, 1, NULL);
-- if (! err)
-- /* Another result! */
-+ while (1)
- {
- char fingerprint_bin2[MAX_FINGERPRINT_LEN];
- size_t fingerprint_bin2_len = sizeof (fingerprint_bin2);
- char fingerprint2[2 * MAX_FINGERPRINT_LEN + 1];
-
-- log_error (_("key specification '%s' is ambiguous\n"), t->d);
-- if (!opt.quiet)
-- log_info (_("(check argument of option '%s')\n"), option);
-+ err = keydb_search (hd, &desc, 1, NULL);
-+ if (gpg_err_code (err) == GPG_ERR_NOT_FOUND
-+ || gpg_err_code (err) == GPG_ERR_EOF)
-+ /* Not found => not ambiguous. */
-+ break;
-+ else if (err)
-+ /* An error (other than "not found"). */
-+ {
-+ log_error (_("error searching the keyring: %s\n"),
-+ gpg_strerror (err));
-+ if (! rc)
-+ rc = err;
-
-- if (! rc)
-- rc = GPG_ERR_AMBIGUOUS_NAME;
-+ break;
-+ }
-+
-+ /* Another result! */
-
- err = keydb_get_keyblock (hd, &kb);
- if (err)
-- log_error (_("error reading keyblock: %s\n"), gpg_strerror (err));
-+ {
-+ log_error (_("error reading keyblock: %s\n"), gpg_strerror (err));
-+ if (! rc)
-+ rc = err;
-+ }
- else
- {
- pk = kb->pkt->pkt.public_key;
-@@ -2313,25 +2335,53 @@ check_user_ids (strlist_t *sp,
- assert (fingerprint_bin2_len == sizeof (fingerprint_bin2));
- bin2hex (fingerprint_bin2, MAX_FINGERPRINT_LEN, fingerprint2);
-
-- /* TRANSLATORS: The %s prints a key specification which
-- for example has been given at the command line. Two
-- lines with fingerprints are printed after this message. */
-- log_info (_("'%s' matches at least:\n"), t->d);
-- log_info (" %s\n", fingerprint);
-- log_info (" %s\n", fingerprint2);
-+ if (strcmp (fingerprint, fingerprint2) == 0)
-+ dups ++;
-+ else
-+ {
-+ ambiguous ++;
-+
-+ if (! rc)
-+ rc = GPG_ERR_AMBIGUOUS_NAME;
-+
-+ if (ambiguous == 1)
-+ {
-+ /* TRANSLATORS: The %s prints a key
-+ specification which for example has been
-+ given at the command line. Lines with
-+ fingerprints are printed after this
-+ message. */
-+ log_error (_("key specification '%s' is ambiguous\n"),
-+ t->d);
-+ if (!opt.quiet)
-+ log_info (_("(check argument of option '%s')\n"),
-+ option);
-+
-+ log_info (_("'%s' matches at least:\n"), t->d);
-+ log_info (" %s\n",
-+ format_hexfingerprint
-+ (fingerprint,
-+ fingerprint_formatted,
-+ sizeof fingerprint_formatted));
-+ }
-+
-+ log_info (" %s\n",
-+ format_hexfingerprint
-+ (fingerprint2,
-+ fingerprint_formatted,
-+ sizeof fingerprint_formatted));
-+ }
-
- release_kbnode (kb);
- }
- }
-- else if (! (gpg_err_code (err) == GPG_ERR_NOT_FOUND
-- || gpg_err_code (err) == GPG_ERR_EOF))
-- /* An error (other than "not found"). */
-- {
-- log_error (_("error searching the keyring: %s\n"),
-- gpg_strerror (err));
-- if (! rc)
-- rc = err;
-- }
-+
-+ if (dups)
-+ log_info (_("Warning: %s appears in the keyring %d times.\n"),
-+ format_hexfingerprint (fingerprint,
-+ fingerprint_formatted,
-+ sizeof fingerprint_formatted),
-+ 1 + dups);
- }
-
- strlist_rev (&s2);
diff --git a/debian/patches/series b/debian/patches/series
index 9ab76a1..cafe59a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,3 @@
0001-rename-gnupg2.patch
0002-avoid-beta-warning.patch
0003-Avoid-simple-memory-dumps-via-ptrace.patch
-0004-fix-keystrlen-when-no-keyid-format-option-has-been-g.patch
-0005-include-sks-keyservers-CA-where-it-should-have-been-.patch
-0006-Use-sks-keyservers-CA-by-default-for-the-hkps-pool.patch
-0007-avoid-infinite-loop-when-doing-gen-revoke-by-fingerp.patch
-0008-gpg-Don-t-error-out-if-a-key-occurs-multiple-times-i.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