nginx: remove tcp_proxy_module patch.

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

diff --git a/lfs/grub b/lfs/grub
index 01da488cc21123e566f16a80c6b7885ea50d5bf6..2b0544bd7c053cac6a754d2d2168b62f5410e5bc 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -29,10 +27,11 @@ include Config
 VER        = 0.97
 
 THISAPP    = grub-$(VER)
-DL_FILE    = $(THISAPP)-reiser4-20050808.tar.gz
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 CFLAGS     =
 CXXFLAGS   =
 
@@ -44,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c5a860a4cd81cffc95a3b9ca5624aa7b
+$(DL_FILE)_MD5 = cd3f3eb54446be6003156158d51f4884
 
 install : $(TARGET)
 
@@ -75,16 +74,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-       # This fails, but doesn't matter
-       -cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-disk_geometry-1.patch
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/grub-gfxmenu-v8.diff
-
-       cd $(DIR_APP) && perl -pi -e 's,/usr/lib/grub/i386-pc,/usr/share/grub/i386-pc,' docs/grub.texi
-       cd $(DIR_APP) && sed -i 's/AM_INIT_AUTOMAKE/&\nAM_PROG_AS/' configure.ac
-
-       cd $(DIR_APP) && aclocal && autoheader && autoconf && automake --add-missing
-       cd $(DIR_APP) && CFLAGS="-Os -s -fno-strict-aliasing" ./configure --prefix=/usr
+       # Applying patches.
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-gentoo-14.patch
+       cd $(DIR_APP) && autoreconf
+       cd $(DIR_APP) && autoconf
 
+       # Build.
+       cd $(DIR_APP) && CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
+               --disable-auto-linux-mem-opt
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
@@ -95,8 +92,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
            [ -f $$i ] && cp -f $$i /boot/grub; \
        done
 
-       install -m 0755 $(DIR_SRC)/src/install+setup/install/grubbatch /boot/grub
-       /usr/sbin/grub-set-default 1
+       # generate default file
+       grub-set-default 0
+
+       # Disable PaX mprotect for grub
+       paxctl -m /usr/sbin/grub
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)