logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: a70e224bd9c90b871b5e73ccb1b08fa4c306dccc
parent 824f7b249d3142ce078c1295e6e41a8ebe5c6ad2
Author: Michael Forney <mforney@mforney.org>
Date:   Thu,  7 Sep 2017 01:11:56 -0700

iproute2: Update to 4.13.0

Diffstat:

Mpkg/iproute2/patch/0001-Fix-includes-for-musl-libc.patch70+++++++++++++++++++++++++++++++++++-----------------------------------
Mpkg/iproute2/rev2+-
2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/pkg/iproute2/patch/0001-Fix-includes-for-musl-libc.patch b/pkg/iproute2/patch/0001-Fix-includes-for-musl-libc.patch @@ -1,4 +1,4 @@ -From b4460f2a5f5a8d3fcc1edc502a18d47c31e76c2d Mon Sep 17 00:00:00 2001 +From 135e89e0498b5249efb857a143133c497024254c Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 25 Apr 2015 17:37:46 +0000 Subject: [PATCH] Fix includes for musl libc @@ -36,7 +36,7 @@ Subject: [PATCH] Fix includes for musl libc 29 files changed, 16 insertions(+), 43 deletions(-) diff --git a/bridge/fdb.c b/bridge/fdb.c -index a71a78f..cf947dd 100644 +index e5cebf9b..0710af8b 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -17,7 +17,6 @@ @@ -48,7 +48,7 @@ index a71a78f..cf947dd 100644 #include <string.h> #include <limits.h> diff --git a/bridge/link.c b/bridge/link.c -index 93472ad..ec2f67f 100644 +index 93472ad3..ec2f67f2 100644 --- a/bridge/link.c +++ b/bridge/link.c @@ -6,7 +6,7 @@ @@ -61,7 +61,7 @@ index 93472ad..ec2f67f 100644 #include <string.h> #include <stdbool.h> diff --git a/bridge/mdb.c b/bridge/mdb.c -index e60ff3e..540f673 100644 +index e60ff3ef..540f6736 100644 --- a/bridge/mdb.c +++ b/bridge/mdb.c @@ -10,7 +10,6 @@ @@ -73,7 +73,7 @@ index e60ff3e..540f673 100644 #include <arpa/inet.h> diff --git a/bridge/vlan.c b/bridge/vlan.c -index ebcdace..12c642f 100644 +index ebcdacee..12c642f4 100644 --- a/bridge/vlan.c +++ b/bridge/vlan.c @@ -6,7 +6,6 @@ @@ -85,7 +85,7 @@ index ebcdace..12c642f 100644 #include <string.h> diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h -index 156f443..de3b34b 100644 +index 156f4434..de3b34ba 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -13,9 +13,9 @@ @@ -101,7 +101,7 @@ index 156f443..de3b34b 100644 #define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_FDB "brforward" diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h -index 7375335..b92e050 100644 +index 7375335a..b92e0504 100644 --- a/include/linux/if_tunnel.h +++ b/include/linux/if_tunnel.h @@ -1,10 +1,10 @@ @@ -118,7 +118,7 @@ index 7375335..b92e050 100644 diff --git a/include/linux/ip6_tunnel.h b/include/linux/ip6_tunnel.h -index 425926c..48af63c 100644 +index 425926c4..48af63c9 100644 --- a/include/linux/ip6_tunnel.h +++ b/include/linux/ip6_tunnel.h @@ -2,8 +2,6 @@ @@ -131,7 +131,7 @@ index 425926c..48af63c 100644 #define IPV6_TLV_TNL_ENCAP_LIMIT 4 #define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4 diff --git a/include/linux/l2tp.h b/include/linux/l2tp.h -index 8a80007..c1c8546 100644 +index 8a80007b..c1c85461 100644 --- a/include/linux/l2tp.h +++ b/include/linux/l2tp.h @@ -9,8 +9,6 @@ @@ -144,7 +144,7 @@ index 8a80007..c1c8546 100644 #define IPPROTO_L2TP 115 diff --git a/include/linux/seg6.h b/include/linux/seg6.h -index 0715279..7278806 100644 +index 07152792..7278806f 100644 --- a/include/linux/seg6.h +++ b/include/linux/seg6.h @@ -15,7 +15,6 @@ @@ -156,7 +156,7 @@ index 0715279..7278806 100644 /* * SRH diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h -index 3af99e0..2e92295 100644 +index 3af99e02..2e922959 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h @@ -1,7 +1,6 @@ @@ -168,7 +168,7 @@ index 3af99e0..2e92295 100644 /* All of the structures in this file may not change size as they are diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c -index b4a7def..99c338b 100644 +index b4a7def1..99c338bc 100644 --- a/ip/ip6tunnel.c +++ b/ip/ip6tunnel.c @@ -27,9 +27,8 @@ @@ -183,10 +183,10 @@ index b4a7def..99c338b 100644 #include <linux/ip6_tunnel.h> diff --git a/ip/ipaddress.c b/ip/ipaddress.c -index 4900dce..4578db3 100644 +index dbdd839c..bb9557b7 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c -@@ -25,9 +25,9 @@ +@@ -24,9 +24,9 @@ #include <arpa/inet.h> #include <string.h> #include <fnmatch.h> @@ -199,7 +199,7 @@ index 4900dce..4578db3 100644 #include <linux/net_namespace.h> diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c -index 88664c9..1334320 100644 +index 88664c90..1334320d 100644 --- a/ip/ipl2tp.c +++ b/ip/ipl2tp.c @@ -19,8 +19,6 @@ @@ -212,7 +212,7 @@ index 88664c9..1334320 100644 #include <linux/genetlink.h> diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c -index 4f726fd..67cc337 100644 +index 85a69e77..0c2b01a5 100644 --- a/ip/ipmaddr.c +++ b/ip/ipmaddr.c @@ -20,10 +20,8 @@ @@ -228,7 +228,7 @@ index 4f726fd..67cc337 100644 #include "rt_names.h" diff --git a/ip/ipmroute.c b/ip/ipmroute.c -index b51c23c..2f2a5a9 100644 +index b51c23cc..2f2a5a9a 100644 --- a/ip/ipmroute.c +++ b/ip/ipmroute.c @@ -22,9 +22,6 @@ @@ -242,7 +242,7 @@ index b51c23c..2f2a5a9 100644 #include <rt_names.h> diff --git a/ip/iprule.c b/ip/iprule.c -index 8313138..2ef0d8d 100644 +index 8313138d..2ef0d8d9 100644 --- a/ip/iprule.c +++ b/ip/iprule.c @@ -20,7 +20,7 @@ @@ -255,7 +255,7 @@ index 8313138..2ef0d8d 100644 #include <errno.h> diff --git a/ip/ipseg6.c b/ip/ipseg6.c -index a8f5c69..5c791a6 100644 +index a8f5c691..5c791a64 100644 --- a/ip/ipseg6.c +++ b/ip/ipseg6.c @@ -17,7 +17,6 @@ @@ -267,7 +267,7 @@ index a8f5c69..5c791a6 100644 #include <linux/genetlink.h> #include <linux/seg6_genl.h> diff --git a/ip/iptoken.c b/ip/iptoken.c -index 1869f76..daf2dc6 100644 +index 1869f764..daf2dc66 100644 --- a/ip/iptoken.c +++ b/ip/iptoken.c @@ -21,7 +21,7 @@ @@ -280,7 +280,7 @@ index 1869f76..daf2dc6 100644 #include "rt_names.h" #include "utils.h" diff --git a/ip/iptuntap.c b/ip/iptuntap.c -index 451f7f0..e79d2ca 100644 +index 451f7f0e..e79d2ca5 100644 --- a/ip/iptuntap.c +++ b/ip/iptuntap.c @@ -18,7 +18,7 @@ @@ -293,7 +293,7 @@ index 451f7f0..e79d2ca 100644 #include <pwd.h> #include <grp.h> diff --git a/ip/link_gre.c b/ip/link_gre.c -index 82df900..9fd9070 100644 +index c2ec5f26..acff5ad3 100644 --- a/ip/link_gre.c +++ b/ip/link_gre.c @@ -16,7 +16,6 @@ @@ -305,7 +305,7 @@ index 82df900..9fd9070 100644 #include "rt_names.h" #include "utils.h" diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c -index d24e737..2a3ebfd 100644 +index d24e7376..2a3ebfd9 100644 --- a/ip/link_iptnl.c +++ b/ip/link_iptnl.c @@ -16,7 +16,6 @@ @@ -317,7 +317,7 @@ index d24e737..2a3ebfd 100644 #include <linux/if_tunnel.h> #include "rt_names.h" diff --git a/ip/tcp_metrics.c b/ip/tcp_metrics.c -index 8972acd..2f3706a 100644 +index 8972acd0..2f3706a1 100644 --- a/ip/tcp_metrics.c +++ b/ip/tcp_metrics.c @@ -17,7 +17,6 @@ @@ -329,7 +329,7 @@ index 8972acd..2f3706a 100644 #include <linux/genetlink.h> #include <linux/tcp_metrics.h> diff --git a/ip/tunnel.c b/ip/tunnel.c -index d359eb9..c95632c 100644 +index d359eb95..c95632ce 100644 --- a/ip/tunnel.c +++ b/ip/tunnel.c @@ -30,7 +30,6 @@ @@ -341,7 +341,7 @@ index d359eb9..c95632c 100644 #include <linux/if_tunnel.h> diff --git a/ip/xfrm.h b/ip/xfrm.h -index 54d80ce..1fc0082 100644 +index 54d80ce5..1fc0082b 100644 --- a/ip/xfrm.h +++ b/ip/xfrm.h @@ -26,7 +26,6 @@ @@ -353,10 +353,10 @@ index 54d80ce..1fc0082 100644 #include <linux/ipsec.h> diff --git a/lib/ll_addr.c b/lib/ll_addr.c -index 465ed6f..e55b9a8 100644 +index 5b5caf3d..63ba255b 100644 --- a/lib/ll_addr.c +++ b/lib/ll_addr.c -@@ -20,9 +20,8 @@ +@@ -19,9 +19,8 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <string.h> @@ -368,10 +368,10 @@ index 465ed6f..e55b9a8 100644 #include "rt_names.h" diff --git a/lib/ll_proto.c b/lib/ll_proto.c -index e094d9f..2c8a101 100644 +index ef5a5b7b..63b14411 100644 --- a/lib/ll_proto.c +++ b/lib/ll_proto.c -@@ -20,9 +20,8 @@ +@@ -19,9 +19,8 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <string.h> @@ -383,10 +383,10 @@ index e094d9f..2c8a101 100644 #include "utils.h" diff --git a/lib/ll_types.c b/lib/ll_types.c -index eca617f..404ea56 100644 +index 8f294515..8edbbb7b 100644 --- a/lib/ll_types.c +++ b/lib/ll_types.c -@@ -20,9 +20,8 @@ +@@ -19,9 +19,8 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <string.h> @@ -398,7 +398,7 @@ index eca617f..404ea56 100644 #include "rt_names.h" diff --git a/lib/utils.c b/lib/utils.c -index e77bd30..f4c11ad 100644 +index 330ab073..d2939c54 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -25,7 +25,7 @@ @@ -411,7 +411,7 @@ index e77bd30..f4c11ad 100644 #include <time.h> #include <sys/time.h> diff --git a/misc/ss.c b/misc/ss.c -index 12763c9..9ff7839 100644 +index dd8dfaa4..7938d1ae 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -39,7 +39,6 @@ @@ -423,5 +423,5 @@ index 12763c9..9ff7839 100644 #include <linux/packet_diag.h> #include <linux/netlink_diag.h> -- -2.13.2 +2.14.1 diff --git a/pkg/iproute2/rev b/pkg/iproute2/rev @@ -1 +1 @@ -7 +8