From 87f9ce079c1886edddb4bdf19238fe1c77461df7 Mon Sep 17 00:00:00 2001 From: compile_success <980965867@qq.com> Date: Sun, 21 Mar 2021 17:51:50 +0800 Subject: [PATCH] fix postun error (cherry picked from commit 9cd68dcfed630df4ed64f5afd017bb9c9995b14c) --- grub.macros | 6 +++--- grub2.spec | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/grub.macros b/grub.macros index f7c6eba..ac2efa3 100644 --- a/grub.macros +++ b/grub.macros @@ -293,10 +293,10 @@ if [ "xvfat" != "x$res" -a "xfat" != "x$res" ]; then \ fi \ \ %postun %{1} \ -if [ "x0" == "x$1" ];then \ +if [ "x0" == "x$1" ]; then \ res=$(grub2-probe /boot) \ - if[ "xvfat" != "x$res" -a "xfat" != "x$res" ];then \ - rm -f /boot/grub2/grubenv \ + if [ "xvfat" != "x$res" -a "xfat" != "x$res" ]; then \ + rm -f /boot/grub2/grubenv \ fi \ fi \ \ diff --git a/grub2.spec b/grub2.spec index 0847fa6..9106243 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.04 -Release: 12 +Release: 13 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -448,7 +448,16 @@ rm -r /boot/grub2.tmp/ || : %{_datadir}/man/man* %changelog -* Wed Mar 17 2021 zhangqiumiao - 2.04-12 +* Sun Mar 21 2021 orange-snn - 2.04-13 +- fix postun error in grub2-efi-x64 + +* Thu Mar 18 2021 yanglu - 2.04-12 +- Type:cves +- ID:CVE-2020-27779 CVE-2020-14372 +- SUG:NA +- DESC:fix CVE-2020-27779 CVE-2020-14372 + +* Wed Mar 17 2021 zhangqiumiao - 2.04-11 - Type:bugfix - ID:NA - SUG:NA -- Gitee