clamav: Import patch to fix build issues with GCC 6

[ipfire-2.x.git] / lfs / grub

diff --git a/lfs/grub b/lfs/grub
index ba744087cf6b2ebb96b335f5aab5ca2b08a93f85..a054b8e50b73df89a574aecd0052d0bd47286772 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -79,6 +79,7 @@ $(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) && \
                ./configure \
                        --prefix=/usr \
@@ -99,10 +100,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -mkdir -pv /etc/default
        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
-
        # We don't need to install unifont just to generate a grub2 compatible
        # font archive for the graphical boot menu. The following command only
        # converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters.