rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

spec: Added more code for the previous CVE fix

Browse Source 
Related: #RHEL-56733
Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
This commit is contained in:
Nicolas Frayer 2024-05-28 15:17:32 +02:00
parent 008b689173
commit 1022bec884
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
grub2.spec
View File

@ -17,7 +17,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 130%{?dist} Release: 131%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPL-3.0-or-later License: GPL-3.0-or-later
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -376,6 +376,8 @@ fi
if test ! -f ${GRUB_HOME}/grub.cfg; then if test ! -f ${GRUB_HOME}/grub.cfg; then
# there's no config in GRUB_HOME, create one # there's no config in GRUB_HOME, create one
grub2-mkconfig -o ${GRUB_HOME}/grub.cfg grub2-mkconfig -o ${GRUB_HOME}/grub.cfg
cp -a ${EFI_HOME}/grub.cfg ${EFI_HOME}/grub.cfg.rpmsave
cp -a ${EFI_HOME}/grub.cfg ${GRUB_HOME}/
else else
# otherwise just check mode is correct, if not, fix it # otherwise just check mode is correct, if not, fix it
GRUB_CFG_MODE=$(stat --format="%a" ${GRUB_HOME}/grub.cfg) GRUB_CFG_MODE=$(stat --format="%a" ${GRUB_HOME}/grub.cfg)
@ -386,7 +388,7 @@ fi
# make sure ${EFI_HOME}/grub.cfg is present before grepping it # make sure ${EFI_HOME}/grub.cfg is present before grepping it
if test -f ${EFI_HOME}/grub.cfg; then if test -f ${EFI_HOME}/grub.cfg; then
if ((grep -q "configfile" ${EFI_HOME}/grub.cfg || grep -q "source" ${EFI_HOME}/grub.cfg) && ! grep -q "# It is automatically generated by grub2-mkconfig using templates" ${EFI_HOME}/grub.cfg); then if grep -q "configfile" ${EFI_HOME}/grub.cfg && grep -q "root-dev-only" ${EFI_HOME}/grub.cfg; then
exit 0 #Already unified exit 0 #Already unified
fi fi
fi fi
@ -407,8 +409,6 @@ if test -f ${EFI_HOME}/grubenv; then
mv --force ${EFI_HOME}/grubenv ${GRUB_HOME}/grubenv mv --force ${EFI_HOME}/grubenv ${GRUB_HOME}/grubenv
fi fi
cp -a ${EFI_HOME}/grub.cfg ${EFI_HOME}/grub.cfg.rpmsave
cp -a ${EFI_HOME}/grub.cfg ${GRUB_HOME}/
mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%files common -f grub.lang %files common -f grub.lang
@ -582,6 +582,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Mon Sep 23 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-131
- Added more code for the previous CVE fix (CVE-2023-4001)
- Related: #RHEL-56733
* Wed Sep 18 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-130 * Wed Sep 18 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-130
- aarch64/macros: Re-added flags that disappeared with previous commit - aarch64/macros: Re-added flags that disappeared with previous commit
- Related: #RHEL-58821 - Related: #RHEL-58821