iptables: update to latest stable version

8 files changed, 5 insertions, 127 deletions

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index ffb5ad811..ab11f80a7 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		iptables
-PKG_VERSION:=		1.4.21
-PKG_RELEASE:=		7
-PKG_HASH:=		52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0
+PKG_VERSION:=		1.6.0
+PKG_RELEASE:=		1
+PKG_HASH:=		4bb72a0a0b18b5a9e79e87631ddc4084528e5df236bc7624472dcaa8480f1c60
 PKG_DESCR:=		netfilter firewalling software
 PKG_SECTION:=		net/firewall
 PKG_DEPENDS:=		libnetfilter_conntrack libmnl libnfnetlink
@@ -27,7 +27,8 @@ $(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG
 
 AUTOTOOL_STYLE:=	autoreconf
 TARGET_LDFLAGS+=	-fPIC
-CONFIGURE_ARGS+=	--enable-devel
+CONFIGURE_ARGS+=	--enable-devel \
+			--disable-nftables
 
 iptables-install:
 	${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc/xtables,usr/sbin}
diff --git a/package/iptables/patches/patch-extensions_GNUmakefile_in b/package/iptables/patches/patch-extensions_GNUmakefile_in
deleted file mode 100644
index cc922cc28..000000000
--- a/package/iptables/patches/patch-extensions_GNUmakefile_in
+++ /dev/null
@@ -1,28 +0,0 @@
---- iptables-1.4.21.orig/extensions/GNUmakefile.in	2013-11-22 12:18:13.000000000 +0100
-+++ iptables-1.4.21/extensions/GNUmakefile.in	2014-04-08 11:49:28.000000000 +0200
-@@ -21,7 +21,7 @@ regular_CPPFLAGS   = @regular_CPPFLAGS@
- kinclude_CPPFLAGS  = @kinclude_CPPFLAGS@
- 
- AM_CFLAGS       = ${regular_CFLAGS}
--AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS}
-+AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@
- AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
- AM_LDFLAGS      = @noundef_LDFLAGS@
- 
-@@ -93,7 +93,7 @@ lib%.so: lib%.oo
- 	${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD};
- 
- lib%.oo: ${srcdir}/lib%.c
--	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} ${$*_CFLAGADD} -o $@ -c $<;
-+	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
- 
- libxt_NOTRACK.so: libxt_CT.so
- 	ln -fs $< $@
-@@ -106,6 +106,7 @@ xt_statistic_LIBADD = -lm
- @HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@
- 
- @HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_CFLAGADD = @libnetfilter_conntrack_CFLAGS@
-+xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@
- 
- #
- #	Static bits
diff --git a/package/iptables/patches/patch-extensions_libxt_TCPOPTSTRIP_c b/package/iptables/patches/patch-extensions_libxt_TCPOPTSTRIP_c
deleted file mode 100644
index c9e728b85..000000000
--- a/package/iptables/patches/patch-extensions_libxt_TCPOPTSTRIP_c
+++ /dev/null
@@ -1,24 +0,0 @@
---- iptables-1.4.20.orig/extensions/libxt_TCPOPTSTRIP.c	2013-08-06 17:48:43.000000000 +0200
-+++ iptables-1.4.20/extensions/libxt_TCPOPTSTRIP.c	2013-08-15 17:02:18.802154795 +0200
-@@ -12,6 +12,21 @@
- #ifndef TCPOPT_MD5SIG
- #	define TCPOPT_MD5SIG 19
- #endif
-+#ifndef TCPOPT_MAXSEG
-+# define TCPOPT_MAXSEG 2
-+#endif
-+#ifndef TCPOPT_WINDOW
-+# define TCPOPT_WINDOW 3
-+#endif
-+#ifndef TCPOPT_SACK_PERMITTED
-+# define TCPOPT_SACK_PERMITTED 4
-+#endif
-+#ifndef TCPOPT_SACK
-+# define TCPOPT_SACK 5
-+#endif
-+#ifndef TCPOPT_TIMESTAMP
-+# define TCPOPT_TIMESTAMP 8
-+#endif
- 
- enum {
- 	O_STRIP_OPTION = 0,
diff --git a/package/iptables/patches/patch-extensions_libxt_pkttype_c b/package/iptables/patches/patch-extensions_libxt_pkttype_c
deleted file mode 100644
index b5f39a900..000000000
--- a/package/iptables/patches/patch-extensions_libxt_pkttype_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- iptables-1.4.12.2.orig/extensions/libxt_pkttype.c	2012-01-02 18:19:09.000000000 +0100
-+++ iptables-1.4.12.2/extensions/libxt_pkttype.c	2012-03-17 13:49:29.651581491 +0100
-@@ -4,6 +4,11 @@
-  *
-  * Michal Ludvig <michal@logix.cz>
-  */
-+
-+#define __aligned_u64 __u64 __attribute__((aligned(8)))
-+#define __aligned_be64 __be64 __attribute__((aligned(8)))
-+#define __aligned_le64 __le64 __attribute__((aligned(8)))
-+
- #include <stdio.h>
- #include <string.h>
- #include <xtables.h>
diff --git a/package/iptables/patches/patch-include_libiptc_ipt_kernel_headers_h b/package/iptables/patches/patch-include_libiptc_ipt_kernel_headers_h
deleted file mode 100644
index 4bf224f13..000000000
--- a/package/iptables/patches/patch-include_libiptc_ipt_kernel_headers_h
+++ /dev/null
@@ -1,26 +0,0 @@
---- iptables-1.4.20.orig/include/libiptc/ipt_kernel_headers.h	2013-08-06 17:48:43.000000000 +0200
-+++ iptables-1.4.20/include/libiptc/ipt_kernel_headers.h	2013-08-15 16:58:51.960755143 +0200
-@@ -5,7 +5,6 @@
- 
- #include <limits.h>
- 
--#if defined(__GLIBC__) && __GLIBC__ == 2
- #include <netinet/ip.h>
- #include <netinet/in.h>
- #include <netinet/ip_icmp.h>
-@@ -13,15 +12,4 @@
- #include <netinet/udp.h>
- #include <net/if.h>
- #include <sys/types.h>
--#else /* libc5 */
--#include <sys/socket.h>
--#include <linux/ip.h>
--#include <linux/in.h>
--#include <linux/if.h>
--#include <linux/icmp.h>
--#include <linux/tcp.h>
--#include <linux/udp.h>
--#include <linux/types.h>
--#include <linux/in6.h>
--#endif
- #endif
diff --git a/package/iptables/patches/patch-include_linux_netfilter_ipv4_ip_tables_h b/package/iptables/patches/patch-include_linux_netfilter_ipv4_ip_tables_h
deleted file mode 100644
index d5eacdc58..000000000
--- a/package/iptables/patches/patch-include_linux_netfilter_ipv4_ip_tables_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- iptables-1.4.20.orig/include/linux/netfilter_ipv4/ip_tables.h	2013-08-06 17:48:43.000000000 +0200
-+++ iptables-1.4.20/include/linux/netfilter_ipv4/ip_tables.h	2013-08-15 17:07:14.082442619 +0200
-@@ -16,6 +16,7 @@
- #define _IPTABLES_H
- 
- #include <linux/types.h>
-+#include <sys/types.h>
- 
- #include <linux/netfilter_ipv4.h>
- 
diff --git a/package/iptables/patches/patch-include_linux_netfilter_ipv6_ip6_tables_h b/package/iptables/patches/patch-include_linux_netfilter_ipv6_ip6_tables_h
deleted file mode 100644
index 9a69545eb..000000000
--- a/package/iptables/patches/patch-include_linux_netfilter_ipv6_ip6_tables_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- iptables-1.4.20.orig/include/linux/netfilter_ipv6/ip6_tables.h	2013-08-06 17:48:43.000000000 +0200
-+++ iptables-1.4.20/include/linux/netfilter_ipv6/ip6_tables.h	2013-08-15 17:07:35.250176505 +0200
-@@ -16,6 +16,7 @@
- #define _IP6_TABLES_H
- 
- #include <linux/types.h>
-+#include <sys/types.h>
- 
- #include <linux/netfilter_ipv6.h>
- 
diff --git a/package/iptables/patches/patch-libxtables_Makefile_am b/package/iptables/patches/patch-libxtables_Makefile_am
deleted file mode 100644
index d05a100aa..000000000
--- a/package/iptables/patches/patch-libxtables_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- iptables-1.4.21.orig/libxtables/Makefile.am	2013-11-22 12:18:13.000000000 +0100
-+++ iptables-1.4.21/libxtables/Makefile.am	2014-04-08 11:51:20.000000000 +0200
-@@ -10,7 +10,7 @@ libxtables_la_LIBADD  =
- if ENABLE_STATIC
- # With --enable-static, shipped extensions are linked into the main executable,
- # so we need all the LIBADDs here too
--libxtables_la_LIBADD += -lm
-+libxtables_la_LIBADD += -lm ${libnetfilter_conntrack_LIBS}
- endif
- if ENABLE_SHARED
- libxtables_la_CFLAGS  = ${AM_CFLAGS}