Update libnfnetlink (1.0.0).

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

diff --git a/lfs/iptables b/lfs/iptables
index 61aa03a7bcf753cf9ebfd69f366a3fbcfc4d346a..c3dea280f44f81417b417ba9cb790c2825992d7b 100644 (file)
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.2
+VER        = 1.4.6
 
 THISAPP    = iptables-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -36,18 +36,18 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 objects =      $(DL_FILE) \
-                       netfilter-layer7-v2.21.tar.gz \
-                       libnfnetlink-0.0.41.tar.bz2 \
+                       netfilter-layer7-v2.22.tar.gz \
+                       libnfnetlink-1.0.0.tar.bz2 \
                        libnetfilter_queue-0.0.17.tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-netfilter-layer7-v2.21.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
-libnfnetlink-0.0.41.tar.bz2            = $(URL_IPFIRE)/libnfnetlink-0.0.41.tar.bz2
+netfilter-layer7-v2.22.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
+libnfnetlink-1.0.0.tar.bz2             = $(URL_IPFIRE)/libnfnetlink-1.0.0.tar.bz2
 libnetfilter_queue-0.0.17.tar.bz2      = $(URL_IPFIRE)/libnetfilter_queue-0.0.17.tar.bz2
 
-$(DL_FILE)_MD5 = a138d1c2e74321e0e4e228a9fb301c9a
-netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
-libnfnetlink-0.0.41.tar.bz2_MD5 = 5d844ea1f557bad0364d5b85cd10c796
+$(DL_FILE)_MD5 = c67cf30e281a924def6426be0973df56
+netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
+libnfnetlink-1.0.0.tar.bz2_MD5 = 016fdec8389242615024c529acc1adb8
 libnetfilter_queue-0.0.17.tar.bz2_MD5 = 2cde35e678ead3a8f9eb896bf807a159
 
 install : $(TARGET)
@@ -80,18 +80,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
 
        @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.21.tar.gz
-       cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.21/iptables-1.4.1.1-for-kernel-2.6.20forward/* \
+       -cd /usr/include && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-errorno_includes.patch
+       cp -rf /usr/src/linux/include/linux/netfilter /usr/include/linux
+
+       # Layer7
+       cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz
+       cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.22/iptables-1.4.3forward-for-kernel-2.6.20forward/* \
                         ./extensions/
 
        # ipp2p 0.8.2-pomng
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.1.1-ipp2p-0.8.2-pomng.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch
 
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.1-imq.diff
+       # imq
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-imq_test1.patch
        chmod +x $(DIR_APP)/extensions/.IMQ-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) && ./configure  --prefix=/usr --with-ksource=/usr/src/linux \
                                    --libdir=/lib --includedir=/usr/include --enable-libipq \
                                    --libexecdir=/lib --bindir=/sbin \
@@ -99,21 +102,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
-       cd $(DIR_APP) && cp -fva include/* /usr/include
-       -mkdir /usr/include/libiptc
-       cd $(DIR_APP) && cp -vf include/libiptc/{libiptc.h,ipt_kernel_headers.h} \
-               /usr/include/libiptc
-       cd $(DIR_APP) && cp -vf libiptc/{*.o,*.a} \
-               /lib
-
-       cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.41.tar.bz2
-       cd $(DIR_SRC)/libnfnetlink-0.0.41 && ./configure --prefix=/usr
-       cd $(DIR_SRC)/libnfnetlink-0.0.41 && make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_SRC)/libnfnetlink-0.0.41 && make install
+       cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-1.0.0.tar.bz2
+       cd $(DIR_SRC)/libnfnetlink-1.0.0 && ./configure --prefix=/usr
+       cd $(DIR_SRC)/libnfnetlink-1.0.0 && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_SRC)/libnfnetlink-1.0.0 && make install
 
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.17.tar.bz2
        cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && ./configure --prefix=/usr
        cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make install
+
        @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
        @$(POSTBUILD)