From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 24 Apr 2010 09:47:05 +0000 (+0200)
Subject: iptables: Update to 1.4.7 to cover a build error.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eeb5f8eefdc8785aa9e19d5fa655af13dc81a3fb;p=ipfire-3.x.git

iptables: Update to 1.4.7 to cover a build error.
---

diff --git a/pkgs/core/iptables/iptables.nm b/pkgs/core/iptables/iptables.nm
index c82c5797f..3ea173fdf 100644
--- a/pkgs/core/iptables/iptables.nm
+++ b/pkgs/core/iptables/iptables.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = iptables
-PKG_VER        = 1.4.5
+PKG_VER        = 1.4.7
 PKG_REL        = 0
 
 PKG_MAINTAINER =
@@ -34,8 +34,6 @@ PKG_URL        = http://www.netfilter.org/
 PKG_LICENSE    = GPL+
 PKG_SUMMARY    = Tools for managing Linux kernel packet filtering capabilities.
 
-#PKG_DEPS      += m4
-
 define PKG_DESCRIPTION
 	The iptables utility controls the network packet filtering code in the \
 	Linux kernel. If you need to set up firewalls and/or IP masquerading, \
@@ -76,11 +74,12 @@ define STAGE_INSTALL_CMDS
 		$(BUILDROOT)/usr/include/libiptc
 
 	-mkdir -pv $(BUILDROOT)/usr/lib
-	rm -vf $(BUILDROOT)/lib/libip{,4,6}tc.so $(BUILDROOT)/lib/libxtables.so
+	rm -vf $(BUILDROOT)/lib/libip{tc,4tc,6tc,q}.so $(BUILDROOT)/lib/libxtables.so
 	ln -svf ../../lib/libiptc.so.0 $(BUILDROOT)/usr/lib/libiptc.so
 	ln -svf ../../lib/libip4tc.so.0 $(BUILDROOT)/usr/lib/libip4tc.so
 	ln -svf ../../lib/libip6tc.so.0 $(BUILDROOT)/usr/lib/libip6tc.so
-	ln -svf ../../lib/libxtables.so.2 $(BUILDROOT)/usr/lib/libxtables.so
+	ln -svf ../../lib/libipq.so.0 $(BUILDROOT)/usr/lib/libipq.so
+	ln -svf ../../lib/libxtables.so.4 $(BUILDROOT)/usr/lib/libxtables.so
 
 	# Replace absolute symlink
 	ln -svf ../sbin/iptables-multi $(BUILDROOT)/bin/iptables-xml