This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=b9c60ac97f9fb94042e8c2f5c424bce9d50354a9 commit b9c60ac97f9fb94042e8c2f5c424bce9d50354a9 Author: Guillem Jover <[email protected]> AuthorDate: Sat Nov 18 13:54:56 2023 +0100 Dpkg::OpenPGP::Backend::Sequoia: Switch to use --signer-file Starting with sq version 0.28 the verify --signer-cert and sign --signer-key options got replaced with --signer-file. Switch to the new option and for the Debian packaging bump the versioned Breaks to require a newer sq in case it is installed. --- debian/control | 4 ++-- scripts/Dpkg/OpenPGP/Backend/Sequoia.pm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 034b8461b..fd4ee5898 100644 --- a/debian/control +++ b/debian/control @@ -132,7 +132,7 @@ Breaks: # Force R³ support, w/o requiring debhelper users to depend on dpkg-dev. debhelper (<< 10.10.1~), # Uses new sq features, w/o requiring a hard dependency on sq. - sq (<< 0.25.0~), + sq (<< 0.28.0~), # Uses required SOP features, w/o requiring a hard dependency on sqop. sqop (<< 0.27.2~), # Uses required SOP features, w/o requiring a hard dependency on pgpainless. @@ -187,7 +187,7 @@ Breaks: # versions prior to 1.19.0. dgit (<< 3.13~), # Uses new sq features, w/o requiring a hard dependency on sq. - sq (<< 0.25.0~), + sq (<< 0.28.0~), # Uses required SOP features, w/o requiring a hard dependency on sqop. sqop (<< 0.27.2~), # Uses required SOP features, w/o requiring a hard dependency on pgpainless. diff --git a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm index 1ddc17de2..ae4acc1db 100644 --- a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm +++ b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm @@ -93,7 +93,7 @@ sub inline_verify return OPENPGP_MISSING_CMD unless $self->{cmd}; my @opts; - push @opts, map { ('--signer-cert', $_) } @certs; + push @opts, map { ('--signer-file', $_) } @certs; push @opts, '--output', $data if defined $data; my $rc = $self->_sq_exec(qw(verify), @opts, $inlinesigned); @@ -108,7 +108,7 @@ sub verify return OPENPGP_MISSING_CMD unless $self->{cmd}; my @opts; - push @opts, map { ('--signer-cert', $_) } @certs; + push @opts, map { ('--signer-file', $_) } @certs; push @opts, '--detached', $sig; my $rc = $self->_sq_exec(qw(verify), @opts, $data); @@ -125,7 +125,7 @@ sub inline_sign my @opts; push @opts, '--cleartext-signature'; - push @opts, '--signer-key', $key->handle; + push @opts, '--signer-file', $key->handle; push @opts, '--output', $inlinesigned; my $rc = $self->_sq_exec('sign', @opts, $data); -- Dpkg.Org's dpkg
