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=7fb6f6a1a35b0da36dd1c5c0c05d7692e0391ebb commit 7fb6f6a1a35b0da36dd1c5c0c05d7692e0391ebb Author: Guillem Jover <[email protected]> AuthorDate: Mon Oct 7 13:21:56 2024 +0200 Dpkg::OpenPGP::Backend::SOP: Add rsop as an alternative SOP implementation Starting with rsop 0.4.0, its implementation provides everything that we require from SOP. --- 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 f15a173d5..20697963f 100644 --- a/debian/control +++ b/debian/control @@ -122,8 +122,8 @@ Recommends: build-essential, gcc | c-compiler, fakeroot, - gnupg | sq | sqop | pgpainless-cli | gpg-sq, - gpgv | sq | sqop | pgpainless-cli | gpgv-sq, + gnupg | sq | sqop | rsop | pgpainless-cli | gpg-sq, + gpgv | sq | sqop | rsop | pgpainless-cli | gpgv-sq, # Used by dpkg-mergechangelogs. libalgorithm-merge-perl, Suggests: @@ -135,6 +135,8 @@ Breaks: 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 rsop. + rsop (<< 0.4.0~), # Uses required SOP features, w/o requiring a hard dependency on pgpainless. pgpainless-cli (<< 1.3.13~), libsop-java-java (<< 4.0.7~), @@ -168,8 +170,8 @@ Recommends: xz-utils (>= 5.4.0), Suggests: debian-keyring, - gnupg | sq | sqop | pgpainless-cli | gpg-sq, - gpgv | sq | sqop | pgpainless-cli | gpgv-sq, + gnupg | sq | sqop | rsop | pgpainless-cli | gpg-sq, + gpgv | sq | sqop | rsop | pgpainless-cli | gpgv-sq, gcc | c-compiler, binutils, patch, @@ -190,6 +192,8 @@ Breaks: 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 rsop. + rsop (<< 0.4.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 0c95de6f1..993e36b78 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 pgpainless-cli) ]; + return [ qw(sqop rsop pgpainless-cli) ]; } sub _sop_exec diff --git a/scripts/Test/Dpkg.pm b/scripts/Test/Dpkg.pm index ce98be223..1324a3caa 100644 --- a/scripts/Test/Dpkg.pm +++ b/scripts/Test/Dpkg.pm @@ -211,6 +211,9 @@ my %openpgp_command = ( 'sqop' => { backend => 'sop', }, + 'rsop' => { + backend => 'sop', + }, 'pgpainless-cli' => { backend => 'sop', }, -- Dpkg.Org's dpkg
