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=4872eee04f9127ee70140e63222b5993e37e69df The following commit(s) were added to refs/heads/master by this push: new 4872eee04 Dpkg::OpenPGP: Pass --no-options to gpg in verify_signature() 4872eee04 is described below commit 4872eee04f9127ee70140e63222b5993e37e69df (HEAD -> master) Author: Guillem Jover <[email protected]> AuthorDate: Sun Jun 28 12:17:33 2020 +0200 Dpkg::OpenPGP: Pass --no-options to gpg in verify_signature() This is what we do with all other gpg calls, so that we do not end up writing into the GnuPG configuration directory. Closes: #963839 Reported-by: Bertrand Marc <[email protected]> --- debian/changelog | 5 +++++ scripts/Dpkg/OpenPGP.pm | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5dbfe9b4d..3335d7e35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ dpkg (1.20.3) UNRELEASED; urgency=medium + [ Guillem Jover ] + * Perl modules: + - Dpkg::OpenPGP: Pass --no-options to gpg in verify_signature(). + Reported by Bertrand Marc <[email protected]>. Closes: #963839 + [ Updated programs translations ] * German (Sven Joachim). diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm index 704294de2..961c6df05 100644 --- a/scripts/Dpkg/OpenPGP.pm +++ b/scripts/Dpkg/OpenPGP.pm @@ -127,7 +127,8 @@ sub verify_signature { if (find_command('gpgv')) { push @exec, 'gpgv'; } elsif (find_command('gpg')) { - push @exec, 'gpg', '--no-default-keyring', '-q', '--verify'; + my @gpg_opts = qw(--no-options --no-default-keyring -q); + push @exec, 'gpg', @gpg_opts, '--verify'; } elsif ($opts{require_valid_signature}) { error(g_('cannot verify signature on %s since GnuPG is not installed'), $sig); -- Dpkg.Org's dpkg
