X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fiptables;h=8e92c400e375a4d16cd859d74b957aa1d31c7fb5;hp=13b162c85a3b56b6b2f7669e3e8684730e99d85b;hb=7b9e5f10cc3982177abffece56f14a7149d82e60;hpb=c8ead4a543859582497e107173c650cec4203d4f

diff --git a/lfs/iptables b/lfs/iptables
index 13b162c85a..8e92c400e3 100644
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: iptables,v 1.5.2.4 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -43,7 +37,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-
 objects = 	$(DL_FILE) \
 			iptables-1.3.0-imq1.diff \
 			netfilter-layer7-v2.1.tar.gz
@@ -53,8 +46,8 @@ iptables-1.3.0-imq1.diff 		= http://www.linuximq.net/patchs/iptables-1.3.0-imq1.
 netfilter-layer7-v2.1.tar.gz 	= http://mesh.dl.sourceforge.net/sourceforge/l7-filter/netfilter-layer7-v2.1.tar.gz
 
 $(DL_FILE)_MD5 = 00fb916fa8040ca992a5ace56d905ea5
-iptables-1.3.0-imq1.diff_MD5 		= 9adae8be9562775a176fc1b275b3cb29
-netfilter-layer7-v2.1.tar.gz_MD5 	= 551626a158c2a2cbfd937d27ecc7fac1
+iptables-1.3.0-imq1.diff_MD5 = 9adae8be9562775a176fc1b275b3cb29
+netfilter-layer7-v2.1.tar.gz_MD5 = 551626a158c2a2cbfd937d27ecc7fac1
 
 install : $(TARGET)
 
@@ -86,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# iptables-fixed.tar.gz is made in the linux kernel build process
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/iptables-fixed.tar.gz
 	@rm -rf $(DIR_DL)/netfilter-layer7-v2.1 && cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.1.tar.gz
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.1/iptables-layer7-2.1.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.6/iptables-layer7-2.6.patch
 
 #	# Appears that libipt_set/SET maybe a little broken, fix it for now...
 #	cd $(DIR_APP)/extensions && sed -i -e 's/#include\ \"..\/ipset\/libipt_set.h\"//' libipt_set.c
@@ -98,7 +91,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present
 	cd $(DIR_APP) && sed -i -e 's/DO_IPV6:=1/DO_IPV6:=0/' Makefile
 
-	cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib
+	cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib $(MAKETUNING)
 	cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)