summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/iproute2/Makefile4
-rw-r--r--package/iproute2/patches/patch-Makefile14
-rw-r--r--package/iproute2/patches/patch-ip_iplink_can_c6
-rw-r--r--package/iproute2/patches/patch-tc_tc_bpf_c10
4 files changed, 12 insertions, 22 deletions
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 699a5804a..718cb035a 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= iproute2
-PKG_VERSION:= 4.5.0
+PKG_VERSION:= 4.9.0
PKG_RELEASE:= 1
-PKG_HASH:= 3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a
+PKG_HASH:= c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4
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
index 36aab123c..42d2fa409 100644
--- a/package/iproute2/patches/patch-Makefile
+++ b/package/iproute2/patches/patch-Makefile
@@ -1,12 +1,12 @@
---- 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
+--- iproute2-4.9.0.orig/Makefile 2016-12-13 00:07:42.000000000 +0100
++++ iproute2-4.9.0/Makefile 2016-12-26 01:29:53.041215929 +0100
+@@ -34,16 +34,16 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
#options for mpls
ADDLIB+=mpls_ntop.o mpls_pton.o
--CC = gcc
+-CC := gcc
+CC ?= gcc
- HOSTCC = gcc
+ HOSTCC ?= $(CC)
DEFINES += -D_GNU_SOURCE
# Turn on transparent support for LFS
DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
@@ -15,8 +15,8 @@
WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2
-CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS)
-+CFLAGS ?=
++CFLAGS ?=
+CFLAGS += $(WFLAGS) -I../include $(DEFINES)
YACCFLAGS = -d -t -v
- SUBDIRS=lib ip tc bridge misc netem genl tipc man
+ SUBDIRS=lib ip tc bridge misc netem genl tipc devlink man
diff --git a/package/iproute2/patches/patch-ip_iplink_can_c b/package/iproute2/patches/patch-ip_iplink_can_c
index 6201f070f..491987005 100644
--- a/package/iproute2/patches/patch-ip_iplink_can_c
+++ b/package/iproute2/patches/patch-ip_iplink_can_c
@@ -1,6 +1,6 @@
---- 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
+--- iproute2-4.9.0.orig/ip/iplink_can.c 2016-12-13 00:07:42.000000000 +0100
++++ iproute2-4.9.0/ip/iplink_can.c 2016-12-26 01:27:39.734025890 +0100
+@@ -119,7 +119,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_bpf_c b/package/iproute2/patches/patch-tc_tc_bpf_c
deleted file mode 100644
index 2d8b7fe66..000000000
--- a/package/iproute2/patches/patch-tc_tc_bpf_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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>