Skip to content

clevis: update to 23#61296

Open
louiszn wants to merge 1 commit into
void-linux:masterfrom
louiszn:clevis-23
Open

clevis: update to 23#61296
louiszn wants to merge 1 commit into
void-linux:masterfrom
louiszn:clevis-23

Conversation

@louiszn

@louiszn louiszn commented Jun 29, 2026

Copy link
Copy Markdown

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

  • I built this PR locally for my native architecture, x86_64-glibc

Additional testing:

  • Updated clevis to 23.
  • Applied upstream dracut fixes from dracut: fix some portability issues in non-systemd environments latchset/clevis#561:
    • avoid requiring systemd-reply-password at build time on non-systemd systems
    • include chmod in the dracut module for the password unlocker scripts
  • Set b_ndebug=false because Clevis 23's test-token-to-jwe uses assert(). With Void's default b_ndebug=true, NDEBUG is defined, the assertions are compiled out, and the test fails to build under -Werror due to unused variables.
  • Tested on Void Linux x86_64 with runit, dracut, and a TPM2-bound LUKS root volume.
  • Confirmed Clevis 23 builds successfully.
  • Confirmed TPM2-bound LUKS auto-unlock works after regenerating the initramfs with dracut.
  • Confirmed the previous early-boot chmod: command not found warning is gone.

@Duncaen Duncaen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Set b_ndebug=false because Clevis 23's test-token-to-jwe uses assert(). With Void's default b_ndebug=true, NDEBUG is defined, the assertions are compiled out, and the test fails to build under -Werror due to unused variables.

Wouldn't it be better to fix the patch instead or disable -Werror?

Comment thread srcpkgs/clevis/template
version=23
revision=1
# Holds non-standard upstream version suffixes when needed.
_subversion=tpm1u1

Copy link
Copy Markdown
Member

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?

Comment thread srcpkgs/clevis/template
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"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't actually use the suffix you added. The variable is _subversion, not subversion.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants