This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=2d3a3fd28050ca76be4322e2d44b13627c0c5f72 commit 2d3a3fd28050ca76be4322e2d44b13627c0c5f72 Author: Guillem Jover <[email protected]> AuthorDate: Sat Sep 29 23:32:34 2018 +0200 Dpkg::OpenPGP: Ignore Version field in enarmored output This will contain different data depending on the program used. We do not really care about that, later versions of GnuPG have stopped emitting it, and it makes the test suite fail when using GnuPG 1.x. Fixes: https://rt.cpan.org/Public/Bug/Display.html?id=127217 --- debian/changelog | 3 +++ scripts/Dpkg/OpenPGP.pm | 1 + 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7406d5bde..1f33be708 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ dpkg (1.19.2) UNRELEASED; urgency=medium [ Guillem Jover ] + * Perl modules: + - Dpkg::OpenPGP: Ignore Version field in enarmored output. + Fixes CPAN#127217. * Documentation: - dpkg-buildpackage(1): Clarify --build=source explanation. - dsc(5): Clarify what “flattened” means in Testsuite-Triggers. diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm index 8d85e845d..210a36f23 100644 --- a/scripts/Dpkg/OpenPGP.pm +++ b/scripts/Dpkg/OpenPGP.pm @@ -61,6 +61,7 @@ sub openpgp_sig_to_asc open my $fh_gpg, '-|', 'gpg', '-o', '-', '--enarmor', $sig or syserr(g_('cannot execute %s program'), 'gpg'); while (my $line = <$fh_gpg>) { + next if $line =~ m/^Version: /; next if $line =~ m/^Comment: /; $line =~ s/ARMORED FILE/SIGNATURE/; -- Dpkg.Org's dpkg
