From b5462c150837a5fd16fde5d7720a618fdf911049 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Apr 05 2022 15:10:14 +0000
Subject: CentOS debranding and secureboot


---

diff --git a/SOURCES/centos-ca-secureboot.der b/SOURCES/centos-ca-secureboot.der
new file mode 100644
index 0000000..44a2563
Binary files /dev/null and b/SOURCES/centos-ca-secureboot.der differ
diff --git a/SOURCES/centossecureboot001.der b/SOURCES/centossecureboot001.der
new file mode 100644
index 0000000..e8216b1
Binary files /dev/null and b/SOURCES/centossecureboot001.der differ
diff --git a/SOURCES/centossecureboot202.der b/SOURCES/centossecureboot202.der
new file mode 100644
index 0000000..ab8213c
Binary files /dev/null and b/SOURCES/centossecureboot202.der differ
diff --git a/SOURCES/centossecurebootca2.der b/SOURCES/centossecurebootca2.der
new file mode 100644
index 0000000..42bdfcf
Binary files /dev/null and b/SOURCES/centossecurebootca2.der differ
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index a57ac93..c645dcf 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -24,12 +24,10 @@ Source6:	gitignore
 Source8:	strtoull_test.c
 Source9:	20-grub.install
 Source12:	99-grub-mkconfig.install
-Source13:	redhatsecurebootca3.cer
-Source14:	redhatsecureboot301.cer
-Source15:	redhatsecurebootca5.cer
-Source16:	redhatsecureboot502.cer
-Source17:	redhatsecureboot303.cer
-Source18:	redhatsecureboot601.cer
+Source13:	centos-ca-secureboot.der
+Source14:	centossecureboot001.der
+Source15:	centossecurebootca2.der
+Source16:	centossecureboot202.der
 Source19:	sbat.csv.in
 
 %include %{SOURCE1}
@@ -37,7 +35,7 @@ Source19:	sbat.csv.in
 %if 0%{with_efi_arch}
 %define old_sb_ca	%{SOURCE13}
 %define old_sb_cer	%{SOURCE14}
-%define old_sb_key	redhatsecureboot301
+%define old_sb_key	centossecureboot001
 %define sb_ca		%{SOURCE15}
 %define sb_cer		%{SOURCE16}
 %define sb_key		redhatsecureboot502
@@ -46,7 +44,7 @@ Source19:	sbat.csv.in
 %ifarch ppc64le
 %define old_sb_cer	%{SOURCE17}
 %define sb_cer		%{SOURCE18}
-%define sb_key		redhatsecureboot602
+%define sb_key		centossecureboot202
 %endif
 
 # generate with do-rebase
@@ -72,7 +70,7 @@ BuildRequires:	pesign >= 0.99-8
 BuildRequires:	ccache
 %endif
 
-ExcludeArch:	s390 s390x %{arm}
+ExcludeArch:	s390 s390x
 Obsoletes:	%{name} <= %{evr}
 
 %if 0%{with_legacy_arch}
@@ -81,6 +79,10 @@ Requires:	%{name}-%{legacy_package_arch} = %{evr}
 Requires:	%{name}-%{package_arch} = %{evr}
 %endif
 
+%if 0%{?centos}
+%global efidir centos
+%endif
+
 %global desc \
 The GRand Unified Bootloader (GRUB) is a highly configurable and \
 customizable bootloader with modular architecture.  It supports a rich \