From 63f20dcf21eba8bd65bbe404f6c3d807aa42fd34 Mon Sep 17 00:00:00 2001 From: Sergio Arroutbi Date: Wed, 13 May 2026 21:57:02 +0200 Subject: [PATCH] Rebase to clevis-23 upstream version Disable TPM 1.2 pin compilation and remove clevis-luks-unlocker from systemd files section, as it is no longer shipped upstream. Resolves: RHEL-173502 Signed-off-by: Sergio Arroutbi --- clevis.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/clevis.spec b/clevis.spec index dd7aefe..12bb756 100644 --- a/clevis.spec +++ b/clevis.spec @@ -1,5 +1,5 @@ Name: clevis -Version: 22 +Version: 23 Release: 1%{?dist} Summary: Automated decryption framework @@ -121,7 +121,7 @@ Automatically unlocks LUKS block devices through a PKCS#11 device. %autosetup -S git %build -%meson -Duser=clevis -Dgroup=clevis +%meson -Duser=clevis -Dgroup=clevis -Dtpm1=disabled %meson_build %install @@ -189,7 +189,6 @@ systemctl preset %{name}-luks-askpass.path >/dev/null 2>&1 || : %files systemd %{_libexecdir}/%{name}-luks-askpass -%{_libexecdir}/%{name}-luks-unlocker %{_unitdir}/%{name}-luks-askpass.path %{_unitdir}/%{name}-luks-askpass.service @@ -220,6 +219,10 @@ systemctl preset %{name}-luks-askpass.path >/dev/null 2>&1 || : %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2 %changelog +* Wed May 13 2026 Sergio Arroutbi - 23-1 +- Rebase to clevis-23 upstream version + Resolves: RHEL-173501 + * Mon Apr 13 2026 Sergio Arroutbi - 22-1 - Rebase to clevis-22 upstream version Resolves: #RHEL-944 diff --git a/sources b/sources index f8900a4..318e75d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clevis-22.tar.xz) = d91e917af4b90c47aba77169bdaa9d3f73ced1951487a92d11a251f9de3e2947fb89d6bc2d4aa768493c3439336d4f2f541625a8b8cbe8de7f03a2b70b927c01 +SHA512 (clevis-23.tar.xz) = e5b66682f197ab4db42bac4377e3cc293e0a4cfcd1ed5b0e87a7b67e0c0724c774455f182eb54f26f3f459454aa4eb2890f3054e543bb2a7fcce1a86db98b8fa