Merge branch 'c8' into a8

SOURCES/sbat.cloudlinux.csv

@@ -0,0 +1 @@
+shim.cloudlinux,2,CloudLinux,shim,15.6,security@cloudlinux.com

SOURCES/sbat.redhat.csv

@@ -1 +0,0 @@
-shim.redhat,1,Red Hat Inc,shim,15.5,secalert@redhat.com

SPECS/shim-unsigned-x64.spec

@@ -8,7 +8,7 @@
 %global __debug_install_post %{SOURCE100} x64 ia32
 %undefine _debuginfo_subpackages
 
-%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
+%global efidir almalinux
 %global shimrootdir %{_datadir}/shim/
 %global shimversiondir %{shimrootdir}/%{version}-%{release}
 %global efiarch x64
@@ -18,17 +18,17 @@
 
 Name:		shim-unsigned-%{efiarch}
 Version:	15.6
-Release:	1.el8
+Release:	1.el8.alma
 Summary:	First-stage UEFI bootloader
 ExclusiveArch:	x86_64
 License:	BSD
 URL:		https://github.com/rhboot/shim
 Source0:	https://github.com/rhboot/shim/releases/download/%{version}/shim-%{version}.tar.bz2
-Source1:	redhatsecurebootca5.cer
+Source1:	clsecureboot001.cer
 # currently here's what's in our dbx:
 # nothing.
 Source2:	dbx.esl
-Source3:	sbat.redhat.csv
+Source3:	sbat.cloudlinux.csv
 Source4:	shim.patches
 
 Source100:	shim-find-debuginfo.sh
@@ -178,6 +178,9 @@ cd ..
 %files debugsource -f build-%{efiarch}/debugsource.list
 
 %changelog
+* Fri Jun 17 2022 Eduard Abdullin <eabdullin@almalinux.org> - 15.6-1.el8.alma
+- Use CloudLinux vendor cert and SBAT entry
+
 * Wed Jun 01 2022 Peter Jones <pjones@redhat.com> - 15.6-1.el8
 - Update to shim-15.6
   Resolves: CVE-2022-28737