kernel: enable PCA953X GPIO extender for ClearFog boards

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

diff --git a/lfs/iptables b/lfs/iptables
index 07398cc6ae90cec955f8dfce73b9d4dfa499ed58..b4a2834b827d43f03fe5e1279cb7b2f292dfecdd 100644 (file)
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  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.21
+VER        = 1.6.2
 
 THISAPP    = iptables-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -35,17 +35,14 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects =      $(DL_FILE) \
-                       netfilter-layer7-v2.22.tar.gz \
-                       libnetfilter_cttimeout-1.0.0.tar.bz2
+objects = $(DL_FILE) \
+       netfilter-layer7-v2.22.tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-netfilter-layer7-v2.22.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
-libnetfilter_cttimeout-1.0.0.tar.bz2   = $(URL_IPFIRE)/libnetfilter_cttimeout-1.0.0.tar.bz2
+netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
 
-$(DL_FILE)_MD5 = 536d048c8e8eeebcd9757d0863ebb0c0
+$(DL_FILE)_MD5 = 7d2b7847e4aa8832a18437b8a4c1873d
 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
-libnetfilter_cttimeout-1.0.0.tar.bz2_MD5 = 7697437fc9ebb6f6b83df56a633db7f9
 
 install : $(TARGET)
 
@@ -74,10 +71,8 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7*
-
+       @rm -rf $(DIR_APP) $(DIR_SRC)/netfilter-layer7*
        @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-#      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
@@ -87,29 +82,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # 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) && ./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 \
+               --disable-nftables \
+               --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)/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-* $(DIR_SRC)/netfilter-layer7*
+       @rm -rf $(DIR_APP) $(DIR_SRC)/netfilter-layer7*
        @$(POSTBUILD)