From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 25 Jul 2011 14:44:10 +0000 (+0200)
Subject: iptables: Update to 1.4.12.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=901d059136f497a1a97f9daeddd25836e3b3b46b;p=ipfire-3.x.git

iptables: Update to 1.4.12.

Links against libnfnetlink.
---

diff --git a/pkgs/iptables/iptables.nm b/pkgs/iptables/iptables.nm
index 579b77168..7ed99a3de 100644
--- a/pkgs/iptables/iptables.nm
+++ b/pkgs/iptables/iptables.nm
@@ -25,11 +25,9 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = iptables
-PKG_VER        = 1.4.11.1
+PKG_VER        = 1.4.12
 PKG_REL        = 1
 
-PKG_BUILD_DEPS+= libselinux-devel
-
 PKG_MAINTAINER =
 PKG_GROUPS     = Networking/Tools
 PKG_GROUPS-iptables = Base $(PKG_GROUPS)
@@ -37,6 +35,8 @@ PKG_URL        = http://www.netfilter.org/
 PKG_LICENSE    = GPL+
 PKG_SUMMARY    = Tools for managing Linux kernel packet filtering capabilities.
 
+PKG_BUILD_DEPS+= libnfnetlink-devel libselinux-devel
+
 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, \
@@ -84,8 +84,12 @@ define STAGE_INSTALL_CMDS
 	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/libipq.so.0 $(BUILDROOT)/usr/lib/libipq.so
-	ln -svf ../../lib/libxtables.so.6 $(BUILDROOT)/usr/lib/libxtables.so
+	ln -svf ../../lib/libxtables.so.7 $(BUILDROOT)/usr/lib/libxtables.so
 
 	# Replace absolute symlink
 	ln -svf ../sbin/xtables-multi $(BUILDROOT)/bin/iptables-xml
+
+	# Move binary which links to /usr/lib to /usr.
+	-mkdir -pv $(BUILDROOT)/usr/sbin
+	mv -v $(BUILDROOT)/{,usr/}sbin/nfnl_osf
 endef