]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - lfs/iptables
projects / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
suricata: Change midstream policy to "pass-flow"
[ipfire-2.x.git] / lfs / iptables
diff --git a/lfs/iptables b/lfs/iptables
index ec65ae04a0543dd02dee35028f860202747b1e9b..572d9f212288f39711eb51e21076acb9bbd9b2cc 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-2023  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,10 +24,10 @@
 
 include Config
 
-VER        = 1.4.21
+VER        = 1.8.10
 
 THISAPP    = iptables-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -35,26 +35,14 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects =      $(DL_FILE) \
-                       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
+objects = $(DL_FILE) \
+       netfilter-layer7-v2.23.tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-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
+netfilter-layer7-v2.23.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.23.tar.gz
+
+$(DL_FILE)_BLAKE2 = 417b33fcfc7edeba169caef26ed0322798f6b82500840509f6c10b97b4ef3f11932c0393fc8dcc5946264442bf8ee959a594b6fbd5dc92012cfad30edf130520
+netfilter-layer7-v2.23.tar.gz_BLAKE2 = 5c8ab722f6fbc126f2f65ecf401de5fc40560c20e3be52f783db34410446185dcb6781b3148e4a174e8b2d2c290bec0342dea95e8cefc35c39345617fa7a8fdc
 
 install : $(TARGET)
 
@@ -62,10 +50,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -74,8 +62,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -83,57 +71,29 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-*
-
-       @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-#      cp -rf /usr/src/linux/include/linux/netfilter /usr/include/linux
+       @rm -rf $(DIR_APP) $(DIR_SRC)/netfilter-layer7*
+       @cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
        # 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/* \
+       cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.23.tar.gz
+       cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.23/iptables-1.4.3forward-for-kernel-2.6.20forward/* \
                         ./extensions/
 
-       # imq
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.12-IMQ-test4.diff
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --libdir=/lib \
+               --includedir=/usr/include \
+               --enable-libipq \
+               --with-xtlibdir=/lib/xtables \
+               --libexecdir=/lib \
+               --bindir=/sbin \
+               --sbindir=/sbin \
+               --mandir=/usr/share/man \
+               --disable-nftables \
+               --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 \
-                                   --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-* $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-*
+       @rm -rf $(DIR_APP) $(DIR_SRC)/netfilter-layer7*
        @$(POSTBUILD)
IPFire 2.x development tree