AlmaLinux changes

.shim.metadata

@@ -1,3 +1,3 @@
 750bd7932437b1fb6610c233f69db1b70d67fab1 SOURCES/shimaa64.efi
-96ea5ec6612ad2d49dfa812897fc2f70ebee6b9d SOURCES/shimia32.efi
+ea800341a41765d0a06611220063d3aef8453dab SOURCES/shimia32.efi
-b7adea991a31e4392910db8b7ee63faff39e9207 SOURCES/shimx64.efi
+9f0ee5b4f212db7d228c8f985d4f15410c4922ed SOURCES/shimx64.efi

SOURCES/shim.rpmmacros

@@ -14,8 +14,8 @@
 #%%global shimefiarm %%{expand:%%{SOURCE23}
 
 %global shimveraa64 15-6.el8
-%global shimveria32 15-9.el8
+%global shimveria32 15-9.el8.alma
-%global shimverx64 15-9.el8
+%global shimverx64 15-9.el8.alma
 #%%global shimverarm 15-1.el8
 
 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
@@ -48,6 +48,7 @@ Requires: mokutil >= 1:0.3.0-1						\
 Requires: efi-filesystem						\
 Provides: shim-signed-%{-a*} = %{version}-%{release}			\
 Requires: dbxtool >= 0.6-3						\
+Requires: %{efi_esp_dir}/grub%{-a*}.efi					\
 %{expand:%%if 0%%{-p*}							\
 Provides: shim = %{version}-%{release}					\
 Provides: shim-signed = %{version}-%{release}				\

SPECS/shim.spec

@@ -1,3 +1,8 @@
+%global dist %{?dist}.alma
+%global efi_vendor almalinux
+%global efidir almalinux
+%global efi_esp_dir /boot/efi/EFI/%{efidir}
+
 Name:		shim
 Version:	15
 Release:	16%{?dist}
@@ -14,8 +19,7 @@ ExcludeArch:	%{ix86}
 ExcludeArch:	%{arm}
 
 Source0:	shim.rpmmacros
-Source1:	redhatsecureboot501.cer
+Source1:	clsecureboot001.cer
-Source2:	redhatsecurebootca5.cer
 
 # keep these two lists of sources synched up arch-wise.  That is 0 and 10
 # match, 1 and 11 match, ...
@@ -101,6 +105,9 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
 %endif
 
 %changelog
+* Tue Jan 25 2022 Eduard Abdullin <eabdullin@almalinux.org> - 15-16.alma
+- Add support for Secure Boot
+
 * Mon Sep 21 2020 Javier Martinez Canillas <javierm@redhat.com> - 15-16
 - Fix an incorrect allocation size
   Resolves: rhbz#1877253