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=b9d03178cda9ab981078b7a30a138e692f48f759 The following commit(s) were added to refs/heads/main by this push: new b9d03178c Dpkg::OpenPGP::Backend::SOP: Add sqop as an alternative SOP implementation b9d03178c is described below commit b9d03178cda9ab981078b7a30a138e692f48f759 (HEAD -> main) Author: Guillem Jover <[email protected]> AuthorDate: Tue Jan 3 23:34:23 2023 +0100 Dpkg::OpenPGP::Backend::SOP: Add sqop as an alternative SOP implementation The new version fixes the remaining issue that allows the code to use it as a backend. Add it as a preferred implementation if available. --- README | 2 +- debian/control | 12 ++++++++---- scripts/Dpkg/OpenPGP/Backend/SOP.pm | 4 +--- scripts/Test/Dpkg.pm | 1 + scripts/t/Dpkg_OpenPGP.t | 1 + 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/README b/README index 267d46ec4..eca08c25a 100644 --- a/README +++ b/README @@ -106,7 +106,7 @@ software might be needed: codespell (optional, author) cppcheck (optional, author) fakeroot (optional) - sop [pgpainless-cli] (optional) + sop [sqop (from Sequoia-PGP), pgpainless-cli] (optional) sq (from Sequoia-PGP, optional) gpg (optional) i18nspector (optional, author) diff --git a/debian/control b/debian/control index 78fb151f0..09f1a2fd5 100644 --- a/debian/control +++ b/debian/control @@ -115,8 +115,8 @@ Recommends: build-essential, gcc | c-compiler, fakeroot, - gnupg | sq | pgpainless-cli, - gpgv | sq | pgpainless-cli, + gnupg | sq | sqop | pgpainless-cli, + gpgv | sq | sqop | pgpainless-cli, # Used by dpkg-mergechangelogs. libalgorithm-merge-perl, Suggests: @@ -126,6 +126,8 @@ Breaks: debhelper (<< 10.10.1~), # Uses new sq features, w/o requiring a hard dependency on sq. sq (<< 0.25.0~), +# Uses required SOP features, w/o requiring a hard dependency on sqop. + sqop (<< 0.27.2~), # Uses required SOP feautres, w/o requiring a hard dependency on pgpainless. pgpainless-cli (<< 1.3.13~), libsop-java-java (<< 4.0.7~), @@ -156,8 +158,8 @@ Recommends: xz-utils (>= 5.4.0), Suggests: debian-keyring, - gnupg | sq | pgpainless-cli, - gpgv | sq | pgpainless-cli, + gnupg | sq | sqop | pgpainless-cli, + gpgv | sq | sqop | pgpainless-cli, gcc | c-compiler, binutils, patch, @@ -176,6 +178,8 @@ Breaks: dgit (<< 3.13~), # Uses new sq features, w/o requiring a hard dependency on sq. sq (<< 0.25.0~), +# Uses required SOP features, w/o requiring a hard dependency on sqop. + sqop (<< 0.27.2~), # Uses required SOP feautres, w/o requiring a hard dependency on pgpainless. pgpainless-cli (<< 1.3.13~), libsop-java-java (<< 4.0.7~), diff --git a/scripts/Dpkg/OpenPGP/Backend/SOP.pm b/scripts/Dpkg/OpenPGP/Backend/SOP.pm index d87adca78..1c5073b62 100644 --- a/scripts/Dpkg/OpenPGP/Backend/SOP.pm +++ b/scripts/Dpkg/OpenPGP/Backend/SOP.pm @@ -28,8 +28,6 @@ use Dpkg::OpenPGP::ErrorCodes; use parent qw(Dpkg::OpenPGP::Backend); -# - Once "sqop" fixes armor idempotency, add as alternative. -# Ref: https://gitlab.com/sequoia-pgp/sequoia-sop/-/issues/20 # - Once "gosop" implements inline-verify and inline-sign, add as alternative. # Ref: https://github.com/ProtonMail/gosop/issues/6 # - Once "hop" implements the new SOP draft, add as alternative. @@ -42,7 +40,7 @@ use parent qw(Dpkg::OpenPGP::Backend); # Ref: https://gitlab.com/dkg/openpgp-stateless-cli/-/issues/42 sub DEFAULT_CMD { - return [ qw(pgpainless-cli) ]; + return [ qw(sqop pgpainless-cli) ]; } sub _sop_exec diff --git a/scripts/Test/Dpkg.pm b/scripts/Test/Dpkg.pm index 6d3d23dcf..2cbbb02f4 100644 --- a/scripts/Test/Dpkg.pm +++ b/scripts/Test/Dpkg.pm @@ -188,6 +188,7 @@ sub test_needs_openpgp_backend my @backends = qw( gpg sq + sqop pgpainless-cli ); my @cmds = grep { can_run($_) } @backends; diff --git a/scripts/t/Dpkg_OpenPGP.t b/scripts/t/Dpkg_OpenPGP.t index 8c436825d..4be7cd79b 100644 --- a/scripts/t/Dpkg_OpenPGP.t +++ b/scripts/t/Dpkg_OpenPGP.t @@ -29,6 +29,7 @@ my %backend_cmd = ( auto => 'auto', gpg => 'gpg', sq => 'sq', + sqop => 'sop', 'pgpainless-cli' => 'sop', ); my @cmds = test_needs_openpgp_backend(); -- Dpkg.Org's dpkg
