diff options
| author | Andrew Ruthven <puck@catalyst.net.nz> | 2020-07-05 22:22:16 +1200 |
|---|---|---|
| committer | Andrew Ruthven <puck@catalyst.net.nz> | 2020-07-05 22:40:04 +1200 |
| commit | b5fc972a223e018dd9b8142d4746386c582291b6 (patch) | |
| tree | 796cb8ea311dfc168e47582ea8bdb5c7725f94b3 /debian/patches | |
| parent | 9bedfb661d0a3708b86bb526a6a26bf515c22e27 (diff) | |
Remove patch no longer required
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0005-add-gpg_is_modern-to-test-suite.patch | 41 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 42 deletions
diff --git a/debian/patches/0005-add-gpg_is_modern-to-test-suite.patch b/debian/patches/0005-add-gpg_is_modern-to-test-suite.patch deleted file mode 100644 index 7e62ce5..0000000 --- a/debian/patches/0005-add-gpg_is_modern-to-test-suite.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> -Date: Tue, 13 Sep 2016 14:31:38 -0400 -Subject: add $gpg_is_modern to test suite - -MyTestSpecific.pm now produces a new variable indicating whether it -the version of GnuPG we run against is from the "Modern" line of GnuPG -development (2.1 or later). This will be useful when comparing output -that we can't expect from earlier versions. ---- - t/MyTestSpecific.pm | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/t/MyTestSpecific.pm -+++ b/t/MyTestSpecific.pm -@@ -30,13 +30,13 @@ - use vars qw( @ISA @EXPORT - $stdin $stdout $stderr - $gpg_program $handles $gnupg -- %texts -+ %texts $gpg_is_modern - ); - - @ISA = qw( Exporter ); - @EXPORT = qw( stdin stdout stderr - gnupg_program handles reset_handles -- texts file_match -+ texts file_match gpg_is_modern - ); - - my $homedir; -@@ -54,6 +54,10 @@ - $ENV{'GNUPGHOME'} = $homedir; - - $gnupg = GnuPG::Interface->new( passphrase => 'test' ); -+ -+my @version = split('\.', $gnupg->version()); -+$gpg_is_modern = ($version[0] > 2 || ($version[0] == 2 && $version[1] >= 1)); -+ - $gnupg->options->hash_init( homedir => $homedir, - armor => 1, - meta_interactive => 0, diff --git a/debian/patches/series b/debian/patches/series index 6bc155e..367fb2a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -0005-add-gpg_is_modern-to-test-suite.patch 0001-Fix-test-suite-for-GnuPG-2.2.6-compatibility.patch 0001-Fix-test-suite-for-GnuPG-2.2.8-compatibility.patch |