From 079a754ead54ecba04a00fb3bf5ee6bc84d219c6 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 21 Mar 2009 11:20:42 +0100
Subject: [PATCH] Updated iptables to 1.4.2

---
 config/rootfiles/common/iptables |  6 ++++++
 doc/packages-list.txt            |  2 +-
 lfs/iptables                     | 36 ++++++++++++++++----------------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables
index cb41e97e2e..9882c91e96 100644
--- a/config/rootfiles/common/iptables
+++ b/config/rootfiles/common/iptables
@@ -255,3 +255,9 @@ usr/lib/libnfnetlink.so.0.2.0
 #usr/share/man/man8/ip6tables-save.8
 #usr/share/man/man8/ip6tables.8
 #usr/share/man/man8/iptables-xml.8
+#lib/libxtables.la
+lib/libxtables.so
+lib/libxtables.so.0
+lib/libxtables.so.0.0.0
+#lib/pkgconfig
+#lib/pkgconfig/xtables.pc
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f8aacbef69..1c6cbbdcf3 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -137,7 +137,7 @@
 * iperf-2.0.4
 * ipfireseeder-1.00
 * iproute2-2.6.16-060323
-* iptables-1.4.1.1
+* iptables-1.4.2
 * iptstate-2.1
 * iputils-ss020927
 * java-1.6.0_12-for-ipfire
diff --git a/lfs/iptables b/lfs/iptables
index ea0086c26b..61aa03a7bc 100644
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.1.1
+VER        = 1.4.2
 
 THISAPP    = iptables-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -37,18 +37,18 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 objects = 	$(DL_FILE) \
 			netfilter-layer7-v2.21.tar.gz \
-			libnfnetlink-0.0.39.tar.bz2 \
-			libnetfilter_queue-0.0.16.tar.bz2
+			libnfnetlink-0.0.41.tar.bz2 \
+			libnetfilter_queue-0.0.17.tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 netfilter-layer7-v2.21.tar.gz 		= $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
-libnfnetlink-0.0.39.tar.bz2		= $(URL_IPFIRE)/libnfnetlink-0.0.39.tar.bz2
-libnetfilter_queue-0.0.16.tar.bz2	= $(URL_IPFIRE)/libnetfilter_queue-0.0.16.tar.bz2
+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 = 723fa88d8a0915e184f99e03e9bf06cb
+$(DL_FILE)_MD5 = a138d1c2e74321e0e4e228a9fb301c9a
 netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
-libnfnetlink-0.0.39.tar.bz2_MD5 = 348fed8c1edbe5b873ffc7b192140093
-libnetfilter_queue-0.0.16.tar.bz2_MD5 = b36664e6cd39edbfe46b416a86118add
+libnfnetlink-0.0.41.tar.bz2_MD5 = 5d844ea1f557bad0364d5b85cd10c796
+libnetfilter_queue-0.0.17.tar.bz2_MD5 = 2cde35e678ead3a8f9eb896bf807a159
 
 install : $(TARGET)
 
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.39 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.16
+	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
 
 	@cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.21.tar.gz
@@ -106,14 +106,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && cp -vf libiptc/{*.o,*.a} \
 		/lib
 
-	cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.39.tar.bz2
-	cd $(DIR_SRC)/libnfnetlink-0.0.39 && ./configure --prefix=/usr
-	cd $(DIR_SRC)/libnfnetlink-0.0.39 && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_SRC)/libnfnetlink-0.0.39 && make install
+	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.16.tar.bz2
-	cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && ./configure --prefix=/usr
-	cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make install
-	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.39 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.16
+	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)
-- 
2.39.2