diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-04-20 06:26:09 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-04-20 06:26:09 +0000 |
| commit | 38519cad0ba2b557b9aefb9717ba91840c706760 (patch) | |
| tree | ea847bb00638f927eed93362ba530e8ebf27bce8 /package/network/utils/iproute2/patches/300-ip_tiny.patch | |
| parent | 610ce30c3a4a0e9d833a1b4d2bb46aa62a6731b3 (diff) | |
| download | upstream-38519cad0ba2b557b9aefb9717ba91840c706760.tar.gz upstream-38519cad0ba2b557b9aefb9717ba91840c706760.tar.bz2 upstream-38519cad0ba2b557b9aefb9717ba91840c706760.zip | |
iproute2: update to v4.0.0
The most significant change from the previous version is the trimming of
the 300-ip_tiny.patch to lib/utils.c where a section previously patched
had vanished. That section of the patch was removed.
Built and lightly tested on ar71xx against uClibc and musl.
Signed-off-by: Russell Senior <russell@personaltelco.net>
SVN-Revision: 45512
Diffstat (limited to 'package/network/utils/iproute2/patches/300-ip_tiny.patch')
| -rw-r--r-- | package/network/utils/iproute2/patches/300-ip_tiny.patch | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/package/network/utils/iproute2/patches/300-ip_tiny.patch b/package/network/utils/iproute2/patches/300-ip_tiny.patch index 4295d0aae9..14518dce1c 100644 --- a/package/network/utils/iproute2/patches/300-ip_tiny.patch +++ b/package/network/utils/iproute2/patches/300-ip_tiny.patch @@ -70,7 +70,7 @@ }; --- a/lib/utils.c +++ b/lib/utils.c -@@ -630,6 +630,7 @@ const char *rt_addr_n2a(int af, const vo +@@ -642,6 +642,7 @@ const char *rt_addr_n2a(int af, const vo case AF_INET: case AF_INET6: return inet_ntop(af, addr, buf, buflen); @@ -78,7 +78,7 @@ case AF_IPX: return ipx_ntop(af, addr, buf, buflen); case AF_DECnet: -@@ -638,6 +639,7 @@ const char *rt_addr_n2a(int af, const vo +@@ -650,6 +651,7 @@ const char *rt_addr_n2a(int af, const vo memcpy(dna.a_addr, addr, 2); return dnet_ntop(af, &dna, buf, buflen); } @@ -86,22 +86,6 @@ default: return "???"; } -@@ -713,6 +715,7 @@ const char *format_host(int af, int len, - case AF_INET6: - len = 16; - break; -+#ifndef IPROUTE2_TINY - case AF_IPX: - len = 10; - break; -@@ -723,6 +726,7 @@ const char *format_host(int af, int len, - len = 2; - break; - #endif -+#endif - default: ; - } - } --- a/lib/Makefile +++ b/lib/Makefile @@ -4,6 +4,10 @@ ifeq ($(IP_CONFIG_SETNS),y) @@ -114,4 +98,4 @@ + CFLAGS += $(FPIC) - UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o namespace.o + UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o namespace.o \ |