From 396478fcc2ed755e02e2573c8be89e9a98aec512 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 15 Apr 2024 20:40:30 +0200
Subject: Merging upstream version 1.22.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 scripts/Dpkg/OpenPGP/Backend/GnuPG.pm   | 4 ++--
 scripts/Dpkg/OpenPGP/Backend/Sequoia.pm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts/Dpkg/OpenPGP')

diff --git a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm
index 9c53ef1..6c834be 100644
--- a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm
+++ b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm
@@ -46,7 +46,7 @@ use Dpkg::OpenPGP::ErrorCodes;
 use parent qw(Dpkg::OpenPGP::Backend);
 
 sub DEFAULT_CMDV {
-    return [ qw(gpgv) ];
+    return [ qw(gpgv-sq gpgv) ];
 }
 
 sub DEFAULT_CMDSTORE {
@@ -54,7 +54,7 @@ sub DEFAULT_CMDSTORE {
 }
 
 sub DEFAULT_CMD {
-    return [ qw(gpg) ];
+    return [ qw(gpg-sq gpg) ];
 }
 
 sub has_backend_cmd {
diff --git a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm
index ae4acc1..36801c9 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;
 }
-- 
cgit v1.2.3