From ff70b56635c4cd9dac1f142f5379007eac8f7832 Mon Sep 17 00:00:00 2001
From: Sergio Arroutbi <sarroutb@redhat.com>
Date: Wed, 13 May 2026 17:24:21 +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-173501

Signed-off-by: Sergio Arroutbi <sarroutb@redhat.com>
---
 .gitignore  | 1 +
 clevis.spec | 5 ++---
 sources     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2db7d2f..97b3a2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /clevis-20.tar.xz
 /clevis-21.tar.xz
 /clevis-22.tar.xz
+/clevis-23.tar.xz
diff --git a/clevis.spec b/clevis.spec
index 7a9f1ca..e6a6d7e 100644
--- a/clevis.spec
+++ b/clevis.spec
@@ -1,5 +1,5 @@
 Name:           clevis
-Version:        22
+Version:        23
 Release:        %autorelease
 Summary:        Automated decryption framework
 
@@ -122,7 +122,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
@@ -187,7 +187,6 @@ exit 0
 
 %files systemd
 %{_libexecdir}/%{name}-luks-askpass
-%{_libexecdir}/%{name}-luks-unlocker
 %{_unitdir}/%{name}-luks-askpass.path
 %{_unitdir}/%{name}-luks-askpass.service
 
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