Debrand for AlmaLinux

SOURCES/grub.macros

@@ -274,6 +274,11 @@ Requires:	%{name}-common = %{evr}					\
 Requires:	%{name}-tools-minimal >= %{evr}				\
 Requires:	%{name}-tools = %{evr}					\
 Provides:	%{name}-efi = %{evr}					\
+Provides:	almalinux(grub2-sig-key) = 202303				\
+%{expand:%%ifarch x86_64						\
+Conflicts:	shim-x64 <= 15.6-1.el9.alma					\
+Conflicts:	shim-ia32 <= 15.6-1.el9.alma				\
+%%endif}										\
 %{?legacy_provides:Provides:	%{name} = %{evr}}			\
 %{-o:Obsoletes:	%{name}-efi < %{evr}}					\
 									\

SOURCES/sbat.csv.in

@@ -1,3 +1,4 @@
 sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
 grub,3,Free Software Foundation,grub,@@VERSION@@,https//www.gnu.org/software/grub/
-grub.rh,2,Red Hat,grub2,@@VERSION_RELEASE@@,mailto:secalert@redhat.com
+grub.rh,2,Red Hat,grub2,@@RHEL_VERSION_RELEASE@@,mailto:secalert@redhat.com
+grub.almalinux,2,AlmaLinux,grub2,@@VERSION_RELEASE@@,mail:security@almalinux.org

SPECS/grub2.spec

@@ -16,7 +16,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	70%{?dist}.1
+Release:	70%{?dist}.1.alma.1
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -42,20 +42,7 @@ Source12:	sbat.csv.in
 %define sb_cer		%{_datadir}/pki/sb-certs/secureboot-grub2-%{_arch}.cer
 %endif
 
-%if 0%{?centos}
+%define sb_key		almalinuxsecurebootca0
-
-%ifarch x86_64 aarch64 ppc64le
-%define sb_key		centossecureboot202
-%endif
-%else
-%ifarch x86_64 aarch64
-%define sb_key		redhatsecureboot502
-%endif
-%ifarch ppc64le
-%define sb_key		redhatsecureboot702
-%endif
-
-%endif
 
 
 BuildRequires:	gcc efi-srpm-macros
@@ -97,6 +84,10 @@ variety of kernel formats, file systems, computer architectures and \
 hardware devices.\
 %{nil}
 
+# AlmaLinux: keep upstream EVR for RHEL SBAT entry
+%define rhel_version_release $(echo %{version}-%{release} | sed 's/\.alma.*//')
+
+
 # generate with do-rebase
 %include %{SOURCE11}
 
@@ -189,7 +180,7 @@ This subpackage provides the GRUB user-space emulation modules.
 mkdir grub-%{grubefiarch}-%{tarversion}
 grep -A100000 '# stuff "make" creates' .gitignore > grub-%{grubefiarch}-%{tarversion}/.gitignore
 cp %{SOURCE4} grub-%{grubefiarch}-%{tarversion}/unifont.pcf.gz
-sed -e "s,@@VERSION@@,%{version},g" -e "s,@@VERSION_RELEASE@@,%{version}-%{release},g" \
+sed -e "s,@@VERSION@@,%{version},g" -e "s,@@VERSION_RELEASE@@,%{version}-%{release},g" -e "s,@@RHEL_VERSION_RELEASE@@,%{rhel_version_release},g" \
     %{SOURCE12} > grub-%{grubefiarch}-%{tarversion}/sbat.csv
 git add grub-%{grubefiarch}-%{tarversion}
 %endif
@@ -533,6 +524,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Mon Oct 09 2023 Eduard Abdullin <eabdullin@almalinux.org> - 2.06-70.alma.1
+- Debrand for AlmaLinux
+
 * Tue Aug 29 2023 Nicolas Frayer <nfrayer@redhat.com> - 2.06-70
 - grub2-mkconfig: Pass all boot params when used by anaconda
 - Resolves: #RHEL-2185