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=c39305ca72f5142fcb774b99ceb025e35e6e77ce The following commit(s) were added to refs/heads/main by this push: new c39305ca7 Dpkg::OpenPGP::Backend::GnuPG: Add support for Sequoia gpg Chameleon c39305ca7 is described below commit c39305ca72f5142fcb774b99ceb025e35e6e77ce (HEAD -> main) Author: Guillem Jover <[email protected]> AuthorDate: Wed Feb 21 18:08:03 2024 +0100 Dpkg::OpenPGP::Backend::GnuPG: Add support for Sequoia gpg Chameleon This program implements the most used parts of the GnuPG CLI, which covers our needs, but using the Sequoia-PGP as its underlying implementation. If present, we prefer the Chameleon over the original GnuPG. --- README | 2 +- debian/control | 8 ++++---- scripts/Dpkg/OpenPGP/Backend/GnuPG.pm | 4 ++-- scripts/Test/Dpkg.pm | 1 + scripts/t/Dpkg_OpenPGP.t | 1 + 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README b/README index 2fec9e4cc..a07c60ce8 100644 --- a/README +++ b/README @@ -109,7 +109,7 @@ software might be needed: fakeroot (optional) sop [sqop (from Sequoia-PGP), pgpainless-cli] (optional) sq (from Sequoia-PGP, optional) - gpg (optional) + gpg-sq (from Sequoia-PGP, optional), gpg (optional) i18nspector (optional, author) shellcheck (optional, author) diff --git a/debian/control b/debian/control index 77d4b6b4d..a14260ea8 100644 --- a/debian/control +++ b/debian/control @@ -122,8 +122,8 @@ Recommends: build-essential, gcc | c-compiler, fakeroot, - gnupg | sq | sqop | pgpainless-cli, - gpgv | sq | sqop | pgpainless-cli, + gnupg | sq | sqop | pgpainless-cli | sequoia-chameleon-gnupg, + gpgv | sq | sqop | pgpainless-cli | sequoia-chameleon-gnupg, # Used by dpkg-mergechangelogs. libalgorithm-merge-perl, Suggests: @@ -168,8 +168,8 @@ Recommends: xz-utils (>= 5.4.0), Suggests: debian-keyring, - gnupg | sq | sqop | pgpainless-cli, - gpgv | sq | sqop | pgpainless-cli, + gnupg | sq | sqop | pgpainless-cli | sequoia-chameleon-gnupg, + gpgv | sq | sqop | pgpainless-cli | sequoia-chameleon-gnupg, gcc | c-compiler, binutils, patch, diff --git a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm index 9c53ef122..6c834be37 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/Test/Dpkg.pm b/scripts/Test/Dpkg.pm index 54f494c36..1632ad861 100644 --- a/scripts/Test/Dpkg.pm +++ b/scripts/Test/Dpkg.pm @@ -200,6 +200,7 @@ sub test_needs_command sub test_needs_openpgp_backend { my @backends = qw( + gpg-sq gpg sq sqop diff --git a/scripts/t/Dpkg_OpenPGP.t b/scripts/t/Dpkg_OpenPGP.t index c3cd72482..d4090829e 100644 --- a/scripts/t/Dpkg_OpenPGP.t +++ b/scripts/t/Dpkg_OpenPGP.t @@ -27,6 +27,7 @@ use Dpkg::OpenPGP::KeyHandle; my %backend_cmd = ( auto => 'auto', + 'gpg-sq' => 'gpg', gpg => 'gpg', sq => 'sq', sqop => 'sop', -- Dpkg.Org's dpkg
