gentoo resync : 03.11.2019

4 files changed, 124 insertions, 2 deletions

diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild
index 3145257e0c2e..9ef5aecdf16f 100644
--- a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild
+++ b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,6 +45,8 @@ PATCHES=(
 	"${FILESDIR}/${P}"-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch
 	"${FILESDIR}/${P}"-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch
 	"${FILESDIR}/${P}"-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch
+	"${FILESDIR}/${P}"-0030-gpg-2.2.6.patch
+	"${FILESDIR}/${P}"-0031-gpg-2.2.8.patch
 )
 
 src_prepare() {
diff --git a/dev-perl/GnuPG-Interface/Manifest b/dev-perl/GnuPG-Interface/Manifest
index 2d93a68b56e5..5f88817cb1a7 100644
--- a/dev-perl/GnuPG-Interface/Manifest
+++ b/dev-perl/GnuPG-Interface/Manifest
@@ -17,7 +17,9 @@ AUX GnuPG-Interface-0.520.0-0016-Test-use-of-gpg-without-explicit-passphrase-age
 AUX GnuPG-Interface-0.520.0-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch 1535 BLAKE2B ac7e1f395a5ce8afe1611156f65aa305ddb1f1ecb26cfc7176c81c411d92c6a71b6a3781f950c4c54b422c6205cef94fce2f45f8bc6545ddeece34af774b5ef7 SHA512 d1f5e3258543fad32cc317bd5b34ffda279fec39d533b0390ed941fee1f780b37dda767670e7ae8f6c68bcf206c089122cf46fc5f8c24e889b032132a1f85eb1
 AUX GnuPG-Interface-0.520.0-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch 4096 BLAKE2B 12d9bcd4931c9d8d5c3608beadbfb08bf144794cc13ac724bc2b21ab654facdec98e6293c42bf5c12e5867abd9af77b9c665ef903c91739484a40495bf069fcd SHA512 98d6b4d976013741c614265c8b9d35458461fb4407cbe10f8600c55522128a68a2976157e3165ca99aed733d2c5dee6164fa048a7671bdb9d37612a438327242
 AUX GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch 2237 BLAKE2B f152aa512f9fbc240d1862d5439928276fb4fdc73d716fcb4941504d7bc9fcf3facde6c06d2d52a7ca0628d3aa72e65248a1bb0237afe1e6c0585608f3c44b12 SHA512 a59ac575d410b5feb14a8a2165f526a1a7fbdf4575bc7e0d8d690a4d952fb312defb1390ae0186ec65b52737643ff560d5d48e8920bfe1cdcd1702016755035e
+AUX GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch 1897 BLAKE2B eca30b9a8485f7cb960ff343d1b575f324fcf6895c0fd723d14ebcccba14c69dd775ae315130af94a3246e3f8ddedb4ea9ba9c4c894f5e63b05fa8197e82f584 SHA512 5826dbc85925ac810dce695ea747ab2a4d361811295ce4f83925416c8c5842f8486e4275a3e610069157fa37e377413a39f1684ce94f618a99c46e7f6884264c
+AUX GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch 1511 BLAKE2B 3eee783efd64848bc0e86a0e0768c8dc77f8e28819fdc466913ac029cef7fcf42ff67edf89762b4b023d58df7c740b7d3d6a56ea2598699637edf5fb12840464 SHA512 7f8597d4a25e1492475810e47fb7988d74411cbe6ad537889c65bf37119572d1ae0c24e2f5c99d77d12edee3c46dd0e635125ee7a7dde99abeddd19d43fe7aa9
 DIST GnuPG-Interface-0.52.tar.gz 63733 BLAKE2B ce068177b8467356b57aae95a61e4746e4f690272083e465c877533a5ab0eedaaf271586aaffe7e4f979034d04bd49fc483047654426f23cfb904a98326454c3 SHA512 911f47a3b52249e8b39133d4040b86147793d9dd6a78d2b279674d6bba0cd38de5c919bf12b241b0e977790575502531afab6b1d2c05739d050c16d05d52fc49
 EBUILD GnuPG-Interface-0.520.0-r2.ebuild 2526 BLAKE2B 47dcc858720c846e2fa0612f20f1c39ced6423dcbe62a0211698a6b9ac57956480a68b5572608ce9fdf4a88dffe5ac0c46f648f23941c9be78a9d7824b47fde3 SHA512 efde13437f6e98749bd066e55dbc17e0ea75002e9f24fb8026031d35251d333ba751f666911d906b5e88cb3fb34d3d2ab1400901d0e0e9b9fbc45b2d8701d84f
-EBUILD GnuPG-Interface-0.520.0-r3.ebuild 2653 BLAKE2B 8af8a4f0f4a8af8e99d34c459271d69d67e5d3d427653580791d087d4e2308a9ee42e519b023baece00c2ddc54fe2a9661b3b52c0d8c5c454b411c5681ac747a SHA512 1b7c84e5bc0220fffaab2fe5d3f780d3e37db7375e2e99d532f535696a451c4c1c54990754191f10e700e94c8fa1b901fc935249d00efdd6799c62be43802dff
+EBUILD GnuPG-Interface-0.520.0-r3.ebuild 2732 BLAKE2B 7455e50a6d05099709ff308788f899e304776437537aaba8e2a94cfc59eb9a4f9657a3c25aeac5d6584799df003f51141e44c895b56b7dc595abadbf657d1e52 SHA512 38b65d5d82dcb1caecf719597a9887c9ad6d381641abbcac040cb87d5abd9566248492278f4ad7344f6539316f27a7673ef5f8e1326dbd6a1620a1305811e424
 MISC metadata.xml 1209 BLAKE2B a29e49d03ea5216897ae8d8ca55472c4d41d75a2722133dd2782b504db464740f15b5c017e09efb9a76da76b482f3f33e5b8cd8279402d51e14c201c8840d9b3 SHA512 3589a6d227ccde1efd9a0842e98b7f4c3d4f5434a9e62feba4a6764d1fdc4c0dc7390bba15bb52053520931c4ed4ff05235ec98efbe0239a4a9da12b30092cfb
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch
new file mode 100644
index 000000000000..1268beeb0a21
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch
@@ -0,0 +1,54 @@
+From 7c85ac40660861e7507c43d043323c3f1b83921b Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Wed, 20 Jun 2018 21:57:50 +0300
+Subject: [PATCH] Fix test suite for GnuPG >= 2.2.6 compatibility
+
+GnuPG 2.2.6 (commit 1a5d95e7319e7e6f) started marking signatures
+with an expired key with '?', as seen with for instance
+
+ GNUPGHOME=./test/gnupghome/ gpg --list-sigs 0xF950DA9C
+
+Adapt the test suite accordingly.
+
+See https://dev.gnupg.org/rG1a5d95e7319e7e6f0dd11064a26cbbc371b05214
+
+Bug-Debian: https://bugs.debian.org/900051
+---
+ t/get_public_keys.t | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/t/get_public_keys.t b/t/get_public_keys.t
+index 7893625..ede080a 100644
+--- a/t/get_public_keys.t
++++ b/t/get_public_keys.t
+@@ -13,8 +13,12 @@ use MyTestSpecific;
+ use GnuPG::PrimaryKey;
+ use GnuPG::SubKey;
+ 
++use version;
++
+ my ( $given_key, $handmade_key );
+ 
++my $gnupg_version = version->parse($gnupg->version);
++
+ TEST
+ {
+     reset_handles();
+@@ -74,7 +78,7 @@ TEST
+                             date_string => '2000-03-16',
+                             hex_id => '56FFD10A260C4FA3',
+                             sig_class => 0x10,
+-                            validity => '!'),
++                            validity => $gnupg_version < version->parse('2.2.6') ? '!' : '?'),
+       GnuPG::Signature->new(
+                             date => 949813093,
+                             algo_num => 17,
+@@ -115,7 +119,7 @@ TEST
+                             date_string => '2000-03-16',
+                             hex_id => '56FFD10A260C4FA3',
+                             sig_class => 0x10,
+-                            validity => '!'),
++                            validity => $gnupg_version < version->parse('2.2.6') ? '!' : '?'),
+       GnuPG::Signature->new(
+                             date => 953179891,
+                             algo_num => 17,
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch
new file mode 100644
index 000000000000..6c025007eef5
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch
@@ -0,0 +1,64 @@
+From b356e7fda15e39e037da1888a24000a96fc85c90 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sun, 24 Jun 2018 16:19:25 +0300
+Subject: [PATCH] Fix test suite for GnuPG >= 2.2.8 compatibility
+
+GnuPG 2.2.8 onwards issues a hard failure when decrypting
+messages not using the MDC mode.
+
+Bug-Debian: https://bugs.debian.org/900051
+---
+ t/decrypt.t | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/t/decrypt.t b/t/decrypt.t
+index ee41448..2d6740c 100644
+--- a/t/decrypt.t
++++ b/t/decrypt.t
+@@ -6,6 +6,7 @@
+ use strict;
+ use English qw( -no_match_vars );
+ use File::Compare;
++use version;
+ 
+ use lib './t';
+ use MyTest;
+@@ -13,6 +14,8 @@ use MyTestSpecific;
+ 
+ my $compare;
+ 
++my $gnupg_version = version->parse($gnupg->version);
++
+ TEST
+ {
+     reset_handles();
+@@ -26,7 +29,13 @@ TEST
+     close $stdout;
+     waitpid $pid, 0;
+ 
+-    return $CHILD_ERROR == 0;;
++    if ($gnupg_version < version->parse('2.2.8')) {
++        return $CHILD_ERROR == 0;;
++    } else {
++        local $/ = undef;
++        my $errstr = <$stderr>;
++        return (($CHILD_ERROR >> 8 == 2) and ($errstr =~ /ignore-mdc-error/));
++    }
+ };
+ 
+ 
+@@ -50,7 +59,13 @@ TEST
+ 
+     waitpid $pid, 0;
+ 
+-    return $CHILD_ERROR == 0;
++    if ($gnupg_version < version->parse('2.2.8')) {
++        return $CHILD_ERROR == 0;
++    } else {
++        local $/ = undef;
++        my $errstr = <$stderr>;
++        return (($CHILD_ERROR >> 8 == 2) and ($errstr =~ /ignore-mdc-error/));
++    }
+ };
+ 
+