[gentoo-commits] repo/gentoo:master commit in: dev-perl/GnuPG-Interface/files/, dev-perl/GnuPG-Interface/
commit: 3842db814612481f5efb1320c1aab404fae09a40 Author: Sam James gentoo org> AuthorDate: Sat May 25 06:18:04 2024 + Commit: Sam James gentoo org> CommitDate: Sat May 25 06:21:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3842db81 dev-perl/GnuPG-Interface: don't call which We don't want to rely on sys-apps/which and it doesn't serve much purpose to do this check at all. We already die if we can't find the gpg version on the next line anyway. Signed-off-by: Sam James gentoo.org> dev-perl/GnuPG-Interface/GnuPG-Interface-1.30.0.ebuild | 6 +- .../files/GnuPG-Interface-1.30.0-which-hunt.patch| 16 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-1.30.0.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-1.30.0.ebuild index 44bf41c3feeb..e071f56eb781 100644 --- a/dev-perl/GnuPG-Interface/GnuPG-Interface-1.30.0.ebuild +++ b/dev-perl/GnuPG-Interface/GnuPG-Interface-1.30.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,6 +25,10 @@ BDEPEND=" >=virtual/perl-ExtUtils-MakeMaker-6.360.0 " +PATCHES=( + "${FILESDIR}"/GnuPG-Interface-1.30.0-which-hunt.patch +) + src_test() { # Nearly all tests succeed with this patchset and GnuPG 2.1 when running outside the # emerge sandbox. However, the agent architecture is not really sandbox-friendly, so... diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-1.30.0-which-hunt.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-1.30.0-which-hunt.patch new file mode 100644 index ..5e7f8b6a3efe --- /dev/null +++ b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-1.30.0-which-hunt.patch @@ -0,0 +1,16 @@ +We don't want to rely on sys-apps/which and it doesn't serve much purpose +to do this check at all. We already die if we can't find the gpg version +on the next line anyway. +--- a/Makefile.PL b/Makefile.PL +@@ -3,10 +3,6 @@ use strict; + use warnings; + use inc::Module::Install; + +-print "which gpg ... "; +-system("which", "gpg"); +-die "gpg (GnuPG) not found" if ( $? != 0 ); +- + my $output = `gpg --version`; + die "Can't determine gpg version" + unless $output =~ /^gpg \(GnuPG.*?\) (\d+\.\d+)/;
[gentoo-commits] repo/gentoo:master commit in: dev-perl/GnuPG-Interface/files/
commit: 0dae41e8d74ac1f793990cfbef93639a031ab6e6 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Nov 1 16:23:13 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon Nov 1 17:55:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dae41e8 dev-perl/GnuPG-Interface: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/22783 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> ...spelling-error-settting-should-be-setting.patch | 35 --- ...ce-0.520.0-0002-Generalize-the-test-suite.patch | 151 --- ...dity-of-an-key-when-we-have-established-n.patch | 37 --- ...04-ensure-that-test-covers-all-signatures.patch | 35 --- ...20.0-0005-add-gpg_is_modern-to-test-suite.patch | 39 --- ...G-2.1-reports-more-detail-about-secret-ke.patch | 120 ...match-plaintext-output-across-versions-of.patch | 95 --- ...fault_key_passphrase-when-passphrase-come.patch | 29 -- ...0.520.0-0009-clean-up-trailing-whitespace.patch | 112 ...-0.520.0-0010-fix-capitalization-of-GnuPG.patch | 35 --- ...0-0011-ommand_args-should-be-command_args.patch | 21 -- ...rints-as-inputs-during-tests-to-demonstra.patch | 265 -- ...20.0-0013-move-key-files-to-generic-names.patch | 33 --- ...0014-fix-spelling-s-convience-convenience.patch | 53 ...-new-secret-key-with-different-passphrase.patch | 117 ...-gpg-without-explicit-passphrase-agent-pi.patch | 302 - ...uPG-agent-before-and-after-the-test-suite.patch | 42 --- ...t-temporary-homedir-during-the-test-suite.patch | 110 ...-work-with-gpg1-assuming-plain-gpg-is-mod.patch | 51 .../GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch | 54 .../GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch | 64 - 21 files changed, 1800 deletions(-) diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch deleted file mode 100644 index fcec6100907..000 --- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Daniel Kahn Gillmor -Date: Tue, 13 Sep 2016 07:26:00 +0200 -Subject: fix spelling error ("settting" should be "setting") - - README | 2 +- - lib/GnuPG/Interface.pm | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/README b/README -index fcb982a..f457577 100644 a/README -+++ b/README -@@ -6,7 +6,7 @@ SYNOPSIS - use IO::Handle; - use GnuPG::Interface; - -- # settting up the situation -+ # setting up the situation - my $gnupg = GnuPG::Interface->new(); - $gnupg->options->hash_init( armor => 1, - homedir => '/home/foobar' ); -diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm -index f952f3e..83a4b1a 100644 a/lib/GnuPG/Interface.pm -+++ b/lib/GnuPG/Interface.pm -@@ -834,7 +834,7 @@ GnuPG::Interface - Perl interface to GnuPG - use IO::Handle; - use GnuPG::Interface; - -- # settting up the situation -+ # setting up the situation - my $gnupg = GnuPG::Interface->new(); - $gnupg->options->hash_init( armor => 1, - homedir => '/home/foobar' ); diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch deleted file mode 100644 index d0d3e6ccdf9..000 --- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch +++ /dev/null @@ -1,151 +0,0 @@ -From: Daniel Kahn Gillmor -Date: Tue, 13 Sep 2016 10:38:12 -0400 -Subject: Generalize the test suite - -The test suite currently assumes it knows something about the internal -state of GnuPG's homedir. - -It's safer and less brittle to rely explicitly on the public interface -that GnuPG has committed to, such as --import-keys and --list-keys, -rather than assuming that certain files are in certain places in the -GnuPG homedir. - -It's also better to create a fresh homedir and allow GnuPG to populate -it during the test suite, cleaning it up at the end, rather than hope -that GnuPG will leave a pre-existing homedir untouched. - -With this change, many more of the tests pass when /usr/bin/gpg is -provided by GnuPG 2.1. - t/000_setup.t | 28 - t/MyTestSpecific.pm| 2 +- - t/zzz_cleanup.t| 17 + - test/fake-pinentry.pl | 28 - test/{options => gpg.conf} | 0 - test/secret-keys/1.0.test | 4 ++-- - 6 files changed, 76 insertions(+), 3
[gentoo-commits] repo/gentoo:master commit in: dev-perl/GnuPG-Interface/files/, dev-perl/GnuPG-Interface/
commit: f4bc13f99c7d2cda324f742c6f49134ae8e9f1a3 Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Oct 25 18:06:25 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Oct 25 18:06:50 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4bc13f9 dev-perl/GnuPG-Interface: Fix tests with newer gnupg, patches by Niko Tyni Closes: https://bugs.gentoo.org/661716 Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Andreas K. Hüttel gentoo.org> .../GnuPG-Interface-0.520.0-r3.ebuild | 4 +- .../GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch | 54 ++ .../GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch | 64 ++ 3 files changed, 121 insertions(+), 1 deletion(-) 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 3145257e0c2..9ef5aecdf16 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/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 000..1268beeb0a2 --- /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 +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 000..6c025007eef --- /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 +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