From b338d9c35376065ceda59575f84329ea557bf6fc Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Thu, 11 Jun 2026 11:30:48 +0000
Subject: [PATCH] Update to 16.1

---
 .shim.metadata         | 22 +++++++++-------------
 SOURCES/shim.rpmmacros | 10 +++++-----
 SPECS/shim.spec        |  7 +++++--
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.shim.metadata b/.shim.metadata
index f221da6..8113caa 100644
--- a/.shim.metadata
+++ b/.shim.metadata
@@ -1,13 +1,9 @@
-e2bd0ba50614457483a298097b2252b6f18c0a1b SOURCES/BOOTAA64.CSV
-46bef68f0c2f722f4bb59385a8917c18210d4c4f SOURCES/BOOTIA32.CSV
-cca8dd0b9b2e2d3a5e693087a926cb63150a0b2f SOURCES/BOOTX64.CSV
-077f737b9a26b59d2517ee390879f02ab464a284 SOURCES/almalinuxsecurebootca0.cer
-4591a3da03f337b27e963b69202f7109496c0ef8 SOURCES/fbaa64.efi
-0bbc4ac41e7ed2fb284f76995dac4be4f86f18a1 SOURCES/fbia32.efi
-403a4e918a00f5e90551085c7ba545969feee26e SOURCES/fbx64.efi
-48fe2246bcc52729315e7db8361d753ab6be1633 SOURCES/mmaa64.efi
-8cbdaee830b36fc741e7f04228422933c07bbb4f SOURCES/mmia32.efi
-08fa765dbe8902c022fe0d5b5803c14bc1e44a5c SOURCES/mmx64.efi
-5724dd3bfc7c0888221166fc51dc2e7d6814149e SOURCES/shimaa64.efi
-80ee554e10ae4df45eec67269df53fbd235513b4 SOURCES/shimia32.efi
-e11642a210db74f07c310f5df50a95d2c36f1a5b SOURCES/shimx64.efi
+54c5dc2f61c6796bd3e380d8975b897d5f986ddd SOURCES/fbaa64.efi
+fd481985db7102863e41b5ab695b2dadb69208cd SOURCES/fbia32.efi
+8b3a0272ec343019bfabbf7d56ba727e34cc772c SOURCES/fbx64.efi
+361282fb4c2110c07ca9790ad95b786a223668b9 SOURCES/mmaa64.efi
+cf34ce9c9e8a8ed39262fed7cc9f0edd8f810782 SOURCES/mmia32.efi
+25241e035dc88dafc34f1b1256731c7fda3e8a13 SOURCES/mmx64.efi
+03ff27cdfc981bd3c4afce0c8deab4175618a07e SOURCES/shimaa64.efi
+759f23e2a8d7fef40a9a0254900385d27a9f721e SOURCES/shimia32.efi
+40703d37a47ae67047a42d4606873f63826c7940 SOURCES/shimx64.efi
diff --git a/SOURCES/shim.rpmmacros b/SOURCES/shim.rpmmacros
index 5154980..00a861e 100644
--- a/SOURCES/shim.rpmmacros
+++ b/SOURCES/shim.rpmmacros
@@ -3,7 +3,7 @@
 %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 grub_version 2.02-170.el8_10.2.alma.1
 
 %global bootcsvaa64 %{expand:%{SOURCE10}}
 %global bootcsvia32 %{expand:%{SOURCE11}}
@@ -25,9 +25,9 @@
 %global mmefix64 %{expand:%{SOURCE42}}
 #%%global mmefiarm %%{expand:%%{SOURCE43}
 
-%global shimveraa64 15.8-2.el8.alma.1
-%global shimveria32 15.8-2.el8.alma.1
-%global shimverx64 15.8-2.el8.alma.1
+%global shimveraa64 16.1-2.el8.alma.1
+%global shimveria32 16.1-2.el8.alma.1
+%global shimverx64 16.1-2.el8.alma.1
 #%%global shimverarm 15-1.el8.alma.1
 
 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
@@ -193,7 +193,7 @@ install -m 0700 fb%{-a*}.efi						\\\
 
 %ifarch x86_64
 %global is_signed yes
-%global is_alt_signed yes
+%global is_alt_signed no
 %global provide_legacy_shim 1
 %endif
 %ifarch aarch64
diff --git a/SPECS/shim.spec b/SPECS/shim.spec
index bec5ef7..e19d19d 100644
--- a/SPECS/shim.spec
+++ b/SPECS/shim.spec
@@ -3,8 +3,8 @@
 %global efi_esp_dir /boot/efi/EFI/%{efidir}
 
 Name:		shim
-Version:	15.8
-Release:	6%{?dist}.alma.1
+Version:	16.1
+Release:	2%{?dist}.alma.1
 Summary:	First-stage UEFI bootloader
 License:	BSD
 URL:		https://github.com/rhboot/shim/
@@ -115,6 +115,9 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
 %endif
 
 %changelog
+* Thu Jun 11 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 16.1-2.alma.1
+- Update to 16.1
+
 * Tue May 12 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 15.8-6.alma.1
 - shimx64.efi and shimia32.efi are now signed by both 2011 and 2023 MS keys
 - shimaa64.efi is now signed by 2023 MS key