From: Michael Tremer Date: Thu, 27 Apr 2017 09:58:35 +0000 (+0100) Subject: grub: Fix compile error in gnulib with newer GCCs X-Git-Tag: v2.19-core112~108 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a18c2318d8a4fd525a0a3230d7e169465a93931a;p=ipfire-2.x.git grub: Fix compile error in gnulib with newer GCCs Signed-off-by: Michael Tremer --- diff --git a/lfs/grub b/lfs/grub index ba744087cf..5e2238eb78 100644 --- 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 \ diff --git a/src/patches/grub2-remove-gets.patch b/src/patches/grub2-remove-gets.patch new file mode 100644 index 0000000000..0da71b3292 --- /dev/null +++ b/src/patches/grub2-remove-gets.patch @@ -0,0 +1,21 @@ +ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it + +Signed-off-by: Khem Raj +Signed-off-by: Thomas Petazzoni + +Upstream-Status: Pending +Index: grub-1.99/grub-core/gnulib/stdio.in.h +=================================================================== +--- grub-1.99.orig/grub-core/gnulib/stdio.in.h 2010-12-01 06:45:43.000000000 -0800 ++++ grub-1.99/grub-core/gnulib/stdio.in.h 2012-07-04 12:25:02.057099107 -0700 +@@ -140,8 +140,10 @@ + /* It is very rare that the developer ever has full control of stdin, + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ ++#if defined gets + #undef gets + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@