From 5982dbd9f6be59c14f84a69c4817bcbf4c804444 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Tue, 12 May 2026 10:10:21 +0000
Subject: [PATCH] Update shim binaries to signed with MS2023 key

---
 .shim.metadata  | 6 +++---
 SPECS/shim.spec | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.shim.metadata b/.shim.metadata
index 6a80590..f221da6 100644
--- a/.shim.metadata
+++ b/.shim.metadata
@@ -8,6 +8,6 @@ cca8dd0b9b2e2d3a5e693087a926cb63150a0b2f SOURCES/BOOTX64.CSV
 48fe2246bcc52729315e7db8361d753ab6be1633 SOURCES/mmaa64.efi
 8cbdaee830b36fc741e7f04228422933c07bbb4f SOURCES/mmia32.efi
 08fa765dbe8902c022fe0d5b5803c14bc1e44a5c SOURCES/mmx64.efi
-206b13df7ccae83bf2f961da7010e16eac372b28 SOURCES/shimaa64.efi
-489ce4f178645f1317ffb3401007694e2ec77638 SOURCES/shimia32.efi
-1208043ca28f8566c115d8a15ba9bd8163b6badb SOURCES/shimx64.efi
+5724dd3bfc7c0888221166fc51dc2e7d6814149e SOURCES/shimaa64.efi
+80ee554e10ae4df45eec67269df53fbd235513b4 SOURCES/shimia32.efi
+e11642a210db74f07c310f5df50a95d2c36f1a5b SOURCES/shimx64.efi
diff --git a/SPECS/shim.spec b/SPECS/shim.spec
index dd9f860..bec5ef7 100644
--- a/SPECS/shim.spec
+++ b/SPECS/shim.spec
@@ -4,7 +4,7 @@
 
 Name:		shim
 Version:	15.8
-Release:	4%{?dist}.alma.2
+Release:	6%{?dist}.alma.1
 Summary:	First-stage UEFI bootloader
 License:	BSD
 URL:		https://github.com/rhboot/shim/
@@ -115,6 +115,10 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
 %endif
 
 %changelog
+* 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
+
 * Fri Jul 26 2024 Eduard Abdullin <eabdullin@almalinux.org> - 15.8-4.alma.2
 - Add SB for aarch64