Apply more hardening to host binaries

Signed-off-by: Robbie Harwood <rharwood@redhat.com>

grub.macros

@@ -32,10 +32,10 @@
 		-e 's/^/ -fno-strict-aliasing /'		\\\
 		%{nil}
 
-%global host_cflags %{expand:%%(echo %{build_cflags} %{?_hardening_cflags} | %{cflags_sed})}
+%global host_cflags %{expand:%%(echo %{build_cflags} %{?_hardening_cflags} | %{cflags_sed})} -fstack-protector-strong -fcf-protection
 %global legacy_host_cflags					\\\
 	%{expand:%%(echo %{host_cflags} |			\\\
-	%{cflags_sed}						\\\
+	sed							\\\
 		-e 's/-m64//g'					\\\
 		-e 's/-mcpu=power[[:alnum:]]\\+/-mcpu=power6/g'	\\\
 	)}

grub2.spec

@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	73%{?dist}
+Release:	74%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -544,6 +544,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Wed Jan 11 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-74
+- Apply more hardening to host binaries
+
 * Tue Jan 10 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-73
 - Allow internal grub allocations over 4GB