SOURCES/tboot-gcc14.patch

@@ -1,17 +0,0 @@
-Suppress GCC 14 allocation size warning in lcptools-v2/pconf_legacy.c
-
-Submitted upstream: <https://sourceforge.net/p/tboot/mailman/message/58730242/>
-
-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;

SPECS/tboot.spec

@@ -4,18 +4,17 @@ Version:       1.11.3
 Release:        1%{?dist}
 Epoch:          1
 
-License:       BSD-3-Clause
+License:        BSD
 URL:            http://sourceforge.net/projects/tboot/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0: tboot-gcc14.patch
 
 BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  perl
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
-Requires:      grub2-efi-x64-modules
 ExclusiveArch:  %{ix86} x86_64
+Requires:  	grub2-efi-x64-modules
 
 %description
 Trusted Boot (tboot) is an open source, pre-kernel/VMM module that uses
@@ -26,16 +25,11 @@ and verified launch of an OS kernel/VMM.
 %autosetup -p1 -n %{name}-%{version}
 
 %build
-%make_build debug=y
+CFLAGS="%{optflags}"; export CFLAGS
-
+LDFLAGS="%{build_ldflags}"; export LDFLAGS
-%install
+make debug=y %{?_smp_mflags}
-%make_install debug=y
 
 %post
-# create the tboot grub entry
-grub2-mkconfig -o /boot/grub2/grub.cfg
-
-# For EFI based machines ...
 # Rmove the grub efi modules if they had been placed in the wrong directory by
 # a previous install.
 [ -d /boot/efi/EFI/redhat/x86_64-efi ] && rm -rf /boot/efi/EFI/redhat/x86_64-efi
@@ -71,98 +65,116 @@ fi
 [ -d /boot/efi/EFI/redhat/x86_64-efi ] && rm -rf /boot/efi/EFI/redhat/x86_64-efi
 grub2-mkconfig -o /etc/grub2.cfg
 
+%install
+make debug=y DISTDIR=$RPM_BUILD_ROOT install
+
 %files
