From: Michael Tremer Date: Tue, 23 Jun 2015 11:46:46 +0000 (+0200) Subject: libnetfilter_conntrack: Update to version 1.0.4 X-Git-Tag: v2.17-core92~10^2~14 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=b5722656633c1bd4386b827a608c6966bde37be6 libnetfilter_conntrack: Update to version 1.0.4 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables index f86c451895..b840a4b042 100644 --- a/config/rootfiles/common/iptables +++ b/config/rootfiles/common/iptables @@ -145,16 +145,6 @@ sbin/xtables-multi #usr/include/libiptc/libiptc.h #usr/include/libiptc/libxtc.h #usr/include/libiptc/xtcshared.h -#usr/include/libnetfilter_conntrack -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h -#usr/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h #usr/include/libnetfilter_cttimeout #usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h #usr/include/libnetfilter_queue @@ -162,10 +152,6 @@ sbin/xtables-multi #usr/include/libnetfilter_queue/linux_nfnetlink_queue.h #usr/include/xtables-version.h #usr/include/xtables.h -#usr/lib/libnetfilter_conntrack.la -usr/lib/libnetfilter_conntrack.so -usr/lib/libnetfilter_conntrack.so.3 -usr/lib/libnetfilter_conntrack.so.3.4.0 #usr/lib/libnetfilter_cttimeout.la usr/lib/libnetfilter_cttimeout.so usr/lib/libnetfilter_cttimeout.so.1 @@ -178,7 +164,6 @@ usr/lib/libnetfilter_queue.so.1.2.0 #usr/lib/pkgconfig/libip6tc.pc #usr/lib/pkgconfig/libipq.pc #usr/lib/pkgconfig/libiptc.pc -#usr/lib/pkgconfig/libnetfilter_conntrack.pc #usr/lib/pkgconfig/libnetfilter_cttimeout.pc #usr/lib/pkgconfig/libnetfilter_queue.pc #usr/lib/pkgconfig/xtables.pc diff --git a/config/rootfiles/common/libnetfilter_conntrack b/config/rootfiles/common/libnetfilter_conntrack new file mode 100644 index 0000000000..6095d0bf6a --- /dev/null +++ b/config/rootfiles/common/libnetfilter_conntrack @@ -0,0 +1,15 @@ +#usr/include/libnetfilter_conntrack +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h +#usr/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +#usr/lib/libnetfilter_conntrack.la +#usr/lib/libnetfilter_conntrack.so +usr/lib/libnetfilter_conntrack.so.3 +usr/lib/libnetfilter_conntrack.so.3.5.0 +#usr/lib/pkgconfig/libnetfilter_conntrack.pc diff --git a/config/rootfiles/core/92/filelists/libnetfilter_conntrack b/config/rootfiles/core/92/filelists/libnetfilter_conntrack new file mode 120000 index 0000000000..6ef5cc4392 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnetfilter_conntrack @@ -0,0 +1 @@ +../../../common/libnetfilter_conntrack \ No newline at end of file diff --git a/lfs/iptables b/lfs/iptables index c205601b3b..a17b05844a 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -38,19 +38,16 @@ TARGET = $(DIR_INFO)/$(THISAPP) objects = $(DL_FILE) \ netfilter-layer7-v2.22.tar.gz \ 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) netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz 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 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) @@ -117,11 +114,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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) diff --git a/lfs/libnetfilter_conntrack b/lfs/libnetfilter_conntrack new file mode 100644 index 0000000000..3a0dc1f8ac --- /dev/null +++ b/lfs/libnetfilter_conntrack @@ -0,0 +1,77 @@ +############################################################################### +# # +# 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 3 of the License, or # +# (at your option) any later version. # +# # +# 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 this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.4 + +THISAPP = libnetfilter_conntrack-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 18cf80c4b339a3285e78822dbd4f08d7 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 335de87c8f..c4444d9356 100755 --- a/make.sh +++ b/make.sh @@ -406,6 +406,7 @@ buildipfire() { ipfiremake grub ipfiremake libmnl ipfiremake libnfnetlink + ipfiremake libnetfilter_conntrack ipfiremake iptables case "${TARGET_ARCH}" in