import shim-unsigned-x64-15.5-1.el9

.gitignore

@@ -1 +1 @@
-SOURCES/shim-15.4.tar.bz2
+SOURCES/shim-15.5.tar.bz2

.shim-unsigned-x64.metadata

@@ -1 +1 @@
-d70485792a300bfa66f551adf7ae766451dfe7c0 SOURCES/shim-15.4.tar.bz2
+b91f5eaced7ba1dcaef266af10763461889be5df SOURCES/shim-15.5.tar.bz2

SOURCES/sbat.cloudlinux.csv

@@ -1 +0,0 @@
-shim.cloudlinux,1,CloudLinux,shim,15.4-4,security@cloudlinux.com

SOURCES/sbat.redhat.csv

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

SPECS/shim-unsigned-x64.spec

@@ -1,7 +1,7 @@
 %global pesign_vre 0.106-1
 %global openssl_vre 1.0.2j
 
-%global efidir almalinux
+%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}
 %global efiarch x64
@@ -19,23 +19,21 @@
 %global dbxfile %{nil}
 
 Name:		shim-unsigned-%{efiarch}
-Version:	15.4
+Version:	15.5
-Release:	4%{?dist}.alma
+Release:	1.el9
 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:	clsecureboot001.cer
+Source1:	redhatsecurebootca5.cer
 %if 0%{?dbxfile}
 Source2:	%{dbxfile}
 %endif
-Source3:	sbat.cloudlinux.csv
+Source3:	sbat.redhat.csv
 
 Source100:	shim-find-debuginfo.sh
 
-Patch0001:	0001-Fix-a-broken-file-header-on-ia32.patch
-
 BuildRequires:	gcc make
 BuildRequires:	elfutils-libelf-devel
 BuildRequires:	git openssl-devel openssl
@@ -122,13 +120,6 @@ make ${MAKEFLAGS} \
 	all
 cd ..
 
-cd build-%{efialtarch}
-setarch linux32 -B make ${MAKEFLAGS} \
-	ARCH=%{efialtarch} \
-	DEFAULT_LOADER='\\\\grub%{efialtarch}.efi' \
-	all
-cd ..
-
 %install
 COMMITID=$(cat commit)
 MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
@@ -150,14 +141,6 @@ make ${MAKEFLAGS} \
 	install-as-data install-debuginfo install-debugsource
 cd ..
 
-cd build-%{efialtarch}
-setarch linux32 make ${MAKEFLAGS} \
-	ARCH=%{efialtarch} \
-	DEFAULT_LOADER='\\\\grub%{efialtarch}.efi' \
-	DESTDIR=${RPM_BUILD_ROOT} \
-	install-as-data install-debuginfo install-debugsource
-cd ..
-
 %files
 %license COPYRIGHT
 %dir %{shimrootdir}
@@ -167,24 +150,14 @@ cd ..
 %{shimdir}/*.hash
 %{shimdir}/*.CSV
 
-%files -n shim-unsigned-%{efialtarch}
-%license COPYRIGHT
-%dir %{shimrootdir}
-%dir %{shimversiondir}
-%dir %{shimaltdir}
-%{shimaltdir}/*.efi
-%{shimaltdir}/*.hash
-%{shimaltdir}/*.CSV
-
 %files debuginfo -f build-%{efiarch}/debugfiles.list
 
-%files -n shim-unsigned-%{efialtarch}-debuginfo -f build-%{efialtarch}/debugfiles.list
-
 %files debugsource -f build-%{efiarch}/debugsource.list
 
 %changelog
-* Fri Apr 02 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 15.4-4.alma
+* Wed Mar 09 2022 Peter Jones <pjones@redhat.com> - 15.5-1
-- Use CloudLinux vendor cert and SBAT entry
+- Update to shim-15.5
+  Related: rhbz#1932057
 
 * Thu Apr 01 2021 Peter Jones <pjones@redhat.com> - 15.4-4
 - Fix the sbat data to actually match /this/ product.
@@ -254,17 +227,24 @@ cd ..
 - Fix MoK mirroring issue which breaks kdump without intervention
   Related: rhbz#1668966
 
-* Fri Jul 20 2018 Peter Jones <pjones@redhat.com> - 15-1
+* Thu Apr 05 2018 Peter Jones <pjones@redhat.com> - 15-1
 - Update to shim 15
+- better checking for bad linker output
+- flicker-free console if there's no error output
+- improved http boot support
+- better protocol re-installation
+- dhcp proxy support
+- tpm measurement even when verification is disabled
+- REQUIRE_TPM build flag
+- more reproducable builds
+- measurement of everything verified through shim_verify()
+- coverity and scan-build checker make targets
+- misc cleanups
 
-* Tue Sep 19 2017 Peter Jones <pjones@redhat.com> - 13-3
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 13-0.2
-- Actually update to the *real* 13 final.
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-  Related: rhbz#1489604
 
-* Thu Aug 31 2017 Peter Jones <pjones@redhat.com> - 13-2
+* Fri Aug 18 2017 Peter Jones <pjones@redhat.com> - 13-0.1
-- Actually update to 13 final.
-
-* Fri Aug 18 2017 Peter Jones <pjones@redhat.com> - 13-1
 - Make a new shim-unsigned-x64 package like the shim-unsigned-aarch64 one.
 - This will (eventually) supersede what's in the "shim" package so we can
   make "shim" hold the signed one, which will confuse fewer people.