projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iproute2: update to version 4.15.0
[openwrt/staging/chunkeey.git]
/
package
/
network
/
utils
/
iproute2
/
patches
/
300-ip_tiny.patch
diff --git
a/package/network/utils/iproute2/patches/300-ip_tiny.patch
b/package/network/utils/iproute2/patches/300-ip_tiny.patch
index 35b588f7ef5d8deaa653225aa593cd137457d425..d06e91e372b563e129822eb54a3c95baa5586ea2 100644
(file)
--- 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
--- a/ip/Makefile
+++ b/ip/Makefile
-@@ -1
5,6 +15
,13 @@ RTMONOBJ=rtmon.o
+@@ -1
6,6 +16
,13 @@ RTMONOBJ=rtmon.o
include ../config.mk
include ../config.mk
@@
-14,7
+14,7
@@
ALLOBJ=$(IPOBJ) $(RTMONOBJ)
SCRIPTS=ifcfg rtpr routel routef
TARGETS=ip rtmon
ALLOBJ=$(IPOBJ) $(RTMONOBJ)
SCRIPTS=ifcfg rtpr routel routef
TARGETS=ip rtmon
-@@ -4
4,7 +51
,7 @@ else
+@@ -4
5,7 +52
,7 @@ else
ip: static-syms.o
static-syms.o: static-syms.h
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
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
-@@ -4
9,10 +49
,16 @@ static void usage(void)
+@@ -4
8,10 +48
,16 @@ static void usage(void)
fprintf(stderr,
"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
" ip [ -force ] -batch filename\n"
fprintf(stderr,
"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
" ip [ -force ] -batch filename\n"
@@
-42,7
+42,7
@@
" OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
" -h[uman-readable] | -iec |\n"
" -f[amily] { inet | inet6 | ipx | dnet | mpls | bridge | link } |\n"
" OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
" -h[uman-readable] | -iec |\n"
" -f[amily] { inet | inet6 | ipx | dnet | mpls | bridge | link } |\n"
-@@ -7
4,32 +80
,44 @@ static const struct cmd {
+@@ -7
3,32 +79
,44 @@ static const struct cmd {
int (*func)(int argc, char **argv);
} cmds[] = {
{ "address", do_ipaddr },
int (*func)(int argc, char **argv);
} cmds[] = {
{ "address", do_ipaddr },
@@
-89,7
+89,7
@@
{ "help", do_help },
--- a/lib/utils.c
+++ b/lib/utils.c
{ "help", do_help },
--- a/lib/utils.c
+++ b/lib/utils.c
-@@ -8
17,6 +817
,7 @@ const char *rt_addr_n2a_r(int af, int le
+@@ -8
85,6 +885
,7 @@ const char *rt_addr_n2a_r(int af, int le
return inet_ntop(af, addr, buf, buflen);
case AF_MPLS:
return mpls_ntop(af, addr, buf, buflen);
return inet_ntop(af, addr, buf, buflen);
case AF_MPLS:
return mpls_ntop(af, addr, buf, buflen);
@@
-97,7
+97,7
@@
case AF_IPX:
return ipx_ntop(af, addr, buf, buflen);
case AF_DECnet:
case AF_IPX:
return ipx_ntop(af, addr, buf, buflen);
case AF_DECnet:
-@@ -8
26,6 +827
,7 @@ const char *rt_addr_n2a_r(int af, int le
+@@ -8
94,6 +895
,7 @@ const char *rt_addr_n2a_r(int af, int le
memcpy(dna.a_addr, addr, 2);
return dnet_ntop(af, &dna, buf, buflen);
}
memcpy(dna.a_addr, addr, 2);
return dnet_ntop(af, &dna, buf, buflen);
}
@@
-107,7
+107,7
@@
default:
--- a/lib/Makefile
+++ b/lib/Makefile
default:
--- a/lib/Makefile
+++ b/lib/Makefile
-@@ -
2,6 +2
,10 @@ include ../config.mk
+@@ -
3,6 +3
,10 @@ include ../config.mk
CFLAGS += $(FPIC)
CFLAGS += $(FPIC)