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

["Tony Vroon" <chainsaw@gentoo.org>]

commit:     2f3a4660ad47c1ba18cf18ad7e6b5c40b10622d7
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jul 13 08:52:30 2018 +0000
Commit:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 09:38:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f3a4660

app-crypt/gnupg: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/9210

 .../gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch    | 27 -------
 ...g-Properly-account-for-ring-trust-packets.patch | 86 ----------------------
 ...r-Handle-failures-related-to-missing-IPv6.patch | 31 --------
 3 files changed, 144 deletions(-)

diff --git a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch b/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch
deleted file mode 100644
index 292fc264ac8..00000000000
--- a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 692208fd6c1547cc7dd2062a1d1c9499bc0a8be4 Mon Sep 17 00:00:00 2001
-From: Justus Winter <justus@g10code.com>
-Date: Mon, 8 May 2017 13:52:39 +0200
-Subject: [PATCH] gpg: Fix typo.
-
---
-Signed-off-by: Justus Winter <justus@g10code.com>
----
- g10/packet.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/g10/packet.h b/g10/packet.h
-index a10495c..d42510d 100644
---- a/g10/packet.h
-+++ b/g10/packet.h
-@@ -623,7 +623,7 @@ struct parse_packet_ctx_s
-   iobuf_t inp;       /* The input stream with the packets.  */
-   struct packet_struct last_pkt; /* The last parsed packet.  */
-   int free_last_pkt; /* Indicates that LAST_PKT must be freed.  */
--  int skip_meta;     /* Skip right trust packets.  */
-+  int skip_meta;     /* Skip ring trust packets.  */
- };
- typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
- 
--- 
-2.10.2
-

diff --git a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch b/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch
deleted file mode 100644
index 58568db47d2..00000000000
--- a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 22739433e98be80e46fe7d01d52a9627c1aebaae Mon Sep 17 00:00:00 2001
-From: Justus Winter <justus@g10code.com>
-Date: Mon, 8 May 2017 14:24:00 +0200
-Subject: [PATCH] gpg: Properly account for ring trust packets.
-
-* g10/keyring.c (keyring_get_keyblock): Use the parser's packet count
-instead of counting ourself.
-* g10/packet.h (struct parse_packet_ctx_s): New field
-'n_parsed_packets'.
-(init_parse_packet): Initialize new field.
-* g10/parse-packet.c (parse): Count packets.
---
-
-The 'keyring' keystore depends on the number of packets for delete and
-update operations.  With the rework of the ring trust packets, the
-trust packets were no longer properly accounted for leading to keyring
-corruptions.
-
-The 'keybox' store was not affected.
-
-GnuPG-bug-id: 3123
-GnuPG-bug-id: 3135
-GnuPG-bug-id: 3144
-Fixes-commit: a8895c99a7d0750132477d80cd66caaf3a709113
-Signed-off-by: Justus Winter <justus@g10code.com>
----
- g10/keyring.c      | 4 ++--
- g10/packet.h       | 2 ++
- g10/parse-packet.c | 3 +++
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/g10/keyring.c b/g10/keyring.c
-index e223f0f..50f1b82 100644
---- a/g10/keyring.c
-+++ b/g10/keyring.c
-@@ -409,11 +409,11 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
-     pkt = xmalloc (sizeof *pkt);
-     init_packet (pkt);
-     init_parse_packet (&parsectx, a);
--    hd->found.n_packets = 0;;
-+    hd->found.n_packets = 0;
-     lastnode = NULL;
-     save_mode = set_packet_list_mode(0);
-     while ((rc=parse_packet (&parsectx, pkt)) != -1) {
--        hd->found.n_packets++;
-+        hd->found.n_packets = parsectx.n_parsed_packets;
-         if (gpg_err_code (rc) == GPG_ERR_UNKNOWN_PACKET) {
- 	    free_packet (pkt, &parsectx);
- 	    init_packet (pkt);
-diff --git a/g10/packet.h b/g10/packet.h
-index d42510d..cf2121c 100644
---- a/g10/packet.h
-+++ b/g10/packet.h
-@@ -624,6 +624,7 @@ struct parse_packet_ctx_s
-   struct packet_struct last_pkt; /* The last parsed packet.  */
-   int free_last_pkt; /* Indicates that LAST_PKT must be freed.  */
-   int skip_meta;     /* Skip ring trust packets.  */
-+  unsigned int n_parsed_packets;	/* Number of parsed packets.  */
- };
- typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
- 
-@@ -633,6 +634,7 @@ typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
-     (a)->last_pkt.pkt.generic= NULL;\
-     (a)->free_last_pkt = 0;         \
-     (a)->skip_meta = 0;             \
-+    (a)->n_parsed_packets = 0;      \
-   } while (0)
- 
- #define deinit_parse_packet(a) do { \
-diff --git a/g10/parse-packet.c b/g10/parse-packet.c
-index fa44f83..dbb7af8 100644
---- a/g10/parse-packet.c
-+++ b/g10/parse-packet.c
-@@ -764,6 +764,9 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
-                 partial? (new_ctb ? " partial" : " indeterminate") :"",
-                 new_ctb? " new-ctb":"");
- 
-+  /* Count it.  */
-+  ctx->n_parsed_packets++;
-+
-   pkt->pkttype = pkttype;
-   rc = GPG_ERR_UNKNOWN_PACKET;	/* default error */
-   switch (pkttype)
--- 
-2.10.2
-

diff --git a/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch b/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch
deleted file mode 100644
index 53843900b9f..00000000000
--- a/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b7f48a0095a5b010b94f8192f4adc1adf8697567 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 31 Jan 2018 16:57:19 +0100
-Subject: [PATCH] dirmngr: Handle failures related to missing IPv6 gracefully
-
-Handle the two possible connect failures related to missing IPv6 support
-gracefully by marking the host dead and retrying with another one.
-If IPv6 is disabled via procfs, connect() will return EADDRNOTAVAIL.
-If IPv6 is not compiled into the kernel, it will return EAFNOSUPPORT.
-This makes it possible to use dual-stack hkp servers on hosts not having
-IPv6 without random connection failures.
----
- dirmngr/ks-engine-hkp.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index 4a0b08f4f..a9bb93666 100644
---- a/dirmngr/ks-engine-hkp.c
-+++ b/dirmngr/ks-engine-hkp.c
-@@ -1353,6 +1353,8 @@ handle_send_request_error (ctrl_t ctrl, gpg_error_t err, const char *request,
-     case GPG_ERR_UNKNOWN_HOST:
-     case GPG_ERR_NETWORK:
-     case GPG_ERR_EIO:  /* Sometimes used by estream cookie functions.  */
-+    case GPG_ERR_EADDRNOTAVAIL:  /* e.g. when IPv6 is disabled */
-+    case GPG_ERR_EAFNOSUPPORT:  /* e.g. when IPv6 is not compiled in */
-       if (mark_host_dead (request) && *tries_left)
-         retry = 1;
-       break;
--- 
-2.16.1
-