[gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/files/

["Kristian Fiskerstrand" <k_f@gentoo.org>]

commit:     e87a33e05c8b9e57e95a9c766d767f0942fdafb5
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 20:32:11 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 20:32:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e87a33e0

app-crypt/gnupg: Clean up unused files

Package-Manager: portage-2.3.2

 ....0.26-Need-to-init-the-trustdb-for-import.patch |  35 ------
 app-crypt/gnupg/files/gnupg-2.0.26-misc-cve.patch  | 118 ---------------------
 .../files/gnupg-2.1-fix-gentoo-dash-issue.patch    |  12 ---
 .../gnupg-2.1.12-fix-signature-checking.patch      |  50 ---------
 4 files changed, 215 deletions(-)

diff --git a/app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch b/app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch
deleted file mode 100644
index 4c9eff2..00000000
--- a/app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a2dcc5cc49c3e79d64bd1a2ad7a5bc4df5b073ee Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Wed, 13 Aug 2014 11:13:34 +0200
-Subject: [PATCH] gpg: Need to init the trustdb for import.
-
-* g10/trustdb.c (clear_ownertrusts): Init trustdb.
-
---
-
-This was fixed in 1.4 branch in commit
-23191d7851eae2217ecdac6484349849a24fd94a but was not applied to the
-2.0 branch that exhibits the same problem. This is actually a hack
-to fix a bug introduced with commit 2528178.
-
-GnuPG-bug-id: 1622
----
- g10/trustdb.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/g10/trustdb.c b/g10/trustdb.c
-index f96701a..7bfef25 100644
---- a/g10/trustdb.c
-+++ b/g10/trustdb.c
-@@ -923,6 +923,8 @@ clear_ownertrusts (PKT_public_key *pk)
-   TRUSTREC rec;
-   int rc;
- 
-+  init_trustdb();
-+
-   if (trustdb_args.no_trustdb && opt.trust_model == TM_ALWAYS)
-     return 0;
- 
--- 
-1.8.5.5
-

diff --git a/app-crypt/gnupg/files/gnupg-2.0.26-misc-cve.patch b/app-crypt/gnupg/files/gnupg-2.0.26-misc-cve.patch
deleted file mode 100644
index 734a04a..00000000
--- a/app-crypt/gnupg/files/gnupg-2.0.26-misc-cve.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From ed8383c618e124cfa708c9ee87563fcdf2f4649c Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Fri, 19 Dec 2014 18:53:34 -0500
-Subject: [PATCH] sm: Avoid double-free on iconv failure
-
-* sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
-double-free of pwbuf.
-
---
-
-Observed by Joshua Rogers <honey@internot.info>, who proposed a
-slightly different fix.
-
-Debian-Bug-Id: 773472
-
-Added fix at a second place - wk.
----
- sm/minip12.c |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/agent/minip12.c b/agent/minip12.c
-index 01b91b7..ca4d248 100644
---- a/agent/minip12.c
-+++ b/agent/minip12.c
-@@ -2422,6 +2422,7 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t certlen,
-                      " requested charset '%s': %s\n",
-                      charset, strerror (errno));
-           gcry_free (pwbuf);
-+          pwbuf = NULL;
-           goto failure;
-         }
- 
-@@ -2436,6 +2437,7 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t certlen,
-                      " requested charset '%s': %s\n",
-                      charset, strerror (errno));
-           gcry_free (pwbuf);
-+          pwbuf = NULL;
-           jnlib_iconv_close (cd);
-           goto failure;
-         }
--- 
-1.7.10.4
-
-From b0b3803e8c2959dd67ca96debc54b5c6464f0d41 Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Fri, 19 Dec 2014 18:07:55 -0500
-Subject: [PATCH] scd: Avoid double-free on error condition in scd
-
-* scd/command.c (cmd_readkey): avoid double-free of cert
-
---
-
-When ksba_cert_new() fails, cert will be double-freed.
-
-Debian-Bug-Id: 773471
-
-Original patch changed by wk to do the free only at leave.
----
- scd/command.c |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/scd/command.c b/scd/command.c
-index dd4191f..1cc580a 100644
---- a/scd/command.c
-+++ b/scd/command.c
-@@ -804,10 +804,8 @@ cmd_readkey (assuan_context_t ctx, char *line)
- 
-   rc = ksba_cert_new (&kc);
-   if (rc)
--    {
--      xfree (cert);
--      goto leave;
--    }
-+    goto leave;
-+
-   rc = ksba_cert_init_from_mem (kc, cert, ncert);
-   if (rc)
-     {
--- 
-1.7.10.4
-
-From abd5f6752d693b7f313c19604f0723ecec4d39a6 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Mon, 22 Dec 2014 12:16:46 +0100
-Subject: [PATCH] dirmngr,gpgsm: Return NULL on fail
-
-* dirmngr/ldapserver.c (ldapserver_parse_one): Set SERVER to NULL.
-* sm/gpgsm.c (parse_keyserver_line): Ditto.
---
-
-Reported-by: Joshua Rogers <git@internot.info>
-
-  "If something inside the ldapserver_parse_one function failed,
-   'server' would be freed, then returned, leading to a
-   use-after-free.  This code is likely copied from sm/gpgsm.c, which
-   was also susceptible to this bug."
-
-Signed-off-by: Werner Koch <wk@gnupg.org>
----
- dirmngr/ldapserver.c |    1 +
- sm/gpgsm.c           |    1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/sm/gpgsm.c b/sm/gpgsm.c
-index 3398d17..72bceb4 100644
---- a/sm/gpgsm.c
-+++ b/sm/gpgsm.c
-@@ -862,6 +862,7 @@ parse_keyserver_line (char *line,
-     {
-       log_info (_("%s:%u: skipping this line\n"), filename, lineno);
-       keyserver_list_free (server);
-+      server = NULL;
-     }
- 
-   return server;
--- 
-1.7.10.4
-

diff --git a/app-crypt/gnupg/files/gnupg-2.1-fix-gentoo-dash-issue.patch b/app-crypt/gnupg/files/gnupg-2.1-fix-gentoo-dash-issue.patch
deleted file mode 100644
index 6878ef1..00000000
--- a/app-crypt/gnupg/files/gnupg-2.1-fix-gentoo-dash-issue.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur tests.old/openpgp/mds.test tests/openpgp/mds.test
---- tests.old/openpgp/mds.test	2016-05-03 13:13:11.373313389 +0200
-+++ tests/openpgp/mds.test	2016-05-03 13:13:31.886755059 +0200
-@@ -63,7 +63,7 @@
- 
- [ "$failed" != "" ] && error "$failed failed for empty string"
- 
--echo_n "abcdefghijklmnopqrstuvwxyz" | $GPG --with-colons --print-mds >y
-+printf "abcdefghijklmnopqrstuvwxyz" | $GPG --with-colons --print-mds >y
- if have_hash_algo "MD5"; then
-   test_one ":1:"    "C3FCD3D76192E4007DFB496CCA67E13B"
- fi

diff --git a/app-crypt/gnupg/files/gnupg-2.1.12-fix-signature-checking.patch b/app-crypt/gnupg/files/gnupg-2.1.12-fix-signature-checking.patch
deleted file mode 100644
index debf0bb..00000000
--- a/app-crypt/gnupg/files/gnupg-2.1.12-fix-signature-checking.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 83a90a916e8e2f8e44c3b11d11e1dd75f65a87fb Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Wed, 11 May 2016 19:27:03 +0900
-Subject: [PATCH 1/1] g10: Fix signature checking.
-
-* g10/sig-check.c (check_signature_over_key_or_uid): Fix call to
-walk_kbnode.
-
---
-
-Thanks to Vincent Brillault (Feandil).
-
-GnuPG-bug-id: 2351
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
----
- g10/sig-check.c | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/g10/sig-check.c b/g10/sig-check.c
-index 290f19a..7000b48 100644
---- a/g10/sig-check.c
-+++ b/g10/sig-check.c
-@@ -797,15 +797,20 @@ check_signature_over_key_or_uid (PKT_public_key *signer,
-             *is_selfsig = 1;
-         }
-       else
--        /* See if one of the subkeys was the signer (although this is
--           extremely unlikely).  */
-         {
-           kbnode_t ctx = NULL;
-           kbnode_t n;
- 
--          while ((n = walk_kbnode (kb, &ctx, PKT_PUBLIC_SUBKEY)))
-+          /* See if one of the subkeys was the signer (although this
-+             is extremely unlikely).  */
-+          while ((n = walk_kbnode (kb, &ctx, 0)))
-             {
--              PKT_public_key *subk = n->pkt->pkt.public_key;
-+              PKT_public_key *subk;
-+
-+              if (n->pkt->pkttype != PKT_PUBLIC_SUBKEY)
-+                continue;
-+
-+              subk = n->pkt->pkt.public_key;
-               if (sig->keyid[0] == subk->keyid[0]
-                   && sig->keyid[1] == subk->keyid[1])
-                 /* Issued by a subkey.  */
--- 
-2.8.0.rc3
-