diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-01-17 10:58:22 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-01-17 10:58:22 +0000 |
| commit | 148684bbf45a42ef1ade489eeae96102ba4e1eaa (patch) | |
| tree | fb863e2ecf99df0f2b7657e5b59fc836a09a3807 /package/network/utils/iproute2 | |
| parent | 7a65864344b0515b740f42149d6c24ef0d1c775e (diff) | |
| download | upstream-148684bbf45a42ef1ade489eeae96102ba4e1eaa.tar.gz upstream-148684bbf45a42ef1ade489eeae96102ba4e1eaa.tar.bz2 upstream-148684bbf45a42ef1ade489eeae96102ba4e1eaa.zip | |
iproute2: bump version to 3.18.0
Signed-off-by: Russell Senior <russell@personaltelco.net>
SVN-Revision: 43991
Diffstat (limited to 'package/network/utils/iproute2')
| -rw-r--r-- | package/network/utils/iproute2/Makefile | 6 | ||||
| -rw-r--r-- | package/network/utils/iproute2/patches/300-ip_tiny.patch | 15 |
2 files changed, 11 insertions, 10 deletions
diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 9aea05e80d..a49b0616ea 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2014 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=3.17.0 +PKG_VERSION:=3.18.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ -PKG_MD5SUM:=b741a02c6dda5818d18011d572874493 +PKG_MD5SUM:=6f6ad51a00007880460e103367b16057 PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/iproute2/patches/300-ip_tiny.patch b/package/network/utils/iproute2/patches/300-ip_tiny.patch index 5b0d56c114..36201205d9 100644 --- a/package/network/utils/iproute2/patches/300-ip_tiny.patch +++ b/package/network/utils/iproute2/patches/300-ip_tiny.patch @@ -1,6 +1,6 @@ --- a/ip/Makefile +++ b/ip/Makefile -@@ -15,6 +15,13 @@ ifeq ($(IP_CONFIG_SETNS),y) +@@ -16,6 +16,13 @@ ifeq ($(IP_CONFIG_SETNS),y) CFLAGS += -DHAVE_SETNS endif @@ -14,7 +14,7 @@ ALLOBJ=$(IPOBJ) $(RTMONOBJ) SCRIPTS=ifcfg rtpr routel routef TARGETS=ip rtmon -@@ -42,7 +49,7 @@ else +@@ -43,7 +50,7 @@ else ip: static-syms.o static-syms.o: static-syms.h @@ -25,7 +25,7 @@ sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \ --- a/ip/ip.c +++ b/ip/ip.c -@@ -66,29 +66,41 @@ static const struct cmd { +@@ -69,30 +69,42 @@ static const struct cmd { int (*func)(int argc, char **argv); } cmds[] = { { "address", do_ipaddr }, @@ -44,6 +44,7 @@ { "link", do_iplink }, +#ifndef IPROUTE2_TINY { "l2tp", do_ipl2tp }, + { "fou", do_ipfou }, +#endif { "tunnel", do_iptunnel }, { "tunl", do_iptunnel }, @@ -69,7 +70,7 @@ }; --- a/lib/utils.c +++ b/lib/utils.c -@@ -627,6 +627,7 @@ const char *rt_addr_n2a(int af, int len, +@@ -629,6 +629,7 @@ const char *rt_addr_n2a(int af, const vo case AF_INET: case AF_INET6: return inet_ntop(af, addr, buf, buflen); @@ -77,7 +78,7 @@ case AF_IPX: return ipx_ntop(af, addr, buf, buflen); case AF_DECnet: -@@ -635,6 +636,7 @@ const char *rt_addr_n2a(int af, int len, +@@ -637,6 +638,7 @@ const char *rt_addr_n2a(int af, const vo memcpy(dna.a_addr, addr, 2); return dnet_ntop(af, &dna, buf, buflen); } @@ -85,7 +86,7 @@ default: return "???"; } -@@ -710,6 +712,7 @@ const char *format_host(int af, int len, +@@ -712,6 +714,7 @@ const char *format_host(int af, int len, case AF_INET6: len = 16; break; @@ -93,7 +94,7 @@ case AF_IPX: len = 10; break; -@@ -720,6 +723,7 @@ const char *format_host(int af, int len, +@@ -722,6 +725,7 @@ const char *format_host(int af, int len, len = 2; break; #endif |