diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-07-28 23:27:35 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-07-28 23:27:35 +0000 |
| commit | 684a833b314fd5a8968e6c081f00d72ae4807a58 (patch) | |
| tree | fb93c2dcfbe68332f71c1250e4eda09369f0ddc0 /package/network/utils/iproute2 | |
| parent | 935131c730c0b38dd9640690c803bb27cb677df9 (diff) | |
| download | upstream-684a833b314fd5a8968e6c081f00d72ae4807a58.tar.gz upstream-684a833b314fd5a8968e6c081f00d72ae4807a58.tar.bz2 upstream-684a833b314fd5a8968e6c081f00d72ae4807a58.zip | |
[package] iproute2: update to 3.10.0
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37590 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/utils/iproute2')
| -rw-r--r-- | package/network/utils/iproute2/Makefile | 8 | ||||
| -rw-r--r-- | package/network/utils/iproute2/patches/006-no_sctp.patch | 2 | ||||
| -rw-r--r-- | package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch | 11 |
3 files changed, 6 insertions, 15 deletions
diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index f42cae9485..1b42517bac 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=3.9.0 -PKG_RELEASE:=3 +PKG_VERSION:=3.10.0 +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ -PKG_MD5SUM:=b53376db94c8d66f9d540c69ed84f13b +PKG_MD5SUM:=45fb5427fc723a0001c72b92c931ba02 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) diff --git a/package/network/utils/iproute2/patches/006-no_sctp.patch b/package/network/utils/iproute2/patches/006-no_sctp.patch index ef642220b3..a3ed890450 100644 --- a/package/network/utils/iproute2/patches/006-no_sctp.patch +++ b/package/network/utils/iproute2/patches/006-no_sctp.patch @@ -8,7 +8,7 @@ case IPPROTO_DCCP: default: /* XXX */ if (sel->sport_mask) -@@ -1273,7 +1272,6 @@ static int xfrm_selector_upspec_parse(st +@@ -1283,7 +1282,6 @@ static int xfrm_selector_upspec_parse(st switch (sel->proto) { case IPPROTO_TCP: case IPPROTO_UDP: diff --git a/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch b/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch index d6c5ccd7b2..7b82933181 100644 --- a/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch +++ b/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch @@ -9,8 +9,6 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY ip/rtm_map.c | 4 ++++ 3 files changed, 9 insertions(+) -diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h -index 51da65b..3420838 100644 --- a/include/linux/fib_rules.h +++ b/include/linux/fib_rules.h @@ -64,6 +64,10 @@ enum { @@ -24,8 +22,6 @@ index 51da65b..3420838 100644 __FR_ACT_MAX, }; -diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h -index 93370bd..cfec9ff 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -203,6 +203,7 @@ enum { @@ -36,11 +32,9 @@ index 93370bd..cfec9ff 100644 __RTN_MAX }; -diff --git a/ip/rtm_map.c b/ip/rtm_map.c -index 21e818b..8ad2d07 100644 --- a/ip/rtm_map.c +++ b/ip/rtm_map.c -@@ -49,6 +49,8 @@ char *rtnl_rtntype_n2a(int id, char *buf, int len) +@@ -49,6 +49,8 @@ char *rtnl_rtntype_n2a(int id, char *buf return "nat"; case RTN_XRESOLVE: return "xresolve"; @@ -58,6 +52,3 @@ index 21e818b..8ad2d07 100644 else { res = strtoul(arg, &end, 0); if (!end || end == arg || *end || res > 255) --- -1.7.10.4 - |