[gentoo-commits] repo/proj/guru:master commit in: app-crypt/clevis/, app-crypt/clevis/files/

[gentoo-commits] repo/proj/guru:master commit in: app-crypt/clevis/, app-crypt/clevis/files/

[Viorel Munteanu]

commit:     08ea01112a7aede8662aa4795fcbd4159c7a23ea
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sat Feb  4 03:40:03 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 03:40:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=08ea0111

app-crypt/clevis: fix for dracut on openRC

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-crypt/clevis/Manifest                          |  1 -
 .../{clevis-19.ebuild => clevis-19-r1.ebuild}      |  4 ++
 app-crypt/clevis/files/clevis-dracut.patch         | 52 ++++------------------
 3 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/app-crypt/clevis/Manifest b/app-crypt/clevis/Manifest
index 301bc626a..ead9af1f7 100644
--- a/app-crypt/clevis/Manifest
+++ b/app-crypt/clevis/Manifest
@@ -1,2 +1 @@
-DIST clevis-18.tar.gz 78191 BLAKE2B 317f30df3c05a9a651363daf17b9320e47a903929af991ecfd9d4d3d630a0ab8e92815db2e5736e9b9ca7f3fb4a41f4cf198ec447f04a9849f4d2a03bb196b22 SHA512 19b6743ff61ff7e29699bbc3fb69dfa31567a37ab824629330b57c92aa89b70759d63c1770be68d4525681ec9ba56d980cae2bb1cdeee6192992ede449a0e4ff
 DIST clevis-19.tar.gz 81324 BLAKE2B 75323940d0b53e307f5dbc197e3117e7ddc900d76ae1043bac3d17cc3af0264ba00a5f840c5c9dd3c2dd9c8fbde2cf05934b8ab3e89cd403ad8a8eb28609bb78 SHA512 dee19354c908c3843fc295a84b431780d5d6062c77766ee7ce9550636d3623d92b0cd1f6d4c40d57bef14debddc161da2b72289a5d6185cdd17b09a1ef67409a

diff --git a/app-crypt/clevis/clevis-19.ebuild b/app-crypt/clevis/clevis-19-r1.ebuild
similarity index 78%
rename from app-crypt/clevis/clevis-19.ebuild
rename to app-crypt/clevis/clevis-19-r1.ebuild
index 50fb4b236..37a4b60eb 100644
--- a/app-crypt/clevis/clevis-19.ebuild
+++ b/app-crypt/clevis/clevis-19-r1.ebuild
@@ -27,5 +27,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
+	# From https://github.com/latchset/clevis/pull/347
+	# Allows using dracut without systemd
+	"${FILESDIR}/clevis-dracut.patch"
+	# Fix for systemd on Gentoo
 	"${FILESDIR}/clevis-meson.patch"
 )

diff --git a/app-crypt/clevis/files/clevis-dracut.patch b/app-crypt/clevis/files/clevis-dracut.patch
index 7aec43e9e..60873b84e 100644
--- a/app-crypt/clevis/files/clevis-dracut.patch
+++ b/app-crypt/clevis/files/clevis-dracut.patch
@@ -1,45 +1,3 @@
-From a5aa695821e34fb218c7d705065aaf7077737c8c Mon Sep 17 00:00:00 2001
-From: Jonathan Davies <jpds@protonmail.com>
-Date: Fri, 5 Nov 2021 15:24:12 +0000
-Subject: [PATCH] Moved dracut directory up to top-level to decouple it with
- systemd.
-
-Adds a clevis-luks-generic-unlocker for alternative use without systemd.
-
-Based on patch by Sergio Correia <scorreia@redhat.com>
-
-Closes: #346
-
-Signed-off-by: Jonathan Davies <jpds@protonmail.com>
----
- .../dracut/clevis-pin-sss/meson.build         |  0
- .../dracut/clevis-pin-sss/module-setup.sh.in  |  0
- .../dracut/clevis-pin-tang/meson.build        |  0
- .../dracut/clevis-pin-tang/module-setup.sh.in |  0
- .../dracut/clevis-pin-tpm2/meson.build        |  0
- .../dracut/clevis-pin-tpm2/module-setup.sh.in |  0
- src/dracut/clevis/clevis-hook.sh.in           |  3 +
- .../clevis/clevis-luks-generic-unlocker       | 70 +++++++++++++++++++
- .../systemd => }/dracut/clevis/meson.build    |  1 +
- .../dracut/clevis/module-setup.sh.in          | 19 +++--
- src/{luks/systemd => }/dracut/meson.build     |  0
- .../systemd/dracut/clevis/clevis-hook.sh.in   |  2 -
- src/luks/systemd/meson.build                  |  1 -
- src/meson.build                               |  1 +
- 14 files changed, 90 insertions(+), 7 deletions(-)
- rename src/{luks/systemd => }/dracut/clevis-pin-sss/meson.build (100%)
- rename src/{luks/systemd => }/dracut/clevis-pin-sss/module-setup.sh.in (100%)
- rename src/{luks/systemd => }/dracut/clevis-pin-tang/meson.build (100%)
- rename src/{luks/systemd => }/dracut/clevis-pin-tang/module-setup.sh.in (100%)
- rename src/{luks/systemd => }/dracut/clevis-pin-tpm2/meson.build (100%)
- rename src/{luks/systemd => }/dracut/clevis-pin-tpm2/module-setup.sh.in (100%)
- create mode 100755 src/dracut/clevis/clevis-hook.sh.in
- create mode 100755 src/dracut/clevis/clevis-luks-generic-unlocker
- rename src/{luks/systemd => }/dracut/clevis/meson.build (87%)
- rename src/{luks/systemd => }/dracut/clevis/module-setup.sh.in (76%)
- rename src/{luks/systemd => }/dracut/meson.build (100%)
- delete mode 100755 src/luks/systemd/dracut/clevis/clevis-hook.sh.in
-
 diff --git a/src/luks/systemd/dracut/clevis-pin-sss/meson.build b/src/dracut/clevis-pin-sss/meson.build
 similarity index 100%
 rename from src/luks/systemd/dracut/clevis-pin-sss/meson.build
@@ -213,9 +171,17 @@ index bfe657c..dbce790 100755
          grep sed cut \
          clevis-decrypt \
 diff --git a/src/luks/systemd/dracut/meson.build b/src/dracut/meson.build
-similarity index 100%
+similarity index 78%
 rename from src/luks/systemd/dracut/meson.build
 rename to src/dracut/meson.build
+index 7ad5b14..fdb264b 100644
+--- a/src/luks/systemd/dracut/meson.build
++++ b/src/dracut/meson.build
+@@ -2,4 +2,3 @@ subdir('clevis')
+ subdir('clevis-pin-tang')
+ subdir('clevis-pin-tpm2')
+ subdir('clevis-pin-sss')
+-subdir('clevis-pin-null')
 diff --git a/src/luks/systemd/dracut/clevis/clevis-hook.sh.in b/src/luks/systemd/dracut/clevis/clevis-hook.sh.in
 deleted file mode 100755
 index cb257c9..0000000