.gitignore

@@ -1,14 +1,7 @@
-SOURCES/BOOTAA64.CSV
-SOURCES/BOOTIA32.CSV
-SOURCES/BOOTX64.CSV
-SOURCES/fbaa64.efi
 SOURCES/fbia32.efi
 SOURCES/fbx64.efi
-SOURCES/mmaa64.efi
 SOURCES/mmia32.efi
 SOURCES/mmx64.efi
-SOURCES/redhatsecureboot501.cer
-SOURCES/redhatsecurebootca5.cer
 SOURCES/shimaa64.efi
 SOURCES/shimia32.efi
 SOURCES/shimx64.efi

.shim.metadata

@@ -1,14 +1,7 @@
-fe978419c312c0c415d52befb4f6561e2d9556a7 SOURCES/BOOTAA64.CSV
+21ce4720933ec31c6cfd42e514fb847991119021 SOURCES/fbia32.efi
-9650b41c0227b343478d03f4d7fcd6c8d3744440 SOURCES/BOOTIA32.CSV
+c14235e6e3a56a68c546c8926cd576cfcf146be9 SOURCES/fbx64.efi
-6801abf1c4d54f15f869470c99e480433940407a SOURCES/BOOTX64.CSV
+e8617d7a23490f16f417393246717b12966e2d35 SOURCES/mmia32.efi
-317f45115504f1ba56f0113dc217460e3c26cf82 SOURCES/fbaa64.efi
+d2dbb8f8a2d701937a8d0547a9b15ea9974eaf33 SOURCES/mmx64.efi
-4fd02a6b3ec5dc58fcba1a3d8dec69e0cb86f5d5 SOURCES/fbia32.efi
-b26bb4ed41e96d6e2b2471dc5d50f0f2c88ff884 SOURCES/fbx64.efi
-b2e0f92dba676facda778be739e2959f5e51c077 SOURCES/mmaa64.efi
-e8316a74f06a29385eeb7fd734f582e60dc7a2a4 SOURCES/mmia32.efi
-77f25d23c6b0bb2f79a47d574f8af5ffe91e2466 SOURCES/mmx64.efi
-ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer
-e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer
 750bd7932437b1fb6610c233f69db1b70d67fab1 SOURCES/shimaa64.efi
-0cd6ef62726de2f1321bfe6b70f47b788ac38666 SOURCES/shimia32.efi
+0005fc346662c319cf7413e866ff504a8bbc3796 SOURCES/shimia32.efi
-86855303a18b978cf90d6c244bfe30897f449996 SOURCES/shimx64.efi
+d9c1346dee1b0071939bdde7e692166ef67a57b5 SOURCES/shimx64.efi

SOURCES/shim.rpmmacros

@@ -3,8 +3,6 @@
 %global vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}}
 %global vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}}
 
-%global grub_version 2.02-87.el8_1.11
-
 %global bootcsvaa64 %{expand:%{SOURCE10}}
 %global bootcsvia32 %{expand:%{SOURCE11}}
 %global bootcsvx64 %{expand:%{SOURCE12}}
@@ -26,8 +24,8 @@
 #%%global mmefiarm %%{expand:%%{SOURCE43}
 
 %global shimveraa64 15-7.el8_1
-%global shimveria32 15.8-2.el8
+%global shimveria32 15.5-1.el8
-%global shimverx64 15.8-2.el8
+%global shimverx64 15.5-1.el8
 #%%global shimverarm 15-1.el8
 
 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
@@ -64,7 +62,6 @@ Requires: mokutil >= 1:0.3.0-1						\
 Requires: efi-filesystem						\
 Provides: shim-signed-%{-a*} = %{version}-%{release}			\
 Requires: dbxtool >= 0.6-3						\
