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=fc7bda93992086e01b62d08fa5ca2b70a69b62aa commit fc7bda93992086e01b62d08fa5ca2b70a69b62aa Author: Guillem Jover <[email protected]> AuthorDate: Tue Dec 3 02:40:48 2024 +0100 Dpkg::OpenPGP::Backend::Sequoia: Adapt to new CLI 0.40.0 API As the API is not yet stable (but it is getting closer to be), we need to adapt it to the current version. --- debian/control | 4 ++-- scripts/Dpkg/OpenPGP/Backend/Sequoia.pm | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 4947f729f..4b8fdb7c1 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.33.0~), + sq (<< 0.40.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 rsop. @@ -191,7 +191,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.33.0~), + sq (<< 0.40.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 rsop. diff --git a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm index 36801c9f5..82c64591c 100644 --- a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm +++ b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm @@ -1,4 +1,4 @@ -# Copyright © 2021-2022 Guillem Jover <[email protected]> +# Copyright © 2021-2024 Guillem Jover <[email protected]> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -69,7 +69,7 @@ sub armor return OPENPGP_MISSING_CMD unless $self->{cmd}; # We ignore the $type, and let "sq" handle this automatically. - my $rc = $self->_sq_exec(qw(toolbox armor --output), $out, $in); + my $rc = $self->_sq_exec(qw(packet armor --output), $out, $in); return OPENPGP_BAD_DATA if $rc; return OPENPGP_OK; } @@ -81,7 +81,7 @@ sub dearmor return OPENPGP_MISSING_CMD unless $self->{cmd}; # We ignore the $type, and let "sq" handle this automatically. - my $rc = $self->_sq_exec(qw(toolbox dearmor --output), $out, $in); + my $rc = $self->_sq_exec(qw(packet dearmor --output), $out, $in); return OPENPGP_BAD_DATA if $rc; return OPENPGP_OK; } @@ -93,6 +93,7 @@ sub inline_verify return OPENPGP_MISSING_CMD unless $self->{cmd}; my @opts; + push @opts, '--cleartext'; push @opts, map { ('--signer-file', $_) } @certs; push @opts, '--output', $data if defined $data; @@ -109,7 +110,7 @@ sub verify my @opts; push @opts, map { ('--signer-file', $_) } @certs; - push @opts, '--detached', $sig; + push @opts, '--signature-file', $sig; my $rc = $self->_sq_exec(qw(verify), @opts, $data); return OPENPGP_NO_SIG if $rc; @@ -124,7 +125,7 @@ sub inline_sign return OPENPGP_NEEDS_KEYSTORE if $key->needs_keystore(); my @opts; - push @opts, '--cleartext-signature'; + push @opts, '--cleartext'; push @opts, '--signer-file', $key->handle; push @opts, '--output', $inlinesigned; -- Dpkg.Org's dpkg
