From 70c3aa07f21b129d9f22ddf8195918c988f86afb Mon Sep 17 00:00:00 2001 From: Tony Camuso Date: Tue, 2 Jun 2026 09:02:16 -0400 Subject: [PATCH] Rebase to upstream tboot 1.11.12 JIRA: https://redhat.atlassian.net/browse/RHEL-177574 Drop tboot-gcc14.patch (fix absorbed upstream) Signed-off-by: Tony Camuso --- sources | 2 +- tboot-gcc14.patch | 17 ----------------- tboot.spec | 12 ++++++++---- 3 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 tboot-gcc14.patch diff --git a/sources b/sources index a4251ba..0e689d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tboot-1.11.10.tar.gz) = f59e948e36ec122f93e32b3c754c206b241d4ee55209ccb952f8742f9912b66d6365de5df6e31944ac75191a54c7252f39a29df861daa4a1f51a1999fcc7d846 +SHA512 (tboot-1.11.12.tar.gz) = 4dc708fa99e57cf052b09686021db892c0e83b3e3ba2720b623be53a65de4177164bae3adc975a8231a48a084a1dbe6cba8fccd99fa2ab55dd7729a2f25331be diff --git a/tboot-gcc14.patch b/tboot-gcc14.patch deleted file mode 100644 index 9b6ff83..0000000 --- a/tboot-gcc14.patch +++ /dev/null @@ -1,17 +0,0 @@ -Suppress GCC 14 allocation size warning in lcptools-v2/pconf_legacy.c - -Submitted upstream: - -diff --git a/lcptools-v2/pconf_legacy.c b/lcptools-v2/pconf_legacy.c -index 443b5cd5525b9fe1..5ebc6c451f7008b1 100644 ---- a/lcptools-v2/pconf_legacy.c -+++ b/lcptools-v2/pconf_legacy.c -@@ -324,7 +324,7 @@ static lcp_policy_element_t *create(void) - ERROR("Error: no pcrs were selected.\n"); - return NULL; - } -- digest = malloc(SHA1_DIGEST_SIZE); -+ digest = malloc(sizeof(*digest)); - if (digest == NULL) { - ERROR("Error: failed to allocate memory for digest buffer.\n"); - return NULL; diff --git a/tboot.spec b/tboot.spec index 2791e4f..cb00152 100644 --- a/tboot.spec +++ b/tboot.spec @@ -1,14 +1,13 @@ Summary: Performs a verified launch using Intel TXT Name: tboot -Version: 1.11.10 -Release: 2%{?dist} +Version: 1.11.12 +Release: 1%{?dist} Epoch: 1 License: BSD-3-Clause URL: http://sourceforge.net/projects/tboot/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: tboot-gcc14.patch -Patch1: tboot-no-engine.patch +Patch0: tboot-no-engine.patch BuildRequires: make BuildRequires: gcc @@ -98,6 +97,11 @@ grub2-mkconfig -o /etc/grub2.cfg /boot/tboot-syms %changelog +* Mon May 18 2026 Tony Camuso - 1:1.11.12-1 +- Rebase to upstream tboot 1.11.12 + Drop tboot-gcc14.patch (fix absorbed upstream) + Resolves: RHEL-177574 + * Fri Feb 13 2026 Tony Camuso - 1:1.11.10-2 - Remove downstream tboot-disa-ibt.patch workaround .(RHEL-149438) Previous builds appended "ibt=off" to GRUB_CMDLINE_LINUX_TBOOT to avoid