diff --git a/.shim.metadata b/.shim.metadata index bd1dd4b..310e5c3 100644 --- a/.shim.metadata +++ b/.shim.metadata @@ -1,4 +1,4 @@ -9ca9cfa834aedfaf3efe2216bfa1cb7c286ee1c0 SOURCES/fbx64.efi -5eb0ac78eee6aeeaf44a3f11d002b4fe00af6916 SOURCES/mmx64.efi -4312f246b6ba692040383f10358ac9a5927207de SOURCES/shimaa64.efi -783fb77783e9d0c4c400b723dfd0f02f006616ae SOURCES/shimx64.efi +bfee65ae45498fefd64b16edf9993415b625cb3c SOURCES/shimaa64.efi +5957bbccac9f22c1738039679204be0bb57c3812 SOURCES/shimx64.efi +122b21c2da0ca4ee839d4bb6beff7ddffd68f1a0 SOURCES/fbx64.efi +a4f7a273cc9a531a6ef125b91353f479cfa5f79c SOURCES/mmx64.efi diff --git a/SOURCES/BOOTAA64.CSV b/SOURCES/BOOTAA64.CSV index 2dad06e..3ef9ab9 100644 Binary files a/SOURCES/BOOTAA64.CSV and b/SOURCES/BOOTAA64.CSV differ diff --git a/SOURCES/BOOTX64.CSV b/SOURCES/BOOTX64.CSV index 77b070b..38a9ef0 100644 Binary files a/SOURCES/BOOTX64.CSV and b/SOURCES/BOOTX64.CSV differ diff --git a/SOURCES/clsecureboot001.cer b/SOURCES/clsecureboot001.cer new file mode 100644 index 0000000..ca9ce5d Binary files /dev/null and b/SOURCES/clsecureboot001.cer differ diff --git a/SOURCES/redhatsecureboot501.cer b/SOURCES/redhatsecureboot501.cer deleted file mode 100644 index dfa7afb..0000000 Binary files a/SOURCES/redhatsecureboot501.cer and /dev/null differ diff --git a/SOURCES/redhatsecurebootca5.cer b/SOURCES/redhatsecurebootca5.cer deleted file mode 100644 index dfb0284..0000000 Binary files a/SOURCES/redhatsecurebootca5.cer and /dev/null differ diff --git a/SOURCES/shim.rpmmacros b/SOURCES/shim.rpmmacros index d1379ff..d29c4a3 100644 --- a/SOURCES/shim.rpmmacros +++ b/SOURCES/shim.rpmmacros @@ -19,8 +19,8 @@ %global mmefix64 %{expand:%{SOURCE42}} #%%global mmefiarm %%{expand:%%{SOURCE43} -%global shimveraa64 15-6.el9 -%global shimverx64 15.6-1.el9 +%global shimveraa64 15-6.el9.alma +%global shimverx64 15.6-1.el9.alma #%%global shimverarm 15-1.el8 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 diff --git a/SPECS/shim.spec b/SPECS/shim.spec index cae3ba6..b60cdb0 100644 --- a/SPECS/shim.spec +++ b/SPECS/shim.spec @@ -1,6 +1,6 @@ Name: shim Version: 15.6 -Release: 1.el9 +Release: 1.el9.alma Summary: First-stage UEFI bootloader License: BSD URL: https://github.com/rhboot/shim/ @@ -12,8 +12,7 @@ ExclusiveArch: %{efi} ExcludeArch: %{arm} %{ix86} Source0: shim.rpmmacros -Source1: redhatsecureboot501.cer -Source2: redhatsecurebootca5.cer +Source1: clsecureboot001.cer # keep these two lists of sources synched up arch-wise. That is 0 and 10 # match, 1 and 11 match, ... @@ -104,6 +103,9 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi %endif %changelog +* Tue Aug 23 2022 Andrew Lukoshko - 15.6-1.el9.alma +- AlmaLinux changes + * Mon Jun 06 2022 Peter Jones - 15.6-1.el9 - Update to shim-15.6 Resolves: CVE-2022-28737