From efa9f0d944e7fa5fbc2f44c4598fc249868d4c0a Mon Sep 17 00:00:00 2001
From: rockyautomation <rockyautomation@rockylinux.org>
Date: Tue, 7 Nov 2023 19:28:31 +0000
Subject: [PATCH] import grub2-2.02-150.el8
---
SOURCES/sbat.csv.in | 6 +++---
SPECS/grub2.spec | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/SOURCES/sbat.csv.in b/SOURCES/sbat.csv.in
index 800d63b..d6d67f3 100755
--- a/SOURCES/sbat.csv.in
+++ b/SOURCES/sbat.csv.in
@@ -1,4 +1,4 @@
sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-grub,3,Free Software Foundation,grub,2.02,https://www.gnu.org/software/grub/
-grub.rhel8,2,Red Hat Enterprise Linux 8,grub2,@@VERSION_RELEASE@@,mail:secalert@redhat.com
-grub.rocky8,2,Rocky Linux 8,grub2,@@VERSION_RELEASE@@,mail:security@rockylinux.org
+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.rocky,2,Rocky Linux,grub2,@@VERSION_RELEASE@@,mail:security@rockylinux.org
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 8ebcac9..c7f7942 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -165,7 +165,7 @@ 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" \
- -e '/Red Hat Enterprise Linux/ s,\.rocky\.[0-9]\.[0-9],,g' %{SOURCE19} > grub-%{grubefiarch}-%{tarversion}/sbat.csv
+ -e '/,Red Hat,/ s,\.rocky\.[0-9]\.[0-9],,g' %{SOURCE19} > grub-%{grubefiarch}-%{tarversion}/sbat.csv
git add grub-%{grubefiarch}-%{tarversion}
%endif
%if 0%{with_alt_efi_arch}
@@ -508,7 +508,7 @@ fi
%endif
%changelog
-* Fri Nov 03 2023 Release Engineering <releng@rockylinux.org> - 2.02-150.rocky.0.1
+* Tue Nov 07 2023 Release Engineering <releng@rockylinux.org> - 2.02-150.rocky.0.1
- Removing redhat old cert sources entries (Sherif Nagy)
- Preserving rhel8 sbat entry based on shim-review feedback ticket no. 194
- Porting to 8.9
--
GitLab