Updated iptables to 1.4.0.

Also added the imq-patch to this package.

diff --git a/lfs/iptables b/lfs/iptables
index ed2fae09d8de93bbd20b61f4b0a7a1d7749bb507..49bf416086b732bd264d246e636130e9fe4b85c1 100644 (file)
--- 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