-%license COPYING
+%doc README.md COPYING docs/* lcptools-v2/lcptools.txt
-%doc docs/*
 %config %{_sysconfdir}/grub.d/20_linux_tboot
 %config %{_sysconfdir}/grub.d/20_linux_xen_tboot
+%{_sbindir}/txt-acminfo
 %{_sbindir}/lcp2_crtpol
 %{_sbindir}/lcp2_crtpolelt
 %{_sbindir}/lcp2_crtpollist
 %{_sbindir}/lcp2_mlehash
-%{_sbindir}/tb_polgen
-%{_sbindir}/txt-acminfo
 %{_sbindir}/txt-parse_err
+%{_sbindir}/tb_polgen
 %{_sbindir}/txt-stat
+%{_mandir}/man8/txt-acminfo.8.gz
+%{_mandir}/man8/tb_polgen.8.gz
+%{_mandir}/man8/txt-stat.8.gz
 %{_mandir}/man8/lcp2_crtpol.8.gz
 %{_mandir}/man8/lcp2_crtpolelt.8.gz
 %{_mandir}/man8/lcp2_crtpollist.8.gz
 %{_mandir}/man8/lcp2_mlehash.8.gz
-%{_mandir}/man8/tb_polgen.8.gz
-%{_mandir}/man8/txt-acminfo.8.gz
 %{_mandir}/man8/txt-parse_err.8.gz
-%{_mandir}/man8/txt-stat.8.gz
 /boot/tboot.gz
 /boot/tboot-syms
 
 %changelog
-* Tue Jun 25 2024 Tony Camuso <tcamuso@redhat.com> - 1:1.11.3-1
+* Thu Apr 25 2024 Tony Camuso <tcamuso@redhat.com> - 1:1.11.3-1
-- Latest version of tboot.
+  Rebase to upstream 1.11.3 and bump the NVR.
-  Resolves: RHEL-34500
+  Resolves: RHEL-34941
-
+
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.11.1-7
+* Wed Nov 08 2023 Tony Camuso <tcamuso@redhat.com> - 1:1.11.1-2
-- Bump release for June 2024 mass rebuild
+- Rebase to upstream 1.11.2 and bump the NVR.
-
+  Resolves: RHEL-16022
-* Mon Jan 29 2024 Florian Weimer <fweimer@redhat.com> - 1:1.11.1-6
+
-- Suppress GCC 14 allocation size warning
+* Wed Apr 12 2023 Tony Camuso <tcamuso@redhat.com> - 1:1.11.1-1
-
+- Backport upstream fixes and updates.
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.11.1-5
+  Resolves: rhbz#2186308
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
-
+* Thu Aug 18 2022 Tony Camuso <tcamuso@redhat.com> - 1:1.10.5-2
-* Wed Nov 01 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1:1.11.1-4
+- The install scriptlet in %post was choosing the first grub.cfg
-- Add grub2-efi-x64-modules dependency and scriplet
+  file it encountered, which was /boot/efi/EFI/redhat/grub.cfg.
-
+  This is a stub that defines grub boot disk UUID necessary for
-* Fri Sep 22 2023 David Cantrell <dcantrell@redhat.com> - 1:1.11.1-3
+  proper grubenv setup, and it must not be overwritten or changed.
-- Use %%license for the COPYING file in the %%files section
+  Modify the scriptlet to target /boot/grub2/grub.cfg
-- Convert the License tag to an SPDX expression
+  Additionally, remove any wrongly created /boot/grub2/x86_64-efi
-
+  directory and recreate the correct /boot/efi/EFI/redhat/grub.cfg
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.11.1-2
+  stub file.
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+  Added a %postun section to cleanup when removing tboot with
-
+  dnf erase.
-* Sun May 07 2023 Jun Miao <jun.miao@intel.com> - 1:1.11.1-1
+  Thanks to Lenny Szubowicz for the bash code to recreate the
-- Update to v1.11.1 release
+  /boot/efi/EFI/redhat/grub.cfg stub file.
-
+  Resolves: rhbz#2112236
-* Sun Apr 23 2023 Jun Miao <jun.miao@intel.com> - 1:1.11.0-2
+
-- Update code sources with the v1.11.0
+* Wed May 04 2022 Tony Camuso <tcamuso@redhat.com> - 1:1.10.5-1
-
+- Upgrade to tboot-1.10.5-1 for fixes and updates.
-* Mon Feb 27 2023 Jun Miao <jun.miao@intel.com> - 1:1.11.0-1
+- Added a Requires line to install grub2-efi-x64-modules
-- Update to v1.11.0 release
+- Added a scriptlet to the tboot.spec file to automatically install
-
+  grub2-efi-x64-modules and move them to the correct directory.
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.5-3
+- Removed three patches that are no longer needed.
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+- Added two patches from upstream, one for a fix, the other cosemetic.
-
+- Resolves: rhbz#2041766
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.5-2
+  Resolves: rhbz#2040083
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
-
+* Thu Sep 30 2021 Tony Camuso <tcamuso@redhat.com> - 1:1.10.2-6
-* Wed Apr 20 2022 Jun Miao <jun.miao@intel.com> - 1:1.10.5-1
+- Use sha256 as default hashing algorithm
-- Update to v1.10.5 release
+  Resolves: rhbz#1935448
-
+
-* Fri Feb 25 2022 Jun Miao jun.miao@intel.com - 1:1.10.4-2
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.10.2-5
-- Update the tboot-1.10.4.tar.gz source
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-
+  Related: rhbz#1991688
-* Fri Feb 25 2022 Jun Miao <jun.miao@intel.com> - 1:1.10.4-1
+
-- Updated to upstream 1.10.4 release
+* Wed Jul 28 2021 Tony Camuso <tcamuso@redhat.com> - 1:1.10.2-4
-- Fix the GCC12 build error
+- From Miroslave Vadkerti:
-
+  Onboarding tests to RHEL9 in BaseOS CI requires action, adding
-* Thu Dec 23 2021 Yunying Sun <yunying.sun@intel.com> - 1:1.10.3-1
+  test configuration in our "dispatcher" configuration for RHEL9:
-- Updated to 1.10.3 which added OpenSSL 3.0.0 support
+  https://gitlab.cee.redhat.com/baseos-qe/citool-config/blob/production/brew-dispatcher-rhel9.yaml
-- Bugzilla 2021901 is fixed with this updated release
+  Test config was added for tboot in the following MR.
-- Removed obsolete patch files
+  https://gitlab.cee.redhat.com/baseos-qe/citool-config/-/merge_requests/2686
-
+  Resolves: rhbz#1922002
-* Fri Dec 3 2021 Yunying Sun <yunying.sun@intel.com> - 1:1.10.2-4
+
-- Rebuilt again with OpenSSL 3.0.0 fix patch
+* Tue Jul 27 2021 Tony Camuso <tcamuso@redhat.com> - 1:1.10.2-3
-
+- Add the %{optflags} and %{build_ldflags} macros to assure the
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1:1.10.2-3
+  build meets RHEL security requirements.
-- Rebuilt with OpenSSL 3.0.0
+  Resolves: rhbz#1922002
-
+
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.2-2
+* Thu Jul 22 2021 Tony Camuso <tcamuso@redhat.com> - 1:1.10.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Bump the NVR as a result of including the gating.yaml file in
-
+  the git repo.
-* Tue Jun 15 2021 Yunying Sun <yunying.sun@intel.com> - 1:1.10.2-1
+  Resolves: rhbz#1922002
-- Updated to upstream 1.10.2 release
+
-- Removed standalone patches as both are fixed in 1.10.2
+* Mon Jun 21 2021 Tony Camuso <tcamuso@redhat.com> - 1:1.10.2-1
-- Adjusted dependencies, removed trousers and added perl
+- The patches are for SSL3 compatibility. These can probably be
-- Updated packaged file list
+  removed when upstream tboot fully implements SSL3.
+- Upgrade to latest upstream.
+- Remove trousers dependency.
+  Resolves: rhbz#1922002
+  Resolves: rhbz#1870520
+  Resolves: rhbz#1927374
+
+* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.9.11-9
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
+
+* Thu May 27 2021 Tony Camuso <tcamuso@redhat.com> - 1:1.9.11-8
+- Add -Wno-error=deprecated-declarations to the Config.mk patch
+  Resolves: rhbz#1958031
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.9.11-7
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild