diff --git a/.shim.metadata b/.shim.metadata index 59c4fc9..f067c63 100644 --- a/.shim.metadata +++ b/.shim.metadata @@ -1,3 +1,3 @@ 8f61bdc72cf582e2fdf094eac3bd911464857d89 SOURCES/shimaa64.efi -cf0dc84373d0036f0420255baaa5a3b4760563ed SOURCES/shimia32.efi -5957bbccac9f22c1738039679204be0bb57c3812 SOURCES/shimx64.efi +0ec5248d6de68520dad7587f531dfabe4e2a9007 SOURCES/shimia32.efi +8d5251f1166c9dd43426903459fe95d4bd262483 SOURCES/shimx64.efi diff --git a/SOURCES/almalinuxsecurebootca0.cer b/SOURCES/almalinuxsecurebootca0.cer new file mode 100644 index 0000000..6a4e99b Binary files /dev/null and b/SOURCES/almalinuxsecurebootca0.cer differ diff --git a/SOURCES/clsecureboot001.cer b/SOURCES/clsecureboot001.cer deleted file mode 100644 index ca9ce5d..0000000 Binary files a/SOURCES/clsecureboot001.cer and /dev/null differ diff --git a/SOURCES/shim.rpmmacros b/SOURCES/shim.rpmmacros index 3539edb..84157d6 100644 --- a/SOURCES/shim.rpmmacros +++ b/SOURCES/shim.rpmmacros @@ -13,9 +13,9 @@ %global shimefix64 %{expand:%{SOURCE22}} #%%global shimefiarm %%{expand:%%{SOURCE23} -%global shimveraa64 15-7.el8_1.alma -%global shimveria32 15.6-1.el8.alma -%global shimverx64 15.6-1.el8.alma +%global shimveraa64 15-7.el8_1.alma.1 +%global shimveria32 15.6-1.el8.alma.1 +%global shimverx64 15.6-1.el8.alma.1 #%%global shimverarm 15-1.el8 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 @@ -49,6 +49,11 @@ Requires: efi-filesystem \ Provides: shim-signed-%{-a*} = %{version}-%{release} \ Requires: dbxtool >= 0.6-3 \ Requires: %{efi_esp_dir}/grub%{-a*}.efi \ +%{expand:%ifarch x86_64 \ +# SecureBoot keys dependencies \ +Requires: almalinux(grub2-sig-key) >= 202303 \ +Requires: almalinux(kernel-sig-key) >= 202303 \ +%endif} \ %{expand:%%if 0%%{-p*} \ Provides: shim = %{version}-%{release} \ Provides: shim-signed = %{version}-%{release} \ diff --git a/SPECS/shim.spec b/SPECS/shim.spec index b4d262f..429da1d 100644 --- a/SPECS/shim.spec +++ b/SPECS/shim.spec @@ -4,7 +4,7 @@ Name: shim Version: 15.6 -Release: 1%{?dist}.alma +Release: 1%{?dist}.alma.1 Summary: First-stage UEFI bootloader License: BSD URL: https://github.com/rhboot/shim/ @@ -18,7 +18,7 @@ ExcludeArch: %{ix86} ExcludeArch: %{arm} Source0: shim.rpmmacros -Source1: clsecureboot001.cer +Source1: almalinuxsecurebootca0.cer # keep these two lists of sources synched up arch-wise. That is 0 and 10 # match, 1 and 11 match, ... @@ -104,6 +104,9 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi %endif %changelog +* Mon Feb 27 2023 Eduard Abdullin - 15.6-1.alma.1 +- Use AlmaLinux cert + * Tue Aug 23 2022 Andrew Lukoshko - 15.6-1.alma - AlmaLinux changes