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=9229100918a1741ceb4b0f60636869cfc9432731 commit 9229100918a1741ceb4b0f60636869cfc9432731 Author: Guillem Jover <[email protected]> AuthorDate: Thu May 2 02:58:32 2019 +0200 scripts: Remove support for versioned GnuPG 2 program and packages The current default in Debian and anywhere else is to use unversioned GnuPG 2.x binaries, so there's no need anymore to try these first or at all. --- debian/changelog | 1 + debian/control | 8 ++++---- man/dpkg-buildpackage.man | 7 +++---- scripts/Dpkg/Source/Package.pm | 6 +----- scripts/dpkg-buildpackage.pl | 6 ++---- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3581597c1..bb386ab0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium * dpkg-shlibdeps: Add support for new Build-Depends-Packages, to be able to specify multiple packages. Closes: #926669 Based on a patch by Frank Schaefer <[email protected]>. + * perl: Remove support for versioned GnuPG 2 program and packages. * Documentation: - man: Fix uncommon wording constructs. * Build system: diff --git a/debian/control b/debian/control index 63b5c7f26..bd1a3619f 100644 --- a/debian/control +++ b/debian/control @@ -101,8 +101,8 @@ Recommends: build-essential, gcc | c-compiler, fakeroot, - gnupg | gnupg2, - gpgv | gpgv2, + gnupg, + gpgv, # Used by dpkg-mergechangelogs. libalgorithm-merge-perl, Suggests: @@ -136,8 +136,8 @@ Recommends: xz-utils, Suggests: debian-keyring, - gnupg | gnupg2, - gpgv | gpgv2, + gnupg, + gpgv, gcc | c-compiler, binutils, patch, diff --git a/man/dpkg-buildpackage.man b/man/dpkg-buildpackage.man index d60b09f54..6a6965f2f 100644 --- a/man/dpkg-buildpackage.man +++ b/man/dpkg-buildpackage.man @@ -90,7 +90,7 @@ It runs the \fBcheck\fP hook and calls a package checker for the \fB.changes\fP file (if a command is specified in \fBDEB_CHECK_COMMAND\fP or with \fB\-\-check\-command\fP). .IP \fB11.\fP 3 -It runs the \fBsign\fP hook and calls \fBgpg2\fP or \fBgpg\fP (as long as it +It runs the \fBsign\fP hook and calls \fBgpg\fP (as long as it is not an UNRELEASED build, or \fB\-\-no\-sign\fP is specified) to sign the \fB.dsc\fP file (if any, unless \fB\-us\fP or \fB\-\-unsigned\-source\fP is specified), the \fB.buildinfo\fP @@ -399,9 +399,9 @@ Can be used multiple times. When \fBdpkg\-buildpackage\fP needs to execute GPG to sign a source control (\fB.dsc\fP) file or a \fB.changes\fP file it will run \fIsign-command\fP (searching the \fBPATH\fP if necessary) instead of -\fBgpg2\fP or \fBgpg\fP (long option since dpkg 1.18.8). +\fBgpg\fP (long option since dpkg 1.18.8). \fIsign-command\fP will get all the arguments -that \fBgpg2\fP or \fBgpg\fP would have gotten. \fIsign-command\fP +that \fBgpg\fP would have gotten. \fIsign-command\fP should not contain spaces or any other shell metacharacters. .TP .BR \-k ", " \-\-sign\-key= \fIkey-id\fP @@ -584,5 +584,4 @@ and initial arguments for .BR dpkg\-genchanges (1), .BR fakeroot (1), .BR lintian (1), -.BR gpg2 (1), .BR gpg (1). diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm index 9cc5d178f..df3ac8737 100644 --- a/scripts/Dpkg/Source/Package.pm +++ b/scripts/Dpkg/Source/Package.pm @@ -428,12 +428,8 @@ sub check_signature { my $dsc = $self->get_filename(); my @exec; - if (find_command('gpgv2')) { - push @exec, 'gpgv2'; - } elsif (find_command('gpgv')) { + if (find_command('gpgv')) { push @exec, 'gpgv'; - } elsif (find_command('gpg2')) { - push @exec, 'gpg2', '--no-default-keyring', '-q', '--verify'; } elsif (find_command('gpg')) { push @exec, 'gpg', '--no-default-keyring', '-q', '--verify'; } diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index 81c6f57c7..e48f972a9 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -101,7 +101,7 @@ sub usage { pass option <opt> to dpkg-genbuildinfo. -p, --sign-command=<command> command to sign .dsc and/or .changes files - (default is gpg2 or gpg). + (default is gpg). -k, --sign-key=<keyid> the key to use for signing. -ap, --sign-pause add pause before starting signature process. -us, --unsigned-source unsigned source package. @@ -394,9 +394,7 @@ if ($signcommand) { } } elsif (($ENV{GNUPGHOME} && -e $ENV{GNUPGHOME}) || ($ENV{HOME} && -e "$ENV{HOME}/.gnupg")) { - if (find_command('gpg2')) { - $signcommand = 'gpg2'; - } elsif (find_command('gpg')) { + if (find_command('gpg')) { $signcommand = 'gpg'; } } -- Dpkg.Org's dpkg