-Conflicts: grub2-efi-%{-a*} < %{grub_version}				\
 %{expand:%%if 0%%{-p*}							\
 Provides: shim = %{version}-%{release}					\
 Provides: shim-signed = %{version}-%{release}				\
@@ -179,10 +176,10 @@ install -m 0700 fb%{-a*}.efi						\\\
 # -A <EFIARCH>
 %define define_files(a:A:)						\
 %{expand:%%files -n shim-%{-a*}}					\
-%%verify(not mtime) %{efi_esp_dir}/*%{-a*}*.efi				\
+%{efi_esp_dir}/*%{-a*}*.efi						\
-%%verify(not mtime) %{efi_esp_dir}/BOOT%{-A*}.CSV			\
+%{efi_esp_dir}/BOOT%{-A*}.CSV						\
-%%verify(not mtime) %{efi_esp_boot}/*%{-a*}.efi				\
+%{efi_esp_boot}/*%{-a*}.efi						\
-%%verify(not mtime) %{efi_esp_boot}/*%{-A*}.EFI				\
+%{efi_esp_boot}/*%{-A*}.EFI						\
 %{nil}
 
 %ifarch x86_64

SPECS/shim.spec

@@ -1,6 +1,6 @@
 Name:		shim
-Version:	15.8
+Version:	15.5
-Release:	4%{?dist}
+Release:	1.el8
 Summary:	First-stage UEFI bootloader
 License:	BSD
 URL:		https://github.com/rhboot/shim/
@@ -39,18 +39,20 @@ Source42:	fbx64.efi
 %include %{SOURCE0}
 
 BuildRequires:	pesign >= 0.112-20.fc27
-# Right now we're just including all of the parts from them as sources here
+# We need this because %%{efi} won't expand before choosing where to make
-# to make the build+errata process less maddening.  We do this because
+# the src.rpm in koji, and we could be on a non-efi architecture, in which
-# %%{efi} won't expand before choosing where to make the src.rpm in koji,
+# case we won't have a valid expansion here...  To be solved in the future
-# and we could be on a non-efi architecture, in which case we won't have a
+# (shim 16+) by making the unsigned packages all provide "shim-unsigned", so
-# valid expansion here...
+# we can just BuildRequires that.
-# %% ifarch x86_64
+%ifarch x86_64
 # BuildRequires:	%% {unsignedx64} = %% {shimverx64}
 # BuildRequires:	%% {unsignedia32} = %% {shimveria32}
-# %% endif
+BuildRequires:	%{unsignedx64} = %{shimverx64}
-# %% ifarch aarch64
+BuildRequires:	%{unsignedia32} = %{shimveria32}
-# BuildRequires:	%% {unsignedaa64} = %% {shimveraa64}
+%endif
-# %% endif
+%ifarch aarch64
+BuildRequires:	%{unsignedaa64} = %{shimveraa64}
+%endif
 #%%ifarch arm
 #BuildRequires:	%%{unsignedarm} = %%{shimverarm}
 #%%endif
@@ -74,11 +76,10 @@ mkdir shim-%{version}
 export PS4='${LINENO}: '
 
 cd shim-%{version}
-# Temporarily using _sourcedir to avoid build dep annoyances.
 %if %{efi_has_alt_arch}
-%define_build -a %{efi_alt_arch} -A %{efi_alt_arch_upper} -i %{shimefialt} -b yes -c %{is_alt_signed} -d %{_sourcedir}
+%define_build -a %{efi_alt_arch} -A %{efi_alt_arch_upper} -i %{shimefialt} -b yes -c %{is_alt_signed} -d %{shimdiralt}
 %endif
-%define_build -a %{efi_arch} -A %{efi_arch_upper} -i %{shimefi} -b yes -c %{is_signed} -d %{_sourcedir}
+%define_build -a %{efi_arch} -A %{efi_arch_upper} -i %{shimefi} -b yes -c %{is_signed} -d %{shimdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -107,33 +108,10 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
 %endif
 
 %if %{provide_legacy_shim}
-%verify(not mtime) %{efi_esp_dir}/shim.efi
+%{efi_esp_dir}/shim.efi
 %endif
 
 %changelog
-* Tue Apr 16 2024 Peter Jones <pjones@redhat.com> - 15.8-4
-- Bump the release to *-4* to work around a build system issue.
-  Related: RHEL-11259
-
-* Wed Apr 10 2024 Peter Jones <pjones@redhat.com> - 15.8-3
-- Bump the release to -3 to work around a build system issue.
-  Related: RHEL-11259
-
-* Thu Mar 28 2024 Peter Jones <pjones@redhat.com> - 15.8-2.el8
-- Fix rpm verify issue found in testing.
-  Related: RHEL-11259
-
-* Thu Mar 21 2024 Peter Jones <pjones@redhat.com> - 15.8-1.el8
-- Update to shim-15.8 for CVE-2023-40547
-  Resolves: RHEL-11259
-
-* Wed Apr 20 2022 Peter Jones <pjones@redhat.com> - 15.5-2.el8
-- Include the actual signed shim binaries.
-  Resolves: rhbz#1970632
-  Resolves: rhbz#1982071
-  Resolves: rhbz#2000946
-  Resolves: rhbz#2002265
-
 * Tue Apr 19 2022 Peter Jones <pjones@redhat.com> - 15.5-1
 - Update to shim-15.5
   Resolves: rhbz#1970632