iproute2: update to 4.5.0, add buildroot patches

8 files changed, 43 insertions, 78 deletions

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 267de7ede..699a5804a 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		iproute2
-PKG_VERSION:=		4.1.1
+PKG_VERSION:=		4.5.0
 PKG_RELEASE:=		1
-PKG_HASH:=		73077a989efb934450bd655cbd9aaddaa747cb696c64d0c9a3323768a6a8e66f
+PKG_HASH:=		3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a
 PKG_DESCR:=		routing control utility
 PKG_SECTION:=		net/route
 PKG_BUILDDEP:=		iptables libnl linux-atm
diff --git a/package/iproute2/patches/patch-include_iptables_h b/package/iproute2/patches/patch-include_iptables_h
deleted file mode 100644
index ca5f11b3e..000000000
--- a/package/iproute2/patches/patch-include_iptables_h
+++ /dev/null
@@ -1,38 +0,0 @@
---- iproute2-3.12.0.orig/include/iptables.h	2013-11-23 02:10:33.000000000 +0100
-+++ iproute2-3.12.0/include/iptables.h	2014-04-05 05:22:26.690501973 +0200
-@@ -20,7 +20,7 @@ struct ipt_get_revision
- {
- 	char name[IPT_FUNCTION_MAXNAMELEN-1];
- 
--	u_int8_t revision;
-+	uint8_t revision;
- };
- #endif /* IPT_SO_GET_REVISION_MATCH   Old kernel source */
- 
-@@ -39,7 +39,7 @@ struct iptables_match
- 	ipt_chainlabel name;
- 
- 	/* Revision of match (0 by default). */
--	u_int8_t revision;
-+	uint8_t revision;
- 
- 	const char *version;
- 
-@@ -92,7 +92,7 @@ struct iptables_target
- 	ipt_chainlabel name;
- 
- 	/* Revision of target (0 by default). */
--	u_int8_t revision;
-+	uint8_t revision;
- 
- 	const char *version;
- 
-@@ -153,7 +153,7 @@ extern char *mask_to_dotted(const struct
- 
- extern void parse_hostnetworkmask(const char *name, struct in_addr **addrpp,
-                       struct in_addr *maskp, unsigned int *naddrs);
--extern u_int16_t parse_protocol(const char *s);
-+extern uint16_t parse_protocol(const char *s);
- 
- extern int do_command(int argc, char *argv[], char **table,
- 		      iptc_handle_t *handle);
diff --git a/package/iproute2/patches/patch-include_libiptc_ipt_kernel_headers_h b/package/iproute2/patches/patch-include_libiptc_ipt_kernel_headers_h
deleted file mode 100644
index bc836c0d1..000000000
--- a/package/iproute2/patches/patch-include_libiptc_ipt_kernel_headers_h
+++ /dev/null
@@ -1,25 +0,0 @@
---- iproute2-3.12.0.orig/include/libiptc/ipt_kernel_headers.h	2013-11-23 02:10:33.000000000 +0100
-+++ iproute2-3.12.0/include/libiptc/ipt_kernel_headers.h	2014-04-05 05:25:40.983670487 +0200
-@@ -5,22 +5,10 @@
- 
- #include <limits.h>
- 
--#if defined(__GLIBC__) && __GLIBC__ == 2
- #include <netinet/ip.h>
- #include <netinet/in.h>
- #include <netinet/ip_icmp.h>
- #include <netinet/tcp.h>
- #include <netinet/udp.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/iproute2/patches/patch-include_linux_if_bridge_h b/package/iproute2/patches/patch-include_linux_if_bridge_h
new file mode 100644
index 000000000..ec7c8bfd7
--- /dev/null
+++ b/package/iproute2/patches/patch-include_linux_if_bridge_h
@@ -0,0 +1,10 @@
+--- iproute2-4.5.0.orig/include/linux/if_bridge.h	2016-03-15 00:02:31.000000000 +0100
++++ iproute2-4.5.0/include/linux/if_bridge.h	2016-04-21 02:44:12.713804912 +0200
+@@ -15,7 +15,6 @@
+ 
+ #include <linux/types.h>
+ #include <linux/if_ether.h>
+-#include <linux/in6.h>
+ 
+ #define SYSFS_BRIDGE_ATTR	"bridge"
+ #define SYSFS_BRIDGE_FDB	"brforward"
diff --git a/package/iproute2/patches/patch-include_linux_netfilter_h b/package/iproute2/patches/patch-include_linux_netfilter_h
new file mode 100644
index 000000000..67dfe2eef
--- /dev/null
+++ b/package/iproute2/patches/patch-include_linux_netfilter_h
@@ -0,0 +1,11 @@
+--- iproute2-4.5.0.orig/include/linux/netfilter.h	2016-03-15 00:02:31.000000000 +0100
++++ iproute2-4.5.0/include/linux/netfilter.h	2016-04-21 02:44:12.713804912 +0200
+@@ -4,8 +4,6 @@
+ #include <linux/types.h>
+ 
+ #include <linux/sysctl.h>
+-#include <linux/in.h>
+-#include <linux/in6.h>
+ 
+ /* Responses from hook functions. */
+ #define NF_DROP 0
diff --git a/package/iproute2/patches/patch-include_linux_xfrm_h b/package/iproute2/patches/patch-include_linux_xfrm_h
new file mode 100644
index 000000000..e66679a80
--- /dev/null
+++ b/package/iproute2/patches/patch-include_linux_xfrm_h
@@ -0,0 +1,10 @@
+--- iproute2-4.5.0.orig/include/linux/xfrm.h	2016-03-15 00:02:31.000000000 +0100
++++ iproute2-4.5.0/include/linux/xfrm.h	2016-04-21 02:44:12.713804912 +0200
+@@ -1,7 +1,6 @@
+ #ifndef _LINUX_XFRM_H
+ #define _LINUX_XFRM_H
+ 
+-#include <linux/in6.h>
+ #include <linux/types.h>
+ 
+ /* All of the structures in this file may not change size as they are
diff --git a/package/iproute2/patches/patch-misc_Makefile b/package/iproute2/patches/patch-misc_Makefile
deleted file mode 100644
index 95dbe51ec..000000000
--- a/package/iproute2/patches/patch-misc_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-	disable compiling of arpd since it needs berkeley db which we dont have
-	yet
---- iproute2-2.6.29-1.orig/misc/Makefile	2009-03-24 23:40:54.000000000 +0100
-+++ iproute2-2.6.29-1/misc/Makefile	2009-08-22 02:48:24.794861772 +0200
-@@ -1,7 +1,7 @@
- SSOBJ=ss.o ssfilter.o
- LNSTATOBJ=lnstat.o lnstat_util.o
- 
--TARGETS=ss nstat ifstat rtacct arpd lnstat
-+TARGETS=ss nstat ifstat rtacct lnstat
- 
- include ../Config
- 
diff --git a/package/iproute2/patches/patch-tc_tc_bpf_c b/package/iproute2/patches/patch-tc_tc_bpf_c
new file mode 100644
index 000000000..2d8b7fe66
--- /dev/null
+++ b/package/iproute2/patches/patch-tc_tc_bpf_c
@@ -0,0 +1,10 @@
+--- iproute2-4.5.0.orig/tc/tc_bpf.c	2016-03-15 00:02:31.000000000 +0100
++++ iproute2-4.5.0/tc/tc_bpf.c	2016-04-21 02:46:17.201844819 +0200
+@@ -20,6 +20,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdarg.h>
++#include <limits.h>
+ 
+ #ifdef HAVE_ELF
+ #include <libelf.h>