From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 1 Apr 2012 15:04:27 +0000 (+0200)
Subject: iptables: Update to 1.4.13.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bc65841fd0ea2f3b46655f742db04d6212e50f4;p=ipfire-3.x.git

iptables: Update to 1.4.13.
---

diff --git a/iptables/iptables.nm b/iptables/iptables.nm
index ea53b4c6a..b809b20e0 100644
--- a/iptables/iptables.nm
+++ b/iptables/iptables.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = iptables
-version    = 1.4.12.2
+version    = 1.4.13
 release    = 1
 
 groups     = Networking/Tools
@@ -30,9 +30,6 @@ build
 	CFLAGS += -fno-strict-aliasing
 
 	configure_options += \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--libdir=/%{lib} \
 		--libexecdir=/%{lib} \
 		--sysconfdir=/etc \
 		--with-pkgconfigdir=%{libdir}/pkgconfig \
@@ -58,20 +55,8 @@ build
 		install -v -m 644 include/libiptc/*.h \
 			%{BUILDROOT}/usr/include/libiptc
 
-		mkdir -pv %{BUILDROOT}%{libdir}
-		rm -vf %{BUILDROOT}/%{lib}/libip{tc,4tc,6tc,q}.so %{BUILDROOT}/%{lib}/libxtables.so
-		ln -svf ../../%{lib}/libiptc.so.0 %{BUILDROOT}%{libdir}/libiptc.so
-		ln -svf ../../%{lib}/libip4tc.so.0 %{BUILDROOT}%{libdir}/libip4tc.so
-		ln -svf ../../%{lib}/libip6tc.so.0 %{BUILDROOT}%{libdir}/libip6tc.so
-		ln -svf ../../%{lib}/libipq.so.0 %{BUILDROOT}%{libdir}/libipq.so
-		ln -svf ../../%{lib}/libxtables.so.7 %{BUILDROOT}%{libdir}/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
+		# Remove relative symlinks.
+		ln -svf ../sbin/xtables-multi %{BUILDROOT}/usr/bin/iptables-xml
 	end
 end