X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=lfs%2Fiptables;h=99afe2bfc8754dc3836fc4e8484bf73ea59ad754;hb=fbeee8929a770ef53d75cd8b562aeb7283306117;hp=a4d21b43c767facdbc5dee5939f0b7f12353d97c;hpb=4f1b7a27db6b0282eb2bb70fb9e20608d155c4e8;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/iptables b/lfs/iptables
index a4d21b43c7..99afe2bfc8 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
@@ -36,19 +36,19 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 objects = 	$(DL_FILE) \
-			netfilter-layer7-v2.20.tar.gz \
-			libnfnetlink-0.0.39.tar.bz2 \
-			libnetfilter_queue-0.0.16.tar.bz2
+			netfilter-layer7-v2.21.tar.gz \
+			libnfnetlink-0.0.41.tar.bz2 \
+			libnetfilter_queue-0.0.17.tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-netfilter-layer7-v2.20.tar.gz 		= $(URL_IPFIRE)/netfilter-layer7-v2.20.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
+netfilter-layer7-v2.21.tar.gz 		= $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
+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
-netfilter-layer7-v2.20.tar.gz_MD5 = 525a821c973b730c8feaf9eedb57d1e4
-libnfnetlink-0.0.39.tar.bz2_MD5 = 348fed8c1edbe5b873ffc7b192140093
-libnetfilter_queue-0.0.16.tar.bz2_MD5 = b36664e6cd39edbfe46b416a86118add
+$(DL_FILE)_MD5 = a138d1c2e74321e0e4e228a9fb301c9a
+netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
+libnfnetlink-0.0.41.tar.bz2_MD5 = 5d844ea1f557bad0364d5b85cd10c796
+libnetfilter_queue-0.0.17.tar.bz2_MD5 = 2cde35e678ead3a8f9eb896bf807a159
 
 install : $(TARGET)
 
@@ -77,17 +77,17 @@ $(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.20.tar.gz
-	cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.20/iptables-1.4.1.1-for-kernel-2.6.20forward/* \
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.21.tar.gz
+	cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.21/iptables-1.4.1.1-for-kernel-2.6.20forward/* \
 	                 ./extensions/
 
 	# ipp2p 0.8.2-pomng
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.1.1-ipp2p-0.8.2-pomng.patch
 
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.1-imq.diff
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.2-imq.patch
 	chmod +x $(DIR_APP)/extensions/.IMQ-test*
 
 	# hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present
@@ -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
-	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
-	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)