From 4ebb37c8ad321f185618349121ebd074df37e5e6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 23 Jun 2015 13:37:09 +0200 Subject: [PATCH] libnfnetlink: Update to 1.0.1 Signed-off-by: Michael Tremer --- config/rootfiles/common/iptables | 10 --- config/rootfiles/common/libnfnetlink | 9 +++ .../rootfiles/core/92/filelists/libnfnetlink | 1 + lfs/iptables | 8 -- lfs/libnfnetlink | 77 +++++++++++++++++++ make.sh | 1 + 6 files changed, 88 insertions(+), 18 deletions(-) create mode 100644 config/rootfiles/common/libnfnetlink create mode 120000 config/rootfiles/core/92/filelists/libnfnetlink create mode 100644 lfs/libnfnetlink diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables index a0f1290080..f86c451895 100644 --- a/config/rootfiles/common/iptables +++ b/config/rootfiles/common/iptables @@ -160,10 +160,6 @@ sbin/xtables-multi #usr/include/libnetfilter_queue #usr/include/libnetfilter_queue/libnetfilter_queue.h #usr/include/libnetfilter_queue/linux_nfnetlink_queue.h -#usr/include/libnfnetlink -#usr/include/libnfnetlink/libnfnetlink.h -#usr/include/libnfnetlink/linux_nfnetlink.h -#usr/include/libnfnetlink/linux_nfnetlink_compat.h #usr/include/xtables-version.h #usr/include/xtables.h #usr/lib/libnetfilter_conntrack.la @@ -178,11 +174,6 @@ usr/lib/libnetfilter_cttimeout.so.1.0.0 usr/lib/libnetfilter_queue.so usr/lib/libnetfilter_queue.so.1 usr/lib/libnetfilter_queue.so.1.2.0 -#usr/lib/libnfnetlink.a -#usr/lib/libnfnetlink.la -usr/lib/libnfnetlink.so -usr/lib/libnfnetlink.so.0 -usr/lib/libnfnetlink.so.0.2.0 #usr/lib/pkgconfig/libip4tc.pc #usr/lib/pkgconfig/libip6tc.pc #usr/lib/pkgconfig/libipq.pc @@ -190,7 +181,6 @@ usr/lib/libnfnetlink.so.0.2.0 #usr/lib/pkgconfig/libnetfilter_conntrack.pc #usr/lib/pkgconfig/libnetfilter_cttimeout.pc #usr/lib/pkgconfig/libnetfilter_queue.pc -#usr/lib/pkgconfig/libnfnetlink.pc #usr/lib/pkgconfig/xtables.pc #usr/share/man/man1/iptables-xml.1 #usr/share/man/man3/ipq_create_handle.3 diff --git a/config/rootfiles/common/libnfnetlink b/config/rootfiles/common/libnfnetlink new file mode 100644 index 0000000000..ad97cb5265 --- /dev/null +++ b/config/rootfiles/common/libnfnetlink @@ -0,0 +1,9 @@ +#usr/include/libnfnetlink +#usr/include/libnfnetlink/libnfnetlink.h +#usr/include/libnfnetlink/linux_nfnetlink.h +#usr/include/libnfnetlink/linux_nfnetlink_compat.h +#usr/lib/libnfnetlink.la +#usr/lib/libnfnetlink.so +usr/lib/libnfnetlink.so.0 +usr/lib/libnfnetlink.so.0.2.0 +#usr/lib/pkgconfig/libnfnetlink.pc diff --git a/config/rootfiles/core/92/filelists/libnfnetlink b/config/rootfiles/core/92/filelists/libnfnetlink new file mode 120000 index 0000000000..605e72d90c --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnfnetlink @@ -0,0 +1 @@ +../../../common/libnfnetlink \ No newline at end of file diff --git a/lfs/iptables b/lfs/iptables index ec65ae04a0..c205601b3b 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -37,21 +37,18 @@ TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### objects = $(DL_FILE) \ 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) 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 = 536d048c8e8eeebcd9757d0863ebb0c0 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 @@ -115,11 +112,6 @@ $(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)/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) diff --git a/lfs/libnfnetlink b/lfs/libnfnetlink new file mode 100644 index 0000000000..62350ea07d --- /dev/null +++ b/lfs/libnfnetlink @@ -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.1 + +THISAPP = libnfnetlink-$(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 = 98927583d2016a9fb1936fed992e2c5e + +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 d3c23c61e5..335de87c8f 100755 --- a/make.sh +++ b/make.sh @@ -405,6 +405,7 @@ buildipfire() { ipfiremake freetype ipfiremake grub ipfiremake libmnl + ipfiremake libnfnetlink ipfiremake iptables case "${TARGET_ARCH}" in -- 2.39.2