diff -Nru libgnupg-interface-perl-0.52/debian/changelog libgnupg-interface-perl-0.52/debian/changelog --- libgnupg-interface-perl-0.52/debian/changelog 2017-05-28 14:48:21.000000000 +0000 +++ libgnupg-interface-perl-0.52/debian/changelog 2018-06-29 08:20:20.000000000 +0000 @@ -1,3 +1,19 @@ +libgnupg-interface-perl (0.52-10) unstable; urgency=medium + + * Team upload. + + [ Salvatore Bonaccorso ] + * Update Vcs-* headers for switch to salsa.debian.org + + [ Niko Tyni ] + * Patch the test suite for GnuPG >= 2.2.8 compatibility. + (Closes: #900051) + * Update to debhelper compat level 10 + * Update to Standards-Version 4.1.4 + * Declare that the package does not need (fake)root to build + + -- Niko Tyni Fri, 29 Jun 2018 11:20:20 +0300 + libgnupg-interface-perl (0.52-9) unstable; urgency=medium * upload to unstable diff -Nru libgnupg-interface-perl-0.52/debian/compat libgnupg-interface-perl-0.52/debian/compat --- libgnupg-interface-perl-0.52/debian/compat 2016-09-14 18:35:56.000000000 +0000 +++ libgnupg-interface-perl-0.52/debian/compat 2018-06-29 08:20:08.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru libgnupg-interface-perl-0.52/debian/control libgnupg-interface-perl-0.52/debian/control --- libgnupg-interface-perl-0.52/debian/control 2017-05-28 14:48:08.000000000 +0000 +++ libgnupg-interface-perl-0.52/debian/control 2018-06-29 08:20:08.000000000 +0000 @@ -5,17 +5,18 @@ Salvatore Bonaccorso , Daniel Kahn Gillmor , Section: perl +Rules-Requires-Root: no Testsuite: autopkgtest-pkg-perl Priority: optional -Build-Depends: debhelper (>= 9) +Build-Depends: debhelper (>= 10) Build-Depends-Indep: gnupg (>= 2.1), libmoo-perl, libmoox-handlesvia-perl, libmoox-late-perl, perl -Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libgnupg-interface-perl.git -Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libgnupg-interface-perl.git +Standards-Version: 4.1.4 +Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libgnupg-interface-perl +Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libgnupg-interface-perl.git Homepage: https://metacpan.org/release/GnuPG-Interface Package: libgnupg-interface-perl diff -Nru libgnupg-interface-perl-0.52/debian/patches/0001-Fix-test-suite-for-GnuPG-2.2.6-compatibility.patch libgnupg-interface-perl-0.52/debian/patches/0001-Fix-test-suite-for-GnuPG-2.2.6-compatibility.patch --- libgnupg-interface-perl-0.52/debian/patches/0001-Fix-test-suite-for-GnuPG-2.2.6-compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ libgnupg-interface-perl-0.52/debian/patches/0001-Fix-test-suite-for-GnuPG-2.2.6-compatibility.patch 2018-06-29 08:19:47.000000000 +0000 @@ -0,0 +1,58 @@ +From 5e5b70c3d18923b121cf2c5e1b7c196b6512b088 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 +Bug: https://github.com/bestpractical/gnupg-interface/pull/1 +--- + 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 53db021..06eec8c 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, +@@ -105,7 +109,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, +-- +2.17.1 + diff -Nru libgnupg-interface-perl-0.52/debian/patches/0001-Fix-test-suite-for-GnuPG-2.2.8-compatibility.patch libgnupg-interface-perl-0.52/debian/patches/0001-Fix-test-suite-for-GnuPG-2.2.8-compatibility.patch --- libgnupg-interface-perl-0.52/debian/patches/0001-Fix-test-suite-for-GnuPG-2.2.8-compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ libgnupg-interface-perl-0.52/debian/patches/0001-Fix-test-suite-for-GnuPG-2.2.8-compatibility.patch 2018-06-29 08:19:47.000000000 +0000 @@ -0,0 +1,68 @@ +From c3373068683ec3b76d9d1cdbfc25134c359869f0 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 +Bug: https://github.com/bestpractical/gnupg-interface/pull/1 +--- + t/decrypt.t | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git a/t/decrypt.t b/t/decrypt.t +index b2639ed..f7d9132 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/)); ++ } + }; + + +-- +2.17.1 + diff -Nru libgnupg-interface-perl-0.52/debian/patches/series libgnupg-interface-perl-0.52/debian/patches/series --- libgnupg-interface-perl-0.52/debian/patches/series 2017-05-28 14:48:08.000000000 +0000 +++ libgnupg-interface-perl-0.52/debian/patches/series 2018-06-29 08:18:32.000000000 +0000 @@ -17,3 +17,5 @@ 0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch 0018-Use-a-short-temporary-homedir-during-the-test-suite.patch 0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch +0001-Fix-test-suite-for-GnuPG-2.2.6-compatibility.patch +0001-Fix-test-suite-for-GnuPG-2.2.8-compatibility.patch