.gitignore

@@ -1 +1,2 @@
-SOURCES/shim-15.8.tar.bz2
+redhatsecurebootca8.cer
+shim-16.1.tar.bz2

.shim-unsigned-aarch64.metadata

@@ -1 +0,0 @@
-cdec924ca437a4509dcb178396996ddf92c11183 SOURCES/shim-15.8.tar.bz2

shim-unsigned-aarch64.spec

@@ -1,31 +1,33 @@
 %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} aa64
-%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}
 %global efiarch aa64
 %global shimdir %{shimversiondir}/%{efiarch}
 
+%global debug_package %{nil}
+%global __debug_package 1
+%global _binaries_in_noarch_packages_terminate_build 0
+%global __debug_install_post %{SOURCE100} aa64
+%undefine _debuginfo_subpackages
+
+# currently here's what's in our dbx: nothing
+%global dbxfile %{nil}
+
 Name:		shim-unsigned-aarch64
-Version:	15.8
-Release:	2.el8
+Version:	16.1
+Release:	2.el10
 Summary:	First-stage UEFI bootloader
 ExclusiveArch:	aarch64
 License:	BSD
 URL:		https://github.com/rhboot/shim
 Source0:	https://github.com/rhboot/shim/releases/download/%{version}/shim-%{version}.tar.bz2
-Source1:	securebootca.cer
-# currently here's what's in our dbx:
-# nothing.
-Source2:	dbx.esl
+Source1:	redhatsecurebootca8.cer
+%if 0%{?dbxfile}
+Source2:	%{dbxfile}
+%endif
 Source3:	sbat.redhat.csv
 Source4:	shim.patches
 
@@ -80,13 +82,14 @@ BuildArch:	noarch
 git config --unset user.email
 git config --unset user.name
 mkdir build-%{efiarch}
+cp %{SOURCE3} data/
 
 %build
-COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6
+COMMIT_ID=18d98bfb34be583a5fe2987542e4b15e0db9cb61
 MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMIT_ID} "
 MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
 MAKEFLAGS+="ENABLE_SHIM_HASH=true "
-MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 "
+MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2024040900 "
 MAKEFLAGS+="%{_smp_mflags}"
 if [ -f "%{SOURCE1}" ]; then
 	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1} "
@@ -100,11 +103,11 @@ make ${MAKEFLAGS} DEFAULT_LOADER='\\\\grub%{efiarch}.efi' all
 cd ..
 
 %install
-COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6
+COMMIT_ID=18d98bfb34be583a5fe2987542e4b15e0db9cb61
 MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMIT_ID} "
 MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
 MAKEFLAGS+="ENABLE_SHIM_HASH=true "
-MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 "
+MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2024040900 "
 if [ -f "%{SOURCE1}" ]; then
 	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1} "
 fi
@@ -133,13 +136,24 @@ cd ..
 %files debugsource -f build-%{efiarch}/debugsource.list
 
 %changelog
-* Wed Feb 07 2024 Peter Jones <pjones@redhat.com> - 15.8-2.el8
-- Rebuild to fix the commit ident and MAKEFLAGS
-  Resolves: RHEL-11259
+* Tue Aug 26 2025 Peter Jones <pjones@redhat.com> - 16.1-2.el10
+- Fix the sbat data
+  Related: RHEL-81188
 
-* 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
+* Mon Aug 25 2025 Peter Jones <pjones@redhat.com> - 16.1-1.el10
+- Update for shim 16 and rectify differences with shim-unsigned-x64
+- Related: #RHEL-81188
+
+* Thu Mar 20 2025 Peter Jones <pjones@redhat.com> - 16.0-1.el10
+- Update for shim 16 and rectify differences with shim-unsigned-x64
+- Related: #RHEL-81188
+
+* Thu Mar 13 2025 Nicolas Frayer <nfrayer@redhat.com> - 15.8-3.el10
+- Update gating.yaml for rhel-10
+- Resolves: #RHEL-81188
+
+* Thu Mar 6 2025 Nicolas Frayer <nfrayer@redhat.com> - 15.8-2.el10
+- Update to shim-15.8
 
 * Tue May 26 2020 Javier Martinez Canillas <javierm@redhat.com> - 15-6
 - Fix a shim crash when attempting to netboot

sources

@@ -0,0 +1,2 @@
+SHA512 (redhatsecurebootca8.cer) = 7c8dffaa437d441d53a27eafd7340986c14e22be5cc11e712859f2af5dcc892e756e19d0260108191973a7ce8ae180844cb80ce676d11143227c7d1a20381e35
+SHA512 (shim-16.1.tar.bz2) = ca5f80e82f3b80b622028f03ef23105c98ee1b6a25f52a59c823080a3202dd4b9962266489296e99f955eb92e36ce13e0b1d57f688350006bba45f2718f159fb