X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgrub;h=8b82189fce16a7015a7e13355a3ee2555f03a2da;hb=bca3f3bdbfd9e3e2909c90b90843284177da2435;hp=ba744087cf6b2ebb96b335f5aab5ca2b08a93f85;hpb=665f79926d025fec413531c397ccd6998583237e;p=ipfire-2.x.git

diff --git a/lfs/grub b/lfs/grub
index ba744087cf..8b82189fce 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -79,6 +79,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.00_disable_vga_fallback.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub2-remove-gets.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.00_ignore_missing_symtab.patch
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
@@ -100,8 +102,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	install -m 644 $(DIR_SRC)/config/grub2/default /etc/default/grub
 
 	# Disable hardening.
-	paxctl -mpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe
-	paxctl -mpexs /usr/bin/grub-script-check
+	paxctl -Cmpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe
+	paxctl -Cmpexs /usr/bin/grub-script-check
 
 	# We don't need to install unifont just to generate a grub2 compatible
 	# font archive for the graphical boot menu. The following command only