update iproute2 to latest

5 files changed, 33 insertions, 11 deletions

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 97f25a7dc..80440865c 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		iproute2
-PKG_VERSION:=		4.0.0
+PKG_VERSION:=		4.1.0
 PKG_RELEASE:=		1
-PKG_HASH:=		5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618
+PKG_HASH:=		d1326696c6a8f81ba66aaf48d858005cf280c81d3284d8d2c99748e3d0746146
 PKG_DESCR:=		routing control utility
 PKG_SECTION:=		net/route
 PKG_BUILDDEP:=		iptables libnl linux-atm
diff --git a/package/iproute2/patches/patch-Makefile b/package/iproute2/patches/patch-Makefile
new file mode 100644
index 000000000..36aab123c
--- /dev/null
+++ b/package/iproute2/patches/patch-Makefile
@@ -0,0 +1,22 @@
+--- iproute2-4.1.0.orig/Makefile	2015-06-26 21:28:25.000000000 +0200
++++ iproute2-4.1.0/Makefile	2015-06-29 20:01:56.000000000 +0200
+@@ -29,16 +29,16 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
+ #options for mpls
+ ADDLIB+=mpls_ntop.o mpls_pton.o
+ 
+-CC = gcc
++CC ?= gcc
+ HOSTCC = gcc
+ DEFINES += -D_GNU_SOURCE
+ # Turn on transparent support for LFS
+ DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+-CCOPTS = -O2
+ WFLAGS := -Wall -Wstrict-prototypes  -Wmissing-prototypes
+ WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2
+ 
+-CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS)
++CFLAGS ?= 
++CFLAGS += $(WFLAGS) -I../include $(DEFINES)
+ YACCFLAGS = -d -t -v
+ 
+ SUBDIRS=lib ip tc bridge misc netem genl tipc man
diff --git a/package/iproute2/patches/patch-ip_iplink_can_c b/package/iproute2/patches/patch-ip_iplink_can_c
index aa1b2e0d7..6201f070f 100644
--- a/package/iproute2/patches/patch-ip_iplink_can_c
+++ b/package/iproute2/patches/patch-ip_iplink_can_c
@@ -1,6 +1,6 @@
---- iproute2-3.10.0.orig/ip/iplink_can.c	2013-07-16 19:06:36.000000000 +0200
-+++ iproute2-3.10.0/ip/iplink_can.c	2013-08-17 15:08:28.418918323 +0200
-@@ -107,7 +107,7 @@ static int can_parse_opt(struct link_uti
+--- iproute2-4.1.0.orig/ip/iplink_can.c	2015-06-26 21:28:25.000000000 +0200
++++ iproute2-4.1.0/ip/iplink_can.c	2015-06-29 08:45:24.000000000 +0200
+@@ -123,7 +123,7 @@ static int can_parse_opt(struct link_uti
  			if (get_u32(&bt.bitrate, *argv, 0))
  				invarg("invalid \"bitrate\" value\n", *argv);
  		} else if (matches(*argv, "sample-point") == 0) {
diff --git a/package/iproute2/patches/patch-tc_tc_stab_c b/package/iproute2/patches/patch-tc_tc_stab_c
index 8640292c8..cbbcf5976 100644
--- a/package/iproute2/patches/patch-tc_tc_stab_c
+++ b/package/iproute2/patches/patch-tc_tc_stab_c
@@ -1,10 +1,10 @@
---- iproute2-3.10.0.orig/tc/tc_stab.c	2013-07-16 19:06:36.000000000 +0200
-+++ iproute2-3.10.0/tc/tc_stab.c	2013-08-17 15:19:18.866741086 +0200
+--- iproute2-4.1.0.orig/tc/tc_stab.c	2015-06-26 21:28:25.000000000 +0200
++++ iproute2-4.1.0/tc/tc_stab.c	2015-06-29 08:45:24.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <syslog.h>
  #include <fcntl.h>
  #include <math.h>
 +#include <sys/param.h>
  #include <sys/socket.h>
+ #include <sys/param.h>
  #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/package/iproute2/patches/patch-tc_tc_util_c b/package/iproute2/patches/patch-tc_tc_util_c
index 8891b17f6..014c2f17d 100644
--- a/package/iproute2/patches/patch-tc_tc_util_c
+++ b/package/iproute2/patches/patch-tc_tc_util_c
@@ -1,10 +1,10 @@
---- iproute2-3.10.0.orig/tc/tc_util.c	2013-07-16 19:06:36.000000000 +0200
-+++ iproute2-3.10.0/tc/tc_util.c	2013-08-17 15:20:53.313553729 +0200
+--- iproute2-4.1.0.orig/tc/tc_util.c	2015-06-26 21:28:25.000000000 +0200
++++ iproute2-4.1.0/tc/tc_util.c	2015-06-29 08:45:24.000000000 +0200
 @@ -15,6 +15,7 @@
  #include <unistd.h>
  #include <syslog.h>
  #include <fcntl.h>
 +#include <sys/param.h>
  #include <sys/socket.h>
+ #include <sys/param.h>
  #include <netinet/in.h>
- #include <arpa/inet.h>