.gitignore

@@ -1,2 +1 @@
-SOURCES/redhatsecurebootca5.cer
+SOURCES/shim-15.5.tar.bz2
-SOURCES/shim-15.8.tar.bz2

.shim-unsigned-x64.metadata

@@ -1,2 +1 @@
-e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer
+b91f5eaced7ba1dcaef266af10763461889be5df SOURCES/shim-15.5.tar.bz2
-cdec924ca437a4509dcb178396996ddf92c11183 SOURCES/shim-15.8.tar.bz2

SOURCES/sbat.redhat.csv

@@ -1 +1 @@
-shim.redhat,3,Red Hat Inc,shim,15.8,secalert@redhat.com
+shim.redhat,1,Red Hat Inc,shim,15.5,secalert@redhat.com

SPECS/shim-unsigned-x64.spec

@@ -1,13 +1,6 @@
 %global pesign_vre 0.106-1
-%global gnuefi_vre 1:3.0.5-6
 %global openssl_vre 1.0.2j
 
-%global debug_package %{nil}
-%global __debug_package 1
-%global _binaries_in_noarch_packages_terminate_build 0
-%global __debug_install_post %{SOURCE100} x64 ia32
-%undefine _debuginfo_subpackages
-
 %global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
 %global shimrootdir %{_datadir}/shim/
 %global shimversiondir %{shimrootdir}/%{version}-%{release}
@@ -16,25 +9,31 @@
 %global efialtarch ia32
 %global shimaltdir %{shimversiondir}/%{efialtarch}
 
+%global debug_package %{nil}
+%global __debug_package 1
+%global _binaries_in_noarch_packages_terminate_build 0
+%global __debug_install_post %{SOURCE100} %{efiarch} %{efialtarch}
+%undefine _debuginfo_subpackages
+
+# currently here's what's in our dbx: nothing
+%global dbxfile %{nil}
+
 Name:		shim-unsigned-%{efiarch}
-Version:	15.8
+Version:	15.5
-Release:	2.el8
+Release:	1.el8
 Summary:	First-stage UEFI bootloader
 ExclusiveArch:	x86_64
 License:	BSD
 URL:		https://github.com/rhboot/shim
 Source0:	https://github.com/rhboot/shim/releases/download/%{version}/shim-%{version}.tar.bz2
 Source1:	redhatsecurebootca5.cer
-# currently here's what's in our dbx:
+%if 0%{?dbxfile}
-# nothing.
+Source2:	%{dbxfile}
-Source2:	dbx.esl
+%endif
 Source3:	sbat.redhat.csv
-Source4:	shim.patches
 
 Source100:	shim-find-debuginfo.sh
 
-%include %{SOURCE4}
-
 BuildRequires:	gcc make
 BuildRequires:	elfutils-libelf-devel
 BuildRequires:	git openssl-devel openssl
@@ -95,7 +94,7 @@ BuildArch:	noarch
 %debug_desc
 
 %prep
-%autosetup -S git_am -n shim-%{version}
+%autosetup -S git -n shim-%{version}
 git config --unset user.email
 git config --unset user.name
 mkdir build-%{efiarch}
@@ -103,42 +102,36 @@ mkdir build-%{efialtarch}
 cp %{SOURCE3} data/
 
 %build
-COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6
+COMMITID=$(cat commit)
-MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMIT_ID=${COMMIT_ID} "
+MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
 MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
 MAKEFLAGS+="ENABLE_SHIM_HASH=true "
-MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 "
 MAKEFLAGS+="%{_smp_mflags}"
 if [ -s "%{SOURCE1}" ]; then
-	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1} "
+	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1}"
 fi
 if [ -s "%{SOURCE2}" ]; then
-	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2} "
+	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
 fi
 
 cd build-%{efiarch}
-make ${MAKEFLAGS} \
+make ${MAKEFLAGS} DEFAULT_LOADER='\\\\grub%{efiarch}.efi' all
-	DEFAULT_LOADER='\\\\grub%{efiarch}.efi' \
-	all
 cd ..
 
 cd build-%{efialtarch}
-setarch linux32 -B make ${MAKEFLAGS} ARCH=%{efialtarch} \
+setarch linux32 -B make ${MAKEFLAGS} ARCH=%{efialtarch} DEFAULT_LOADER='\\\\grub%{efialtarch}.efi' all
-	DEFAULT_LOADER='\\\\grub%{efialtarch}.efi' \
-	all
 cd ..
 
 %install
-COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6
+COMMITID=$(cat commit)
-MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMIT_ID=${COMMIT_ID} "
+MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
 MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
-MAKEFLAGS+="ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true "
+MAKEFLAGS+="ENABLE_SHIM_HASH=true "
-MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 "
 if [ -s "%{SOURCE1}" ]; then
-	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1} "
+	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1}"
 fi
 if [ -s "%{SOURCE2}" ]; then
-	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2} "
+	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
 fi
 
 cd build-%{efiarch}
@@ -160,18 +153,18 @@ cd ..
 %dir %{shimrootdir}
 %dir %{shimversiondir}
 %dir %{shimdir}
-%{shimdir}/*.CSV
 %{shimdir}/*.efi
 %{shimdir}/*.hash
+%{shimdir}/*.CSV
 
 %files -n shim-unsigned-%{efialtarch}
 %license COPYRIGHT
 %dir %{shimrootdir}
 %dir %{shimversiondir}
 %dir %{shimaltdir}
-%{shimaltdir}/*.CSV
 %{shimaltdir}/*.efi
 %{shimaltdir}/*.hash
+%{shimaltdir}/*.CSV
 
 %files debuginfo -f build-%{efiarch}/debugfiles.list
 
@@ -180,17 +173,9 @@ cd ..
 %files debugsource -f build-%{efiarch}/debugsource.list
 
 %changelog
-* Wed Feb 07 2024 Peter Jones <pjones@redhat.com> - 15.8-2.el8
+* Wed Mar 09 2022 Peter Jones <pjones@redhat.com> - 15.5-1.el8
-- Rebuild to fix the commit ident and MAKEFLAGS
+- Update to shim-15.5
-  Resolves: RHEL-11259
+  Related: rhbz#1982071
-
-* Tue Dec 05 2023 Peter Jones <pjones@redhat.com> - 15.8-1.el8
-- Update to shim-15.8 for CVE-2023-40547
-  Resolves: RHEL-11259
-
-* Wed Jun 01 2022 Peter Jones <pjones@redhat.com> - 15.6-1.el8
-- Update to shim-15.6
-  Resolves: CVE-2022-28737
 
 * Thu Sep 17 2020 Peter Jones <pjones@redhat.com> - 15-9.el8
 - Fix an incorrect allocation size.