-
Notifications
You must be signed in to change notification settings - Fork 2.7k
clevis: update to 23 #61296
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
louiszn
wants to merge
1
commit into
void-linux:master
Choose a base branch
from
louiszn:clevis-23
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+62
−4
Open
clevis: update to 23 #61296
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
29 changes: 29 additions & 0 deletions
29
srcpkgs/clevis/patches/0001-dracut-avoid-requiring-systemd-reply-password-at-bui.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| From 55dd24711be711763b5eca2dcaa23d0c17bbe6cc Mon Sep 17 00:00:00 2001 | ||
| From: Owen Xie <15828145+nfusionz@users.noreply.github.com> | ||
| Date: Sun, 31 May 2026 04:20:11 -0400 | ||
| Subject: [PATCH 1/2] dracut: avoid requiring systemd-reply-password at build | ||
| time | ||
|
|
||
| Fixes dracut module issue in non-systemd environments where | ||
| systemd-reply-password.path() is called when it doesn't exist, | ||
| causing an error. The path isn't used for the non-systemd flow. | ||
| --- | ||
| src/luks/dracut/clevis/meson.build | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/src/luks/dracut/clevis/meson.build b/src/luks/dracut/clevis/meson.build | ||
| index f37cc3c..e6230f3 100644 | ||
| --- a/src/luks/dracut/clevis/meson.build | ||
| +++ b/src/luks/dracut/clevis/meson.build | ||
| @@ -5,7 +5,7 @@ if dracut.found() | ||
|
|
||
| dracut_data = configuration_data() | ||
| dracut_data.merge_from(data) | ||
| - dracut_data.set('SYSTEMD_REPLY_PASS', sd_reply_pass.path()) | ||
| + dracut_data.set('SYSTEMD_REPLY_PASS', sd_reply_pass.found() ? sd_reply_pass.path() : '') | ||
|
|
||
| configure_file( | ||
| input: 'module-setup.sh.in', | ||
| -- | ||
| 2.54.0 | ||
|
|
26 changes: 26 additions & 0 deletions
26
srcpkgs/clevis/patches/0002-dracut-include-chmod-for-password-unlocker.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| From a575ea0337878708766cd074a14ea5d8be32d360 Mon Sep 17 00:00:00 2001 | ||
| From: Owen Xie <15828145+nfusionz@users.noreply.github.com> | ||
| Date: Sun, 31 May 2026 18:43:31 -0400 | ||
| Subject: [PATCH 2/2] dracut: include chmod for password unlocker | ||
|
|
||
| Fixes issue in non-systemd environments that may not | ||
| have chmod included in the init environment already. | ||
| --- | ||
| src/luks/dracut/clevis/module-setup.sh.in | 1 + | ||
| 1 file changed, 1 insertion(+) | ||
|
|
||
| diff --git a/src/luks/dracut/clevis/module-setup.sh.in b/src/luks/dracut/clevis/module-setup.sh.in | ||
| index 32fac41..cb0bd22 100755 | ||
| --- a/src/luks/dracut/clevis/module-setup.sh.in | ||
| +++ b/src/luks/dracut/clevis/module-setup.sh.in | ||
| @@ -52,6 +52,7 @@ install() { | ||
| inst_script "$moddir"/clevis-password-unlocker-prepare /bin/clevis-password-unlocker-prepare | ||
| inst_multiple \ | ||
| clevis-luks-unlock \ | ||
| + chmod \ | ||
| blkid | ||
| fi | ||
|
|
||
| -- | ||
| 2.54.0 | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| # Template file for 'clevis' | ||
| pkgname=clevis | ||
| version=20 | ||
| revision=2 | ||
| version=23 | ||
| revision=1 | ||
| # Holds non-standard upstream version suffixes when needed. | ||
| _subversion=tpm1u1 | ||
| build_style=meson | ||
| hostmakedepends="asciidoc bash-completion cryptsetup curl jq keyutils pkg-config tpm2-tools" | ||
| makedepends="bash-completion cryptsetup-devel dracut jansson-devel | ||
|
|
@@ -11,9 +13,10 @@ | |
| maintainer="Johannes Heimansberg <git@jhe.dedyn.io>" | ||
| license="GPL-3.0-or-later WITH custom:OpenSSL-Exception" | ||
| homepage="https://github.com/latchset/clevis" | ||
| distfiles="https://github.com/latchset/clevis/archive/v$version/clevis-$version.tar.gz" | ||
| checksum=67eb9cbbb9c90f9802cae76503f74f23d0046ee6570553407035e9fae3b4b4dd | ||
| distfiles="https://github.com/latchset/clevis/archive/v${version}${subversion}/clevis-${version}${subversion}.tar.gz" | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This doesn't actually use the suffix you added. The variable is |
||
| checksum=a8a09f148d54d91aa0d21c5fa508dd1446c2a200be7679fbf6e7d19196aec164 | ||
| make_check="ci-skip" # LUKS tests fail in CI pipeline | ||
| configure_args="-Db_ndebug=false" | ||
|
|
||
| post_install() { | ||
| vlicense COPYING.openssl | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where does this suffix come from?