core/iptables: upgraded to 1.4.3.1

2 files changed, 4 insertions, 58 deletions

diff --git a/core/iptables/APKBUILD b/core/iptables/APKBUILD
index 485ca7a99c..0d409bda66 100644
--- a/core/iptables/APKBUILD
+++ b/core/iptables/APKBUILD
@@ -2,18 +2,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 pkgname=iptables
-pkgver=1.4.2
+pkgver=1.4.3.1
 pkgrel=0
 pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
 url="http://www.iptables.org/"
 license=GPL-2
 source="http://iptables.org/projects/iptables/files/$pkgname-$pkgver.tar.bz2
-	iptables-1.4.2-as-needed.patch
 	iptables-1.4.2-no-ldconfig.patch
 	iptables-1.4.2-include-in.patch
 	iptables.initd
 	iptables.confd
 	"
+
 makedepends="linux-headers"
 subpackages="ip6tables $pkgname-doc $pkgname-dev"
 
@@ -21,6 +21,7 @@ build() {
 	local i
 	cd "$srcdir/$pkgname-$pkgver"
 	for i in ../*.patch; do
+		msg "Applying $i..."
 		patch -p1 -i $i || return 1
 	done
 
@@ -60,8 +61,7 @@ ip6tables() {
 		"$subpkgdir"/etc/init.d/ip6tables
 }
 
-md5sums="a138d1c2e74321e0e4e228a9fb301c9a  iptables-1.4.2.tar.bz2
-9279ad4cfa650c828bc3fff5368ad526  iptables-1.4.2-as-needed.patch
+md5sums="9c67f796f69e1e016cc19e2c19357711  iptables-1.4.3.1.tar.bz2
 7b9c52caf34663186c32ea44b80c9a03  iptables-1.4.2-no-ldconfig.patch
 ec3e80a1b0ea3e13e4e60824b7ebd1b9  iptables-1.4.2-include-in.patch
 2202ac150a5dfe32a8363b0ad565ee1d  iptables.initd
diff --git a/core/iptables/iptables-1.4.2-as-needed.patch b/core/iptables/iptables-1.4.2-as-needed.patch
deleted file mode 100644
index 3782393f10..0000000000
--- a/core/iptables/iptables-1.4.2-as-needed.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-http://bugs.gentoo.org/244431
-
-patch by Arfrever Frehtes Taifersar Arahesis
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -87,7 +87,7 @@
- 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libxtables_la_LIBADD =
-+libxtables_la_DEPENDENCIES =
- am_libxtables_la_OBJECTS = xtables.lo
- libxtables_la_OBJECTS = $(am_libxtables_la_OBJECTS)
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@@ -353,11 +353,12 @@
- lib_LTLIBRARIES = libxtables.la
- libxtables_la_SOURCES = xtables.c
- libxtables_la_LDFLAGS = -version 0:0:0
-+libxtables_la_LIBADD = -ldl
- 
- # iptables, dynamic
- iptables_SOURCES = iptables-standalone.c iptables.c
- iptables_LDFLAGS = -rdynamic
--iptables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext4.a libxtables.la
-+iptables_LDADD = libiptc/libiptc.a extensions/libext4.a libxtables.la -ldl -lm
- iptables_multi_SOURCES = iptables-multi.c iptables-save.c \
-                             iptables-restore.c iptables-xml.c \
-                             iptables-standalone.c iptables.c
-@@ -375,13 +376,13 @@
- # iptables-multi, semi-static
- iptables_static_SOURCES = ${iptables_multi_SOURCES} xtables.c
- iptables_static_CFLAGS = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1
--iptables_static_LDADD = -lm libiptc/libiptc.a extensions/libext4.a
-+iptables_static_LDADD = libiptc/libiptc.a extensions/libext4.a -lm
- iptables_xml_SOURCES = iptables-xml.c
- 
- # ip6tables, dynamic
- ip6tables_SOURCES = ip6tables-standalone.c ip6tables.c
- ip6tables_LDFLAGS = -rdynamic
--ip6tables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext6.a libxtables.la
-+ip6tables_LDADD = libiptc/libiptc.a extensions/libext6.a libxtables.la -ldl -lm
- ip6tables_multi_SOURCES = ip6tables-multi.c ip6tables-save.c \
-                             ip6tables-restore.c ip6tables-standalone.c \
-                             ip6tables.c
-@@ -399,7 +400,7 @@
- # iptables-multi, semi-static
- ip6tables_static_SOURCES = ${ip6tables_multi_SOURCES} xtables.c
- ip6tables_static_CFLAGS = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1
--ip6tables_static_LDADD = -lm libiptc/libiptc.a extensions/libext6.a
-+ip6tables_static_LDADD = libiptc/libiptc.a extensions/libext6.a -lm
- noinst_LIBRARIES := libiptc/libiptc.a
- man_MANS := iptables.8 iptables-restore.8 iptables-save.8 \
-                     iptables-xml.8 ip6tables.8 ip6tables-restore.8 \