Reiser4 Implementation abgeschlossen...

[ipfire-2.x.git] / lfs / iptables

diff --git a/lfs/iptables b/lfs/iptables
index 8e92c400e375a4d16cd859d74b957aa1d31c7fb5..59493402e304b3630d4c03c56d945c92c5e0edc3 100644 (file)
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -39,15 +39,21 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 objects =      $(DL_FILE) \
                        iptables-1.3.0-imq1.diff \
-                       netfilter-layer7-v2.1.tar.gz
+                       netfilter-layer7-v2.6.tar.gz \
+                       libnfnetlink-0.0.25.tar.bz2 \
+                       libnetfilter_queue-0.0.13.tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-iptables-1.3.0-imq1.diff               = http://www.linuximq.net/patchs/iptables-1.3.0-imq1.diff
-netfilter-layer7-v2.1.tar.gz   = http://mesh.dl.sourceforge.net/sourceforge/l7-filter/netfilter-layer7-v2.1.tar.gz
+iptables-1.3.0-imq1.diff               = $(URL_IPFIRE)/iptables-1.3.0-imq1.diff
+netfilter-layer7-v2.6.tar.gz   = $(URL_IPFIRE)/netfilter-layer7-v2.6.tar.gz
+libnfnetlink-0.0.25.tar.bz2            = $(URL_IPFIRE)/libnfnetlink-0.0.25.tar.bz2
+libnetfilter_queue-0.0.13.tar.bz2      = $(URL_IPFIRE)/libnetfilter_queue-0.0.13.tar.bz2
 
 $(DL_FILE)_MD5 = 00fb916fa8040ca992a5ace56d905ea5
 iptables-1.3.0-imq1.diff_MD5 = 9adae8be9562775a176fc1b275b3cb29
-netfilter-layer7-v2.1.tar.gz_MD5 = 551626a158c2a2cbfd937d27ecc7fac1
+netfilter-layer7-v2.6.tar.gz_MD5 = 58135cd1aafaf4ae2fa478159206f064
+libnfnetlink-0.0.25.tar.bz2_MD5 = fc915a2e66d282e524af6ef939042d7d
+libnetfilter_queue-0.0.13.tar.bz2_MD5 = 660cbfd3dc8c10bf9b1803cd2b688256
 
 install : $(TARGET)
 
@@ -77,21 +83,29 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        # 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.6/iptables-layer7-2.6.patch
+       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.25 $(DIR_SRC)/netfilter-layer7-v2.6 $(DIR_SRC)/libnetfilter_queue-0.0.13
 
-#      # 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
-#      cd $(DIR_APP)/extensions && sed -i -e 's/#include\ \"..\/ipset\/libipt_set.h\"//' libipt_SET.c
+       @cd $(DIR_SRC) && tar zxf $(DIR_DL)/iptables-fixed.tar.gz
+       @cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.6.tar.gz
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.6/iptables-layer7-2.6.patch
 
        cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/iptables-1.3.0-imq1.diff
        chmod +x $(DIR_APP)/extensions/.IMQ-test*  $(DIR_APP)/extensions/.layer7-test*
-       
+
        # 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 $(MAKETUNING)
        cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib install
-       @rm -rf $(DIR_APP)
+
+       cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.25.tar.bz2
+       cd $(DIR_SRC)/libnfnetlink-0.0.25 && ./configure --prefix=/usr
+       cd $(DIR_SRC)/libnfnetlink-0.0.25 && make
+       cd $(DIR_SRC)/libnfnetlink-0.0.25 && make install
+
+       cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.13.tar.bz2
+       cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && ./configure --prefix=/usr
+       cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && make
+       cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && make install
+
+       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.25 $(DIR_SRC)/netfilter-layer7-v2.6 $(DIR_SRC)/libnetfilter_queue-0.0.13
        @$(POSTBUILD)