X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fiptables;h=17817a9ef46984a77234584929cdca2b59e8ec98;hp=5a1764be0a302c716d536e5c8d06c6d8960ea987;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=30f08bcf80c4c016cdc1f025cc2fbd5533ef20b9 diff --git a/lfs/iptables b/lfs/iptables index 5a1764be0a..17817a9ef4 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # +# Copyright (C) 2007-2019 IPFire Team # # # # 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.8.2 THISAPP = iptables-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -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)_MD5 = 944558e88ddcc3b9b0d9550070fa3599 +netfilter-layer7-v2.23.tar.gz_MD5 = 10910b6173d18e426cb56ae7e1300eeb install : $(TARGET) @@ -83,60 +71,33 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17 - + @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 - 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/ - # 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) && ./configure \ + --prefix=/usr \ + --with-ksource=/usr/src/linux \ + --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) && 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 + @rm -rf $(DIR_APP) $(DIR_SRC)/netfilter-layer7* @$(POSTBUILD)