From d2f2ca6560d85ba74376792c1d5f5a7f1dc8887a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 23 Jun 2015 13:51:50 +0200 Subject: [PATCH 1/1] libnetfilter_queue: Update to version 1.0.2 Signed-off-by: Michael Tremer --- config/rootfiles/common/libnetfilter_queue | 14 ++++ .../core/92/filelists/libnetfilter_queue | 1 + lfs/iptables | 12 +-- lfs/libnetfilter_queue | 77 +++++++++++++++++++ make.sh | 1 + 5 files changed, 95 insertions(+), 10 deletions(-) create mode 100644 config/rootfiles/common/libnetfilter_queue create mode 120000 config/rootfiles/core/92/filelists/libnetfilter_queue create mode 100644 lfs/libnetfilter_queue diff --git a/config/rootfiles/common/libnetfilter_queue b/config/rootfiles/common/libnetfilter_queue new file mode 100644 index 0000000000..418a5df895 --- /dev/null +++ b/config/rootfiles/common/libnetfilter_queue @@ -0,0 +1,14 @@ +#usr/include/internal.h +#usr/include/libnetfilter_queue +#usr/include/libnetfilter_queue/libnetfilter_queue.h +#usr/include/libnetfilter_queue/libnetfilter_queue_ipv4.h +#usr/include/libnetfilter_queue/libnetfilter_queue_ipv6.h +#usr/include/libnetfilter_queue/libnetfilter_queue_tcp.h +#usr/include/libnetfilter_queue/libnetfilter_queue_udp.h +#usr/include/libnetfilter_queue/linux_nfnetlink_queue.h +#usr/include/libnetfilter_queue/pktbuff.h +#usr/lib/libnetfilter_queue.la +#usr/lib/libnetfilter_queue.so +usr/lib/libnetfilter_queue.so.1 +usr/lib/libnetfilter_queue.so.1.3.0 +#usr/lib/pkgconfig/libnetfilter_queue.pc diff --git a/config/rootfiles/core/92/filelists/libnetfilter_queue b/config/rootfiles/core/92/filelists/libnetfilter_queue new file mode 120000 index 0000000000..9344b04bf3 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnetfilter_queue @@ -0,0 +1 @@ +../../../common/libnetfilter_queue \ No newline at end of file diff --git a/lfs/iptables b/lfs/iptables index a17b05844a..07398cc6ae 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -37,17 +37,14 @@ TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### objects = $(DL_FILE) \ netfilter-layer7-v2.22.tar.gz \ - libnetfilter_queue-1.0.1.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_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_cttimeout-1.0.0.tar.bz2_MD5 = 7697437fc9ebb6f6b83df56a633db7f9 install : $(TARGET) @@ -77,7 +74,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-* + @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) # cp -rf /usr/src/linux/include/linux/netfilter /usr/include/linux @@ -109,15 +106,10 @@ $(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_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_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* $(DIR_SRC)/libnetfilter_queue-* + @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* @$(POSTBUILD) diff --git a/lfs/libnetfilter_queue b/lfs/libnetfilter_queue new file mode 100644 index 0000000000..19fe6a2c6e --- /dev/null +++ b/lfs/libnetfilter_queue @@ -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.2 + +THISAPP = libnetfilter_queue-$(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 = df09befac35cb215865b39a36c96a3fa + +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 c4444d9356..bafbe99c23 100755 --- a/make.sh +++ b/make.sh @@ -406,6 +406,7 @@ buildipfire() { ipfiremake grub ipfiremake libmnl ipfiremake libnfnetlink + ipfiremake libnetfilter_queue ipfiremake libnetfilter_conntrack ipfiremake iptables -- 2.39.2