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=60d709df214705ea1fa01dc9ba85158d2383315e commit 60d709df214705ea1fa01dc9ba85158d2383315e Author: Taowa Munene-Tardif <[email protected]> AuthorDate: Mon Apr 20 00:07:23 2020 +0200 Dpkg::Vendor::Debian: Add debian-nonupload.gpg keyring In Debian, non-uploading Debian Developers are treated equivalently to Debian Maintainer. So let's add their keyring to the list of officially supported ones. Closes: #956055 Signed-off-by: Guillem Jover <[email protected]> --- debian/changelog | 2 ++ man/dpkg-source.man | 5 +++-- scripts/Dpkg/Vendor/Debian.pm | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1f17b5991..18c494ed9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ dpkg (1.20.1) UNRELEASED; urgency=medium - Dpkg::Source::Package: Add new get_upstream_signing_key() method. - Dpkg::Source::Package: Check missing expected tarball signatures. - Dpkg::Source::Package::V1: Check version format matching source format. + - Dpkg::Vendor::Debian: Add debian-nonupload.gpg keyring. + Thanks to Taowa Munene-Tardif <[email protected]>. Closes: #956055 * Build system: - Handle .git being a plain file when getting the dpkg tree version. - Add debian/changelog as a Changes file to the CPAN distribution. diff --git a/man/dpkg-source.man b/man/dpkg-source.man index d8a37b115..866eba30b 100644 --- a/man/dpkg-source.man +++ b/man/dpkg-source.man @@ -269,8 +269,9 @@ Refuse to unpack the source package if it doesn't contain an OpenPGP signature that can be verified (since dpkg 1.15.0) either with the user's \fItrustedkeys.gpg\fP keyring, one of the vendor-specific keyrings, or one of the official Debian keyrings -(\fI/usr/share/keyrings/debian\-keyring.gpg\fP -and \fI/usr/share/keyrings/debian\-maintainers.gpg\fP). +(\fI/usr/share/keyrings/debian\-keyring.gpg\fP, +\fI/usr/share/keyrings/debian\-nonupload.gpg\fP and +\fI/usr/share/keyrings/debian\-maintainers.gpg\fP). .TP .BI \-\-require\-strong\-checksums Refuse to unpack the source package if it does not contain any strong diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index 142fb8ddc..eb06149af 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -50,6 +50,7 @@ sub run_hook { if ($hook eq 'package-keyrings') { return ('/usr/share/keyrings/debian-keyring.gpg', + '/usr/share/keyrings/debian-nonupload.gpg', '/usr/share/keyrings/debian-maintainers.gpg'); } elsif ($hook eq 'archive-keyrings') { return ('/usr/share/keyrings/debian-archive-keyring.gpg'); -- Dpkg.Org's dpkg
