* [gentoo-commits] repo/proj/guru:dev commit in: app-crypt/clevis/files/, app-crypt/clevis/
@ 2022-06-16 0:53 Julien Roy
0 siblings, 0 replies; 4+ messages in thread
From: Julien Roy @ 2022-06-16 0:53 UTC (permalink / raw
To: gentoo-commits
commit: 98d91fb3ae7547ac155335d5ff2c2b14b0b480ef
Author: Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Thu Jun 16 00:50:36 2022 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Thu Jun 16 00:53:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=98d91fb3
app-crypt/clevis: merge #71 by duxsco
Signed-off-by: Julien Roy <julien <AT> jroy.ca>
app-crypt/clevis/clevis-18.ebuild | 1 +
app-crypt/clevis/files/clevis-meson.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/app-crypt/clevis/clevis-18.ebuild b/app-crypt/clevis/clevis-18.ebuild
index 43912b1fb..da0dc9637 100644
--- a/app-crypt/clevis/clevis-18.ebuild
+++ b/app-crypt/clevis/clevis-18.ebuild
@@ -25,4 +25,5 @@ BDEPEND=""
PATCHES=(
"${FILESDIR}/${PN}-dracut.patch"
+ "${FILESDIR}/${PN}-meson.patch"
)
diff --git a/app-crypt/clevis/files/clevis-meson.patch b/app-crypt/clevis/files/clevis-meson.patch
new file mode 100644
index 000000000..bfd517d3e
--- /dev/null
+++ b/app-crypt/clevis/files/clevis-meson.patch
@@ -0,0 +1,11 @@
+diff --git a/src/luks/systemd/meson.build b/src/luks/systemd/meson.build
+index b10494e3ca4d620437aee0d5e440eecf323b03d9..09f7fb51e7320aa71e275c34baa0561233821d69 100644
+--- a/src/luks/systemd/meson.build
++++ b/src/luks/systemd/meson.build
+@@ -5,6 +5,7 @@ sd_reply_pass = find_program(
+ join_paths(get_option('prefix'), 'lib', 'systemd', 'systemd-reply-password'),
+ join_paths('/', 'usr', get_option('libdir'), 'systemd', 'systemd-reply-password'),
+ join_paths('/', 'usr', 'lib', 'systemd', 'systemd-reply-password'),
++ join_paths('/', 'lib', 'systemd', 'systemd-reply-password'),
+ required: false
+ )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-crypt/clevis/files/, app-crypt/clevis/
@ 2022-12-21 2:58 Julien Roy
0 siblings, 0 replies; 4+ messages in thread
From: Julien Roy @ 2022-12-21 2:58 UTC (permalink / raw
To: gentoo-commits
commit: 9c156d7fcfb4d76fbb14570df5e9a8d1e77e183e
Author: Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Wed Dec 21 02:57:55 2022 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Wed Dec 21 02:58:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9c156d7f
app-crypt/clevis: fix for openssl:3
Closes: https://bugs.gentoo.org/887205
Signed-off-by: Julien Roy <julien <AT> jroy.ca>
app-crypt/clevis/clevis-18.ebuild | 1 +
app-crypt/clevis/files/clevis-openssl.patch | 44 +++++++++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/app-crypt/clevis/clevis-18.ebuild b/app-crypt/clevis/clevis-18.ebuild
index da0dc9637..a08573ab8 100644
--- a/app-crypt/clevis/clevis-18.ebuild
+++ b/app-crypt/clevis/clevis-18.ebuild
@@ -26,4 +26,5 @@ BDEPEND=""
PATCHES=(
"${FILESDIR}/${PN}-dracut.patch"
"${FILESDIR}/${PN}-meson.patch"
+ "${FILESDIR}/${PN}-openssl.patch"
)
diff --git a/app-crypt/clevis/files/clevis-openssl.patch b/app-crypt/clevis/files/clevis-openssl.patch
new file mode 100644
index 000000000..5b9090980
--- /dev/null
+++ b/app-crypt/clevis/files/clevis-openssl.patch
@@ -0,0 +1,44 @@
+From ee1dfedb9baca107e66a0fec76693c9d479dcfd9 Mon Sep 17 00:00:00 2001
+From: Sergio Correia <scorreia@redhat.com>
+Date: Mon, 3 May 2021 22:36:36 -0300
+Subject: [PATCH] sss: use BN_set_word(x, 0) instead of BN_zero()
+
+Different OpenSSL versions define BN_zero() differently -- sometimes
+returning an integer, sometimes as void --, so let's use instead
+BN_set_word() instead, not to have issues when building with these
+different versions.
+---
+ src/pins/sss/sss.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/pins/sss/sss.c b/src/pins/sss/sss.c
+index a37215d7..7486d6c5 100644
+--- a/src/pins/sss/sss.c
++++ b/src/pins/sss/sss.c
+@@ -214,7 +214,7 @@ sss_point(const json_t *sss, size_t *len)
+ if (BN_rand_range(xx, pp) <= 0)
+ return NULL;
+
+- if (BN_zero(yy) <= 0)
++ if (BN_set_word(yy, 0) <= 0)
+ return NULL;
+
+ for (size_t i = 0; i < json_array_size(e); i++) {
+@@ -272,7 +272,7 @@ sss_recover(const json_t *p, size_t npnts, const uint8_t *pnts[])
+ if (!ctx || !pp || !acc || !tmp || !k)
+ return NULL;
+
+- if (BN_zero(k) <= 0)
++ if (BN_set_word(k, 0) <= 0)
+ return NULL;
+
+ len = jose_b64_dec(p, NULL, 0);
+@@ -303,7 +303,7 @@ sss_recover(const json_t *p, size_t npnts, const uint8_t *pnts[])
+
+ /* acc *= (0 - xi) / (xo - xi) */
+
+- if (BN_zero(tmp) <= 0)
++ if (BN_set_word(tmp, 0) <= 0)
+ return NULL;
+
+ if (BN_mod_sub(tmp, tmp, xi, pp, ctx) <= 0)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-crypt/clevis/files/, app-crypt/clevis/
@ 2023-02-04 3:40 Julien Roy
0 siblings, 0 replies; 4+ messages in thread
From: Julien Roy @ 2023-02-04 3:40 UTC (permalink / raw
To: gentoo-commits
commit: 08ea01112a7aede8662aa4795fcbd4159c7a23ea
Author: Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sat Feb 4 03:40:03 2023 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-crypt/clevis/files/, app-crypt/clevis/
@ 2023-02-04 3:40 Julien Roy
0 siblings, 0 replies; 4+ messages in thread
From: Julien Roy @ 2023-02-04 3:40 UTC (permalink / raw
To: gentoo-commits
commit: 115bf7872f7c0d8946339629d0d1550e386c1dfa
Author: Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sat Feb 4 03:40:15 2023 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sat Feb 4 03:40:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=115bf787
app-crypt/clevis: drop 18
Signed-off-by: Julien Roy <julien <AT> jroy.ca>
app-crypt/clevis/clevis-18.ebuild | 30 --------------------
app-crypt/clevis/files/clevis-openssl.patch | 44 -----------------------------
2 files changed, 74 deletions(-)
diff --git a/app-crypt/clevis/clevis-18.ebuild b/app-crypt/clevis/clevis-18.ebuild
deleted file mode 100644
index a08573ab8..000000000
--- a/app-crypt/clevis/clevis-18.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Automated Encryption Framework"
-HOMEPAGE="https://github.com/latchset/clevis"
-SRC_URI="https://github.com/latchset/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+luks +tpm"
-
-DEPEND="luks? ( app-misc/jq )
- >=dev-libs/jose-8
- luks? ( dev-libs/libpwquality )
- luks? ( dev-libs/luksmeta )
- tpm? ( app-crypt/tpm2-tools )
- sys-fs/cryptsetup"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-PATCHES=(
- "${FILESDIR}/${PN}-dracut.patch"
- "${FILESDIR}/${PN}-meson.patch"
- "${FILESDIR}/${PN}-openssl.patch"
-)
diff --git a/app-crypt/clevis/files/clevis-openssl.patch b/app-crypt/clevis/files/clevis-openssl.patch
deleted file mode 100644
index 5b9090980..000000000
--- a/app-crypt/clevis/files/clevis-openssl.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From ee1dfedb9baca107e66a0fec76693c9d479dcfd9 Mon Sep 17 00:00:00 2001
-From: Sergio Correia <scorreia@redhat.com>
-Date: Mon, 3 May 2021 22:36:36 -0300
-Subject: [PATCH] sss: use BN_set_word(x, 0) instead of BN_zero()
-
-Different OpenSSL versions define BN_zero() differently -- sometimes
-returning an integer, sometimes as void --, so let's use instead
-BN_set_word() instead, not to have issues when building with these
-different versions.
----
- src/pins/sss/sss.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/pins/sss/sss.c b/src/pins/sss/sss.c
-index a37215d7..7486d6c5 100644
---- a/src/pins/sss/sss.c
-+++ b/src/pins/sss/sss.c
-@@ -214,7 +214,7 @@ sss_point(const json_t *sss, size_t *len)
- if (BN_rand_range(xx, pp) <= 0)
- return NULL;
-
-- if (BN_zero(yy) <= 0)
-+ if (BN_set_word(yy, 0) <= 0)
- return NULL;
-
- for (size_t i = 0; i < json_array_size(e); i++) {
-@@ -272,7 +272,7 @@ sss_recover(const json_t *p, size_t npnts, const uint8_t *pnts[])
- if (!ctx || !pp || !acc || !tmp || !k)
- return NULL;
-
-- if (BN_zero(k) <= 0)
-+ if (BN_set_word(k, 0) <= 0)
- return NULL;
-
- len = jose_b64_dec(p, NULL, 0);
-@@ -303,7 +303,7 @@ sss_recover(const json_t *p, size_t npnts, const uint8_t *pnts[])
-
- /* acc *= (0 - xi) / (xo - xi) */
-
-- if (BN_zero(tmp) <= 0)
-+ if (BN_set_word(tmp, 0) <= 0)
- return NULL;
-
- if (BN_mod_sub(tmp, tmp, xi, pp, ctx) <= 0)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-04 3:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-21 2:58 [gentoo-commits] repo/proj/guru:dev commit in: app-crypt/clevis/files/, app-crypt/clevis/ Julien Roy
-- strict thread matches above, loose matches on Subject: below --
2023-02-04 3:40 Julien Roy
2023-02-04 3:40 Julien Roy
2022-06-16 0:53 Julien Roy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox