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=5efa4e6ded295b766244c3b047d30fb4215b9d61

commit 5efa4e6ded295b766244c3b047d30fb4215b9d61
Author: Guillem Jover <[email protected]>
AuthorDate: Tue Jan 23 11:50:18 2024 +0100

    Dpkg::OpenPGP::Backend::Sequoia: Update to new CLI API changes
    
    The sq CLI is still not declared stable, and it gets improved from
    time to time. We need to adapt the Sequoia-PGP backend to use the
    new subcommand structure.
---
 debian/control                          | 4 ++--
 scripts/Dpkg/OpenPGP/Backend/Sequoia.pm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index fd4ee5898..77d4b6b4d 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.28.0~),
+ sq (<< 0.33.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.28.0~),
+ sq (<< 0.33.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 ae4acc1db..36801c9f5 100644
--- a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm
+++ b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm
@@ -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(armor --output), $out, $in);
+    my $rc = $self->_sq_exec(qw(toolbox 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(dearmor --output), $out, $in);
+    my $rc = $self->_sq_exec(qw(toolbox dearmor --output), $out, $in);
     return OPENPGP_BAD_DATA if $rc;
     return OPENPGP_OK;
 }

-- 
Dpkg.Org's dpkg

Reply via email to