From 814bf9efb9ffe29d5d9228f1b1037e218bfa955b Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Tue, 10 May 2022 15:39:20 +0000 Subject: [PATCH] Keep Red Hat entry in SBAT --- SOURCES/sbat.csv.in | 3 ++- SPECS/grub2.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/SOURCES/sbat.csv.in b/SOURCES/sbat.csv.in index 7ed44d7..f2094a3 100755 --- a/SOURCES/sbat.csv.in +++ b/SOURCES/sbat.csv.in @@ -1,3 +1,4 @@ sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md grub,1,Free Software Foundation,grub,2.02,https://www.gnu.org/software/grub/ -grub.almalinux8,1,AlmaLinux 8,grub2,@@VERSION@@,mail:security@almalinux.org \ No newline at end of file +grub.rhel8,1,Red Hat Enterprise Linux 8,grub2,@@RHEL_VERSION@@,mail:secalert@redhat.com +grub.almalinux8,1,AlmaLinux 8,grub2,@@VERSION@@,mail:security@almalinux.org diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index e4f4ae4..f204f09 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -48,6 +48,9 @@ Source19: sbat.csv.in %define sb_key clsecureboot001 %endif +# AlmaLinux: keep upstream EVR for RHEL SBAT entry +%define rhel_evr $(echo %{evr} | sed 's/\.alma.*//') + # generate with do-rebase %include %{SOURCE2} @@ -165,7 +168,7 @@ This subpackage provides tools for support of all platforms. 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@@,%{evr},g" %{SOURCE19} \ +sed -e "s,@@VERSION@@,%{evr},g" -e "s,@@RHEL_VERSION@@,%{rhel_evr},g" %{SOURCE19} \ > grub-%{grubefiarch}-%{tarversion}/sbat.csv git add grub-%{grubefiarch}-%{tarversion} %endif