From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 15 May 2008 17:33:11 +0000 (+0200)
Subject: Updated iptables to 1.4.0.
X-Git-Tag: v3.0-alpha1~1018
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fefefa7f8b70a66bd183f8ac39b234e214e45db3;p=ipfire-3.x.git

Updated iptables to 1.4.0.

Also added the imq-patch to this package.
---

diff --git a/lfs/iptables b/lfs/iptables
index ed2fae09d..49bf41608 100644
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = iptables
-VER        = 1.3.8
+VER        = 1.4.0
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -37,7 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(THISAPP)-imq-1.patch
 
 install: $(TARGET)
 
@@ -54,14 +54,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	
-	#cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/iptables-1.3.0-imq1.diff
+	cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-imq-1.patch
 
 	cd $(DIR_APP) && sed -i -e 's/DO_IPV6:=1/DO_IPV6:=0/' Makefile
 	cd $(DIR_APP) && sed -i -e 's/# DEVEL_LIBS+=libiptc\/libiptc.a/DEVEL_LIBS+=libiptc\/libiptc.a/' \
 		libiptc/Makefile
 	
 	cd $(DIR_APP) && sed -i 's/name="$$node/name="node/' iptables.xslt
-	cd $(DIR_APP) && make LIBDIR=/lib KERNEL_DIR=/usr -j $(PARALLELISM)
+	cd $(DIR_APP) && make COPT_FLAGS="$(CFLAGS)" LIBDIR=/lib KERNEL_DIR=$(DIR_SRC)/linux-$(KVER) \
+		KBUILD_OUTPUT=$(DIR_SRC)/linux-$(KVER) -j $(PARALLELISM)
 	cd $(DIR_APP) && make PREFIX=/usr LIBDIR=/lib BINDIR=/sbin \
 		MANDIR=/usr/share/man install install-devel
 	-mkdir /usr/include/libiptc