X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fiptables;h=f3fb70868ea93630200e07a2b2ee6b6a8b6c57a4;hp=b32781c585a3615308edf9de6e95eabdb1f98b3d;hb=8777989d464a11f6f538ec22c2463d0c9c18c7ad;hpb=71430cf631ea86e59380a78d698edb44092a3734 diff --git a/lfs/iptables b/lfs/iptables index b32781c58..f3fb70868 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -1,22 +1,20 @@ ############################################################################### -# This file is part of the IPCop Firewall. # # # -# IPCop is free software; you can redistribute it and/or modify # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 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 # -# the Free Software Foundation; either version 2 of the License, or # +# the Free Software Foundation, either version 3 of the License, or # # (at your option) any later version. # # # -# IPCop is distributed in the hope that it will be useful, # +# This program is distributed in the hope that it will be useful, # # but WITHOUT ANY WARRANTY; without even the implied warranty of # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # GNU General Public License for more details. # # # # You should have received a copy of the GNU General Public License # -# along with IPCop; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Makefiles are based on LFSMake, which is # -# Copyright (C) 2002 Rod Roard # +# along with this program. If not, see . # # # ############################################################################### @@ -26,7 +24,7 @@ include Config -VER = 1.3.8 +VER = 1.4.20 THISAPP = iptables-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -34,25 +32,29 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -LAYER7 = netfilter-layer7-v2.13 - ############################################################################### # Top-level Rules ############################################################################### objects = $(DL_FILE) \ - $(LAYER7).tar.gz \ - libnfnetlink-0.0.30.tar.bz2 \ - libnetfilter_queue-0.0.13.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) -$(LAYER7).tar.gz = $(URL_IPFIRE)/$(LAYER7).tar.gz -libnfnetlink-0.0.30.tar.bz2 = $(URL_IPFIRE)/libnfnetlink-0.0.30.tar.bz2 -libnetfilter_queue-0.0.13.tar.bz2 = $(URL_IPFIRE)/libnetfilter_queue-0.0.13.tar.bz2 - -$(DL_FILE)_MD5 = 0a9209f928002e5eee9cdff8fef4d4b3 -$(LAYER7).tar.gz_MD5 = c8097875074405be31e4372682b68d7a -libnfnetlink-0.0.30.tar.bz2_MD5 = 7fd3c8ddc03d42fa9f0177a17a38f163 -libnetfilter_queue-0.0.13.tar.bz2_MD5 = 660cbfd3dc8c10bf9b1803cd2b688256 +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 = 387b92d3efcf4f07fe31c3bf0f1d18f5 +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) @@ -81,29 +83,60 @@ $(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) - cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(LAYER7).tar.gz - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/$(LAYER7)/iptables-for-kernel-2.6.20forward-layer7-2.13.patch + @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17 - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.3.6-imq.diff - chmod +x $(DIR_APP)/extensions/.IMQ-test* $(DIR_APP)/extensions/.layer7-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 LIBDIR=/lib $(MAKETUNING) - cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib install - cd $(DIR_APP) && cp -fva include/* /usr/include - - cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.30.tar.bz2 - cd $(DIR_SRC)/libnfnetlink-0.0.30 && ./configure --prefix=/usr - cd $(DIR_SRC)/libnfnetlink-0.0.30 && make - cd $(DIR_SRC)/libnfnetlink-0.0.30 && make install - - cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.13.tar.bz2 - cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && ./configure --prefix=/usr - cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && make - cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && make install - - @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 + + # 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)