From ead1c73f2ae606d24b6f812168083cd17d660672 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 23 Jun 2015 13:56:46 +0200 Subject: [PATCH] libnetfilter_cttimeout: Move out of iptables package Signed-off-by: Michael Tremer --- .../rootfiles/common/libnetfilter_cttimeout | 7 ++ lfs/iptables | 12 +-- lfs/libnetfilter_cttimeout | 77 +++++++++++++++++++ make.sh | 1 + 4 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 config/rootfiles/common/libnetfilter_cttimeout create mode 100644 lfs/libnetfilter_cttimeout diff --git a/config/rootfiles/common/libnetfilter_cttimeout b/config/rootfiles/common/libnetfilter_cttimeout new file mode 100644 index 0000000000..f1647d125e --- /dev/null +++ b/config/rootfiles/common/libnetfilter_cttimeout @@ -0,0 +1,7 @@ +#usr/include/libnetfilter_cttimeout +#usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h +#usr/lib/libnetfilter_cttimeout.la +#usr/lib/libnetfilter_cttimeout.so +usr/lib/libnetfilter_cttimeout.so.1 +usr/lib/libnetfilter_cttimeout.so.1.0.0 +#usr/lib/pkgconfig/libnetfilter_cttimeout.pc diff --git a/lfs/iptables b/lfs/iptables index 07398cc6ae..99d5d24019 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -37,15 +37,12 @@ TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### objects = $(DL_FILE) \ netfilter-layer7-v2.22.tar.gz \ - 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_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_cttimeout-1.0.0.tar.bz2_MD5 = 7697437fc9ebb6f6b83df56a633db7f9 install : $(TARGET) @@ -74,7 +71,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* + @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 @@ -106,10 +103,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # mkdir -p /usr/include/libiptc # cp -f $(DIR_APP)/include/libiptc/*.h /usr/include/libiptc/ - 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* + @rm -rf $(DIR_APP) $(DIR_SRC)/netfilter-layer7* @$(POSTBUILD) diff --git a/lfs/libnetfilter_cttimeout b/lfs/libnetfilter_cttimeout new file mode 100644 index 0000000000..a2184b29ba --- /dev/null +++ b/lfs/libnetfilter_cttimeout @@ -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.0 + +THISAPP = libnetfilter_cttimeout-$(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 = 7697437fc9ebb6f6b83df56a633db7f9 + +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 bafbe99c23..e06abfdc52 100755 --- a/make.sh +++ b/make.sh @@ -408,6 +408,7 @@ buildipfire() { ipfiremake libnfnetlink ipfiremake libnetfilter_queue ipfiremake libnetfilter_conntrack + ipfiremake libnetfilter_cttimeout ipfiremake iptables case "${TARGET_ARCH}" in -- 2.39.2