summaryrefslogtreecommitdiff
path: root/debian/patches/0005-add-gpg_is_modern-to-test-suite.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0005-add-gpg_is_modern-to-test-suite.patch')
-rw-r--r--debian/patches/0005-add-gpg_is_modern-to-test-suite.patch41
1 files changed, 0 insertions, 41 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,