]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - lfs/iptables
iptables: Update to 1.4.21.
[people/teissler/ipfire-2.x.git] / lfs / iptables
index 9c7066992d142fc84da0c1a189a2e7759a0e671d..5a1764be0a302c716d536e5c8d06c6d8960ea987 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.0
+VER        = 1.4.21
 
 THISAPP    = iptables-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -36,19 +36,25 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 objects =      $(DL_FILE) \
-                       netfilter-layer7-v2.18.tar.gz \
-                       libnfnetlink-0.0.39.tar.bz2 \
-                       libnetfilter_queue-0.0.16.tar.bz2
+                       netfilter-layer7-v2.22.tar.gz \
+                       libnfnetlink-1.0.0.tar.bz2 \
+                       libnetfilter_queue-1.0.1.tar.bz2 \
+                       libnetfilter_conntrack-1.0.2.tar.bz2 \
+                       libnetfilter_cttimeout-1.0.0.tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-netfilter-layer7-v2.18.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.18.tar.gz
-libnfnetlink-0.0.39.tar.bz2            = $(URL_IPFIRE)/libnfnetlink-0.0.39.tar.bz2
-libnetfilter_queue-0.0.16.tar.bz2      = $(URL_IPFIRE)/libnetfilter_queue-0.0.16.tar.bz2
-
-$(DL_FILE)_MD5 = 90cfa8a554a29b0b859a625e701af2a7
-netfilter-layer7-v2.18.tar.gz_MD5 = 8d2e2c00f5c20e8c0852998035aeffd2
-libnfnetlink-0.0.39.tar.bz2_MD5 = 348fed8c1edbe5b873ffc7b192140093
-libnetfilter_queue-0.0.16.tar.bz2_MD5 = b36664e6cd39edbfe46b416a86118add
+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-1.0.1.tar.bz2       = $(URL_IPFIRE)/libnetfilter_queue-1.0.1.tar.bz2
+libnetfilter_conntrack-1.0.2.tar.bz2   = $(URL_IPFIRE)/libnetfilter_conntrack-1.0.2.tar.bz2
+libnetfilter_cttimeout-1.0.0.tar.bz2   = $(URL_IPFIRE)/libnetfilter_cttimeout-1.0.0.tar.bz2
+
+$(DL_FILE)_MD5 = 536d048c8e8eeebcd9757d0863ebb0c0
+netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
+libnfnetlink-1.0.0.tar.bz2_MD5 = 016fdec8389242615024c529acc1adb8
+libnetfilter_queue-1.0.1.tar.bz2_MD5 = 08b968cb2d36c24deb7f26a69f5d8602
+libnetfilter_conntrack-1.0.2.tar.bz2_MD5 = 447114b5d61bb9a9617ead3217c3d3ff
+libnetfilter_cttimeout-1.0.0.tar.bz2_MD5 = 7697437fc9ebb6f6b83df56a633db7f9
 
 install : $(TARGET)
 
@@ -77,35 +83,60 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.39 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.16
+       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(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.18.tar.gz
-
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/iptables-1.4-for-kernel-2.6.20forward-layer7-2.18.patch
-       chmod +x $(DIR_APP)/extensions/.layer7-test*
-
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.3.0-imq1.diff
-       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) && make BINDIR=/sbin MANDIR=/usr/share/man KERNEL_DIR=/usr/src/linux LIBDIR=/lib $(MAKETUNING)
-       cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man KERNEL_DIR=/usr/src/linux LIBDIR=/lib install install-devel
-       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_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.39.tar.bz2
-       cd $(DIR_SRC)/libnfnetlink-0.0.39 && ./configure --prefix=/usr
-       cd $(DIR_SRC)/libnfnetlink-0.0.39 && make
-       cd $(DIR_SRC)/libnfnetlink-0.0.39 && make install
-
-       cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.16.tar.bz2
-       cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && ./configure --prefix=/usr
-       cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make
-       cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make install
-       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.39 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.16
+#      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.14-ipp2p-0.8.2-ipfire.patch
+
+       # imq
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.12-IMQ-test4.diff
+
+       cd $(DIR_APP) && ./configure  --prefix=/usr --with-ksource=/usr/src/linux \
+                                   --libdir=/lib --includedir=/usr/include --enable-libipq \
+                                   --libexecdir=/lib --bindir=/sbin \
+                                   --sbindir=/sbin --mandir=/usr/share/man \
+                                   --with-pkgconfigdir=/usr/lib/pkgconfig
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+
+       # Iptables doesn't install all headers
+#      mkdir -p /usr/include/net/netfilter
+#      cp -f $(DIR_APP)/include/net/netfilter/*.h /usr/include/net/netfilter/
+#      mkdir -p /usr/include/iptables
+#      cp -f $(DIR_APP)/include/iptables/*.h /usr/include/iptables/
+#      cp -f $(DIR_APP)/include/iptables.h /usr/include/
+#      mkdir -p /usr/include/libipulog
+#      cp -f $(DIR_APP)/include/libipulog/*.h /usr/include/libipulog/
+#      mkdir -p /usr/include/libiptc
+#      cp -f $(DIR_APP)/include/libiptc/*.h /usr/include/libiptc/
+
+       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-1.0.1.tar.bz2
+       cd $(DIR_SRC)/libnetfilter_queue-1.0.1 && ./configure --prefix=/usr
+       cd $(DIR_SRC)/libnetfilter_queue-1.0.1 && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_SRC)/libnetfilter_queue-1.0.1 && make install
+
+       cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_conntrack-1.0.2.tar.bz2
+       cd $(DIR_SRC)/libnetfilter_conntrack-1.0.2 && ./configure --prefix=/usr
+       cd $(DIR_SRC)/libnetfilter_conntrack-1.0.2 && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_SRC)/libnetfilter_conntrack-1.0.2 && make install
+
+       cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_cttimeout-1.0.0.tar.bz2
+       cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && ./configure --prefix=/usr
+       cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && make install
+
+       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
        @$(POSTBUILD)
-