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