diff --git a/grub.macros b/grub.macros index cc2d335..4f5a855 100644 --- a/grub.macros +++ b/grub.macros @@ -9,11 +9,13 @@ %global _configure ../configure %if %{?_with_ccache: 1}%{?!_with_ccache: 0} -%global cc_equals CC=/usr/%{_lib}/ccache/gcc +%global ccpath /usr/%{_lib}/ccache/gcc %else -%global cc_equals %{nil} +%global ccpath %{__cc} %endif +%global cc_equals "CC=%{ccpath} -fPIE" + %global cflags_sed \\\ sed \\\ -e 's/-O. //g' \\\ diff --git a/grub2.spec b/grub2.spec index 90d2dd5..a2247b3 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 15 +Release: 16 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -437,6 +437,12 @@ fi %{_datadir}/man/man* %changelog +* Mon Dec 12 2022 zhangqiumiao - 1:2.06-16 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:enable -fPIE compilation options + * Fri Nov 18 2022 zhangqiumiao - 1:2.06-15 - Type:bugfix - CVE:CVE-2022-2601 CVE-2022-3775