X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fiptables;h=99afe2bfc8754dc3836fc4e8484bf73ea59ad754;hp=59493402e304b3630d4c03c56d945c92c5e0edc3;hb=0b09e72214df3d4d62c1a061f1e8866020877017;hpb=c545beb14f4621738884dcdd3c2e75a205a567cb diff --git a/lfs/iptables b/lfs/iptables index 59493402e3..99afe2bfc8 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 Michael Tremer & Christian Schmidt # +# # +# 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,11 +24,11 @@ include Config -VER = 1.3.5 +VER = 1.4.2 THISAPP = iptables-$(VER) DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = http://ftp.netfilter.org/pub/iptables +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -38,22 +36,19 @@ TARGET = $(DIR_INFO)/$(THISAPP) # Top-level Rules ############################################################################### objects = $(DL_FILE) \ - iptables-1.3.0-imq1.diff \ - netfilter-layer7-v2.6.tar.gz \ - libnfnetlink-0.0.25.tar.bz2 \ - libnetfilter_queue-0.0.13.tar.bz2 + netfilter-layer7-v2.21.tar.gz \ + libnfnetlink-0.0.41.tar.bz2 \ + libnetfilter_queue-0.0.17.tar.bz2 $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -iptables-1.3.0-imq1.diff = $(URL_IPFIRE)/iptables-1.3.0-imq1.diff -netfilter-layer7-v2.6.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.6.tar.gz -libnfnetlink-0.0.25.tar.bz2 = $(URL_IPFIRE)/libnfnetlink-0.0.25.tar.bz2 -libnetfilter_queue-0.0.13.tar.bz2 = $(URL_IPFIRE)/libnetfilter_queue-0.0.13.tar.bz2 +netfilter-layer7-v2.21.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz +libnfnetlink-0.0.41.tar.bz2 = $(URL_IPFIRE)/libnfnetlink-0.0.41.tar.bz2 +libnetfilter_queue-0.0.17.tar.bz2 = $(URL_IPFIRE)/libnetfilter_queue-0.0.17.tar.bz2 -$(DL_FILE)_MD5 = 00fb916fa8040ca992a5ace56d905ea5 -iptables-1.3.0-imq1.diff_MD5 = 9adae8be9562775a176fc1b275b3cb29 -netfilter-layer7-v2.6.tar.gz_MD5 = 58135cd1aafaf4ae2fa478159206f064 -libnfnetlink-0.0.25.tar.bz2_MD5 = fc915a2e66d282e524af6ef939042d7d -libnetfilter_queue-0.0.13.tar.bz2_MD5 = 660cbfd3dc8c10bf9b1803cd2b688256 +$(DL_FILE)_MD5 = a138d1c2e74321e0e4e228a9fb301c9a +netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5 +libnfnetlink-0.0.41.tar.bz2_MD5 = 5d844ea1f557bad0364d5b85cd10c796 +libnetfilter_queue-0.0.17.tar.bz2_MD5 = 2cde35e678ead3a8f9eb896bf807a159 install : $(TARGET) @@ -82,30 +77,43 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - # iptables-fixed.tar.gz is made in the linux kernel build process - @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.25 $(DIR_SRC)/netfilter-layer7-v2.6 $(DIR_SRC)/libnetfilter_queue-0.0.13 - - @cd $(DIR_SRC) && tar zxf $(DIR_DL)/iptables-fixed.tar.gz - @cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.6.tar.gz - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.6/iptables-layer7-2.6.patch + @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17 - cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/iptables-1.3.0-imq1.diff - chmod +x $(DIR_APP)/extensions/.IMQ-test* $(DIR_APP)/extensions/.layer7-test* + @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.21.tar.gz + cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.21/iptables-1.4.1.1-for-kernel-2.6.20forward/* \ + ./extensions/ - # 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_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.25.tar.bz2 - cd $(DIR_SRC)/libnfnetlink-0.0.25 && ./configure --prefix=/usr - cd $(DIR_SRC)/libnfnetlink-0.0.25 && make - cd $(DIR_SRC)/libnfnetlink-0.0.25 && make install + # ipp2p 0.8.2-pomng + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.1.1-ipp2p-0.8.2-pomng.patch - 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 + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.2-imq.patch + chmod +x $(DIR_APP)/extensions/.IMQ-test* - @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.25 $(DIR_SRC)/netfilter-layer7-v2.6 $(DIR_SRC)/libnetfilter_queue-0.0.13 + # 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) && ./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 + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + 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_APP) && cp -vf libiptc/{*.o,*.a} \ + /lib + + cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.41.tar.bz2 + cd $(DIR_SRC)/libnfnetlink-0.0.41 && ./configure --prefix=/usr + cd $(DIR_SRC)/libnfnetlink-0.0.41 && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_SRC)/libnfnetlink-0.0.41 && make install + + cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.17.tar.bz2 + cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && ./configure --prefix=/usr + cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make install + @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17 @$(POSTBUILD)