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=589485b1242da5debca487307759783511456d9b commit 589485b1242da5debca487307759783511456d9b Author: Guillem Jover <[email protected]> AuthorDate: Sat May 27 14:32:03 2023 +0200 Dpkg::OpenPGP::Backend::SOP: Add gosop as an alternative SOP implementation The new version fixes the remaining issue that allows the code to use it as a backend. --- debian/control | 12 ++++++++---- scripts/Dpkg/OpenPGP/Backend/SOP.pm | 2 +- scripts/Test/Dpkg.pm | 3 +++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 20697963f..4947f729f 100644 --- a/debian/control +++ b/debian/control @@ -122,8 +122,8 @@ Recommends: build-essential, gcc | c-compiler, fakeroot, - gnupg | sq | sqop | rsop | pgpainless-cli | gpg-sq, - gpgv | sq | sqop | rsop | pgpainless-cli | gpgv-sq, + gnupg | sq | sqop | rsop | gosop | pgpainless-cli | gpg-sq, + gpgv | sq | sqop | rsop | gosop | pgpainless-cli | gpgv-sq, # Used by dpkg-mergechangelogs. libalgorithm-merge-perl, Suggests: @@ -137,6 +137,8 @@ Breaks: sqop (<< 0.27.2~), # Uses required SOP features, w/o requiring a hard dependency on rsop. rsop (<< 0.4.0~), +# Uses required SOP features, w/o requiring a hard dependency on gosop. + gosop (<< 1.1.0~), # Uses required SOP features, w/o requiring a hard dependency on pgpainless. pgpainless-cli (<< 1.3.13~), libsop-java-java (<< 4.0.7~), @@ -170,8 +172,8 @@ Recommends: xz-utils (>= 5.4.0), Suggests: debian-keyring, - gnupg | sq | sqop | rsop | pgpainless-cli | gpg-sq, - gpgv | sq | sqop | rsop | pgpainless-cli | gpgv-sq, + gnupg | sq | sqop | rsop | gosop | pgpainless-cli | gpg-sq, + gpgv | sq | sqop | rsop | gosop | pgpainless-cli | gpgv-sq, gcc | c-compiler, binutils, patch, @@ -194,6 +196,8 @@ Breaks: sqop (<< 0.27.2~), # Uses required SOP features, w/o requiring a hard dependency on rsop. rsop (<< 0.4.0~), +# Uses required SOP features, w/o requiring a hard dependency on gosop. + gosop (<< 1.1.0~), # Uses required SOP features, 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 993e36b78..0bb23a5f0 100644 --- a/scripts/Dpkg/OpenPGP/Backend/SOP.pm +++ b/scripts/Dpkg/OpenPGP/Backend/SOP.pm @@ -56,7 +56,7 @@ use parent qw(Dpkg::OpenPGP::Backend); # Ref: https://gitlab.com/dkg/openpgp-stateless-cli/-/issues/42 sub DEFAULT_CMD { - return [ qw(sqop rsop pgpainless-cli) ]; + return [ qw(sqop rsop gosop pgpainless-cli) ]; } sub _sop_exec diff --git a/scripts/Test/Dpkg.pm b/scripts/Test/Dpkg.pm index 1324a3caa..7e8d34cfb 100644 --- a/scripts/Test/Dpkg.pm +++ b/scripts/Test/Dpkg.pm @@ -214,6 +214,9 @@ my %openpgp_command = ( 'rsop' => { backend => 'sop', }, + 'gosop' => { + backend => 'sop', + }, 'pgpainless-cli' => { backend => 'sop', }, -- Dpkg.Org's dpkg
