iproute2: Update to 4.12.0

4 files changed, 124 insertions, 116 deletions

diff --git a/pkg/iproute2/gen.rc b/pkg/iproute2/gen.rc
index e6ea4127..45b7efb6 100644
--- a/pkg/iproute2/gen.rc
+++ b/pkg/iproute2/gen.rc
@@ -20,14 +20,14 @@ exe bin/ip ip/^(\
 	rtm_map.c iptunnel.c ip6tunnel.c tunnel.c ipneigh.c ipntable.c iplink.c\
 	ipmaddr.c ipmonitor.c ipmroute.c ipprefix.c iptuntap.c iptoken.c\
 	ipxfrm.c xfrm_state.c xfrm_policy.c xfrm_monitor.c iplink_dummy.c\
-	iplink_ifb.c iplink_nlmon.c iplink_team.c iplink_vcan.c\
+	iplink_ifb.c iplink_nlmon.c iplink_team.c iplink_vcan.c iplink_vxcan.c\
 	iplink_vlan.c link_veth.c link_gre.c iplink_can.c iplink_xdp.c\
 	iplink_macvlan.c ipl2tp.c link_vti.c link_vti6.c\
 	iplink_vxlan.c tcp_metrics.c iplink_ipoib.c ipnetconf.c link_ip6tnl.c\
 	link_iptnl.c link_gre6.c iplink_bond.c iplink_bond_slave.c iplink_hsr.c\
 	iplink_bridge.c iplink_bridge_slave.c ipfou.c iplink_ipvlan.c\
 	iplink_geneve.c iplink_vrf.c iproute_lwtunnel.c ipmacsec.c ipila.c\
-	ipvrf.c iplink_xstats.c\
+	ipvrf.c iplink_xstats.c ipseg6.c\
 ) libnetlink.a
 
 exe bin/bridge\
@@ -42,7 +42,7 @@ man=(\
 	bridge ip ss\
 	ip-^(\
                 addrlabel fou gue l2tp macsec maddress monitor mroute neighbour\
-                netconf netns ntable rule tcp_metrics token tunnel xfrm\
+                netconf netns ntable rule sr tcp_metrics token tunnel vrf xfrm\
 	)\
 ) man -d man man8/$man.8
 for(man in ip-address ip-link ip-route) {
diff --git a/pkg/iproute2/patch/0001-Fix-includes-for-musl-libc.patch b/pkg/iproute2/patch/0001-Fix-includes-for-musl-libc.patch
index d9939593..8253cdd2 100644
--- 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 0cdf1fd3c9b10f36e9d845457e11adcbf737475d Mon Sep 17 00:00:00 2001
+From b4460f2a5f5a8d3fcc1edc502a18d47c31e76c2d 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
@@ -9,30 +9,34 @@ Subject: [PATCH] Fix includes for musl libc
  bridge/mdb.c               | 1 -
  bridge/vlan.c              | 1 -
  include/linux/if_bridge.h  | 4 ++--
- include/linux/if_tunnel.h  | 2 --
+ include/linux/if_tunnel.h  | 4 ++--
  include/linux/ip6_tunnel.h | 2 --
  include/linux/l2tp.h       | 2 --
- include/linux/netfilter.h  | 3 ---
+ include/linux/seg6.h       | 1 -
  include/linux/xfrm.h       | 1 -
- ip/ip6tunnel.c             | 4 ++--
+ ip/ip6tunnel.c             | 3 +--
  ip/ipaddress.c             | 4 ++--
  ip/ipl2tp.c                | 2 --
  ip/ipmaddr.c               | 4 +---
  ip/ipmroute.c              | 3 ---
  ip/iprule.c                | 2 +-
+ ip/ipseg6.c                | 1 -
  ip/iptoken.c               | 2 +-
  ip/iptuntap.c              | 2 +-
+ ip/link_gre.c              | 1 -
+ ip/link_iptnl.c            | 1 -
  ip/tcp_metrics.c           | 1 -
- ip/tunnel.c                | 2 +-
+ ip/tunnel.c                | 1 -
+ ip/xfrm.h                  | 1 -
  lib/ll_addr.c              | 3 +--
  lib/ll_proto.c             | 3 +--
  lib/ll_types.c             | 3 +--
  lib/utils.c                | 2 +-
  misc/ss.c                  | 1 -
- 25 files changed, 16 insertions(+), 41 deletions(-)
+ 29 files changed, 16 insertions(+), 43 deletions(-)
 
 diff --git a/bridge/fdb.c b/bridge/fdb.c
-index a71a78f2..cf947dd3 100644
+index a71a78f..cf947dd 100644
 --- a/bridge/fdb.c
 +++ b/bridge/fdb.c
 @@ -17,7 +17,6 @@
@@ -44,21 +48,20 @@ index a71a78f2..cf947dd3 100644
  #include <string.h>
  #include <limits.h>
 diff --git a/bridge/link.c b/bridge/link.c
-index 93472ad3..5183a737 100644
+index 93472ad..ec2f67f 100644
 --- a/bridge/link.c
 +++ b/bridge/link.c
-@@ -5,8 +5,8 @@
- #include <time.h>
+@@ -6,7 +6,7 @@
  #include <sys/socket.h>
  #include <sys/time.h>
-+#include <net/if.h>
  #include <netinet/in.h>
 -#include <linux/if.h>
++#include <net/if.h>
  #include <linux/if_bridge.h>
  #include <string.h>
  #include <stdbool.h>
 diff --git a/bridge/mdb.c b/bridge/mdb.c
-index e60ff3ef..540f6736 100644
+index e60ff3e..540f673 100644
 --- a/bridge/mdb.c
 +++ b/bridge/mdb.c
 @@ -10,7 +10,6 @@
@@ -70,7 +73,7 @@ index e60ff3ef..540f6736 100644
  #include <arpa/inet.h>
  
 diff --git a/bridge/vlan.c b/bridge/vlan.c
-index ebcdacee..12c642f4 100644
+index ebcdace..12c642f 100644
 --- a/bridge/vlan.c
 +++ b/bridge/vlan.c
 @@ -6,7 +6,6 @@
@@ -82,7 +85,7 @@ index ebcdacee..12c642f4 100644
  #include <string.h>
  
 diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
-index 156f4434..de3b34ba 100644
+index 156f443..de3b34b 100644
 --- a/include/linux/if_bridge.h
 +++ b/include/linux/if_bridge.h
 @@ -13,9 +13,9 @@
@@ -98,12 +101,15 @@ index 156f4434..de3b34ba 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 4f975f57..26806468 100644
+index 7375335..b92e050 100644
 --- a/include/linux/if_tunnel.h
 +++ b/include/linux/if_tunnel.h
-@@ -2,9 +2,7 @@
+@@ -1,10 +1,10 @@
+ #ifndef _IF_TUNNEL_H_
  #define _IF_TUNNEL_H_
  
++#include <net/if.h>
++
  #include <linux/types.h>
 -#include <linux/if.h>
  #include <linux/ip.h>
@@ -112,7 +118,7 @@ index 4f975f57..26806468 100644
  
  
 diff --git a/include/linux/ip6_tunnel.h b/include/linux/ip6_tunnel.h
-index 425926c4..48af63c9 100644
+index 425926c..48af63c 100644
 --- a/include/linux/ip6_tunnel.h
 +++ b/include/linux/ip6_tunnel.h
 @@ -2,8 +2,6 @@
@@ -125,7 +131,7 @@ index 425926c4..48af63c9 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 8a80007b..c1c85461 100644
+index 8a80007..c1c8546 100644
 --- a/include/linux/l2tp.h
 +++ b/include/linux/l2tp.h
 @@ -9,8 +9,6 @@
@@ -137,22 +143,20 @@ index 8a80007b..c1c85461 100644
  
  #define IPPROTO_L2TP		115
  
-diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
-index ff4a4a52..fac7c0a5 100644
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -3,9 +3,6 @@
+diff --git a/include/linux/seg6.h b/include/linux/seg6.h
+index 0715279..7278806 100644
+--- a/include/linux/seg6.h
++++ b/include/linux/seg6.h
+@@ -15,7 +15,6 @@
+ #define _LINUX_SEG6_H
  
  #include <linux/types.h>
+-#include <linux/in6.h>		/* For struct in6_addr. */
  
--#include <linux/in.h>
--#include <linux/in6.h>
--
- /* Responses from hook functions. */
- #define NF_DROP 0
- #define NF_ACCEPT 1
+ /*
+  * SRH
 diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
-index d2dd1fd6..8c729669 100644
+index 3af99e0..2e92295 100644
 --- a/include/linux/xfrm.h
 +++ b/include/linux/xfrm.h
 @@ -1,7 +1,6 @@
@@ -164,19 +168,14 @@ index d2dd1fd6..8c729669 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 b4a7def1..31606e9b 100644
+index b4a7def..99c338b 100644
 --- a/ip/ip6tunnel.c
 +++ b/ip/ip6tunnel.c
-@@ -23,13 +23,13 @@
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <net/if.h>
-+#include <net/if_arp.h>
- #include <sys/types.h>
+@@ -27,9 +27,8 @@
  #include <sys/socket.h>
  #include <arpa/inet.h>
  #include <sys/ioctl.h>
++#include <net/if_arp.h>
  #include <linux/ip.h>
 -#include <linux/if.h>
 -#include <linux/if_arp.h>
@@ -184,19 +183,15 @@ index b4a7def1..31606e9b 100644
  #include <linux/ip6_tunnel.h>
  
 diff --git a/ip/ipaddress.c b/ip/ipaddress.c
-index b8d9c7d9..b468fecb 100644
+index 4900dce..4578db3 100644
 --- a/ip/ipaddress.c
 +++ b/ip/ipaddress.c
-@@ -21,13 +21,13 @@
- #include <sys/ioctl.h>
- #include <sys/param.h>
- #include <errno.h>
-+#include <net/if.h>
- #include <netinet/in.h>
-+#include <netinet/if_ether.h>
+@@ -25,9 +25,9 @@
  #include <arpa/inet.h>
  #include <string.h>
  #include <fnmatch.h>
++#include <net/if.h>
++#include <netinet/if_ether.h>
  
 -#include <linux/netdevice.h>
 -#include <linux/if_arp.h>
@@ -204,7 +199,7 @@ index b8d9c7d9..b468fecb 100644
  #include <linux/net_namespace.h>
  
 diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c
-index 88664c90..1334320d 100644
+index 88664c9..1334320 100644
 --- a/ip/ipl2tp.c
 +++ b/ip/ipl2tp.c
 @@ -19,8 +19,6 @@
@@ -217,17 +212,14 @@ index 88664c90..1334320d 100644
  
  #include <linux/genetlink.h>
 diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c
-index 4f726fdd..693750e4 100644
+index 4f726fd..67cc337 100644
 --- a/ip/ipmaddr.c
 +++ b/ip/ipmaddr.c
-@@ -17,13 +17,11 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-+#include <net/if.h>
+@@ -20,10 +20,8 @@
  #include <netinet/in.h>
  #include <arpa/inet.h>
  #include <string.h>
++#include <net/if.h>
  
 -#include <linux/netdevice.h>
 -#include <linux/if.h>
@@ -236,7 +228,7 @@ index 4f726fdd..693750e4 100644
  
  #include "rt_names.h"
 diff --git a/ip/ipmroute.c b/ip/ipmroute.c
-index 84950037..fc7ae2ee 100644
+index b51c23c..2f2a5a9 100644
 --- a/ip/ipmroute.c
 +++ b/ip/ipmroute.c
 @@ -22,9 +22,6 @@
@@ -250,58 +242,82 @@ index 84950037..fc7ae2ee 100644
  
  #include <rt_names.h>
 diff --git a/ip/iprule.c b/ip/iprule.c
-index 8313138d..5758626c 100644
+index 8313138..2ef0d8d 100644
 --- a/ip/iprule.c
 +++ b/ip/iprule.c
-@@ -16,11 +16,11 @@
- #include <syslog.h>
- #include <fcntl.h>
- #include <sys/socket.h>
-+#include <net/if.h>
- #include <netinet/in.h>
+@@ -20,7 +20,7 @@
  #include <netinet/ip.h>
  #include <arpa/inet.h>
  #include <string.h>
 -#include <linux/if.h>
++#include <net/if.h>
  #include <linux/fib_rules.h>
  #include <errno.h>
  
+diff --git a/ip/ipseg6.c b/ip/ipseg6.c
+index a8f5c69..5c791a6 100644
+--- a/ip/ipseg6.c
++++ b/ip/ipseg6.c
+@@ -17,7 +17,6 @@
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <sys/ioctl.h>
+-#include <linux/if.h>
+ 
+ #include <linux/genetlink.h>
+ #include <linux/seg6_genl.h>
 diff --git a/ip/iptoken.c b/ip/iptoken.c
-index 1869f764..9fcfd3d6 100644
+index 1869f76..daf2dc6 100644
 --- a/ip/iptoken.c
 +++ b/ip/iptoken.c
-@@ -17,11 +17,11 @@
- #include <fcntl.h>
- #include <string.h>
- #include <sys/socket.h>
-+#include <net/if.h>
- #include <netinet/in.h>
+@@ -21,7 +21,7 @@
  #include <netinet/ip.h>
  #include <arpa/inet.h>
  #include <linux/types.h>
 -#include <linux/if.h>
++#include <net/if.h>
  
  #include "rt_names.h"
  #include "utils.h"
 diff --git a/ip/iptuntap.c b/ip/iptuntap.c
-index 451f7f0e..b1f0eefb 100644
+index 451f7f0..e79d2ca 100644
 --- a/ip/iptuntap.c
 +++ b/ip/iptuntap.c
-@@ -14,11 +14,11 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <net/if.h>
- #include <sys/types.h>
+@@ -18,7 +18,7 @@
  #include <sys/socket.h>
  #include <arpa/inet.h>
  #include <sys/ioctl.h>
 -#include <linux/if.h>
++#include <net/if.h>
  #include <linux/if_tun.h>
  #include <pwd.h>
  #include <grp.h>
+diff --git a/ip/link_gre.c b/ip/link_gre.c
+index 82df900..9fd9070 100644
+--- a/ip/link_gre.c
++++ b/ip/link_gre.c
+@@ -16,7 +16,6 @@
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ 
+-#include <linux/ip.h>
+ #include <linux/if_tunnel.h>
+ #include "rt_names.h"
+ #include "utils.h"
+diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
+index d24e737..2a3ebfd 100644
+--- a/ip/link_iptnl.c
++++ b/ip/link_iptnl.c
+@@ -16,7 +16,6 @@
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ 
+-#include <linux/in.h>
+ #include <linux/ip.h>
+ #include <linux/if_tunnel.h>
+ #include "rt_names.h"
 diff --git a/ip/tcp_metrics.c b/ip/tcp_metrics.c
-index 8972acd0..2f3706a1 100644
+index 8972acd..2f3706a 100644
 --- a/ip/tcp_metrics.c
 +++ b/ip/tcp_metrics.c
 @@ -17,7 +17,6 @@
@@ -313,15 +329,10 @@ index 8972acd0..2f3706a1 100644
  #include <linux/genetlink.h>
  #include <linux/tcp_metrics.h>
 diff --git a/ip/tunnel.c b/ip/tunnel.c
-index 7956d71a..a8ea1de2 100644
+index d359eb9..c95632c 100644
 --- a/ip/tunnel.c
 +++ b/ip/tunnel.c
-@@ -26,11 +26,11 @@
- #include <string.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <net/if.h>
- #include <sys/types.h>
+@@ -30,7 +30,6 @@
  #include <sys/socket.h>
  #include <sys/ioctl.h>
  #include <netinet/in.h>
@@ -329,18 +340,27 @@ index 7956d71a..a8ea1de2 100644
  #include <linux/ip.h>
  #include <linux/if_tunnel.h>
  
+diff --git a/ip/xfrm.h b/ip/xfrm.h
+index 54d80ce..1fc0082 100644
+--- a/ip/xfrm.h
++++ b/ip/xfrm.h
+@@ -26,7 +26,6 @@
+ 
+ #include <stdio.h>
+ #include <sys/socket.h>
+-#include <linux/in.h>
+ #include <linux/xfrm.h>
+ #include <linux/ipsec.h>
+ 
 diff --git a/lib/ll_addr.c b/lib/ll_addr.c
-index 465ed6fa..6a14817b 100644
+index 465ed6f..e55b9a8 100644
 --- a/lib/ll_addr.c
 +++ b/lib/ll_addr.c
-@@ -17,12 +17,11 @@
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-+#include <net/if_arp.h>
+@@ -20,9 +20,8 @@
  #include <netinet/in.h>
  #include <arpa/inet.h>
  #include <string.h>
++#include <net/if_arp.h>
  
 -#include <linux/netdevice.h>
 -#include <linux/if_arp.h>
@@ -348,16 +368,14 @@ index 465ed6fa..6a14817b 100644
  
  #include "rt_names.h"
 diff --git a/lib/ll_proto.c b/lib/ll_proto.c
-index e094d9f8..79edb569 100644
+index e094d9f..2c8a101 100644
 --- a/lib/ll_proto.c
 +++ b/lib/ll_proto.c
-@@ -18,11 +18,10 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
+@@ -20,9 +20,8 @@
  #include <netinet/in.h>
-+#include <netinet/if_ether.h>
  #include <arpa/inet.h>
  #include <string.h>
++#include <netinet/if_ether.h>
  
 -#include <linux/netdevice.h>
 -#include <linux/if_arp.h>
@@ -365,17 +383,14 @@ index e094d9f8..79edb569 100644
  
  #include "utils.h"
 diff --git a/lib/ll_types.c b/lib/ll_types.c
-index eca617f3..4091a9cb 100644
+index eca617f..404ea56 100644
 --- a/lib/ll_types.c
 +++ b/lib/ll_types.c
-@@ -17,12 +17,11 @@
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-+#include <net/if_arp.h>
+@@ -20,9 +20,8 @@
  #include <netinet/in.h>
  #include <arpa/inet.h>
  #include <string.h>
++#include <net/if_arp.h>
  
 -#include <linux/netdevice.h>
 -#include <linux/if_arp.h>
@@ -383,27 +398,20 @@ index eca617f3..4091a9cb 100644
  
  #include "rt_names.h"
 diff --git a/lib/utils.c b/lib/utils.c
-index 6d5642f4..e03c0757 100644
+index e77bd30..f4c11ad 100644
 --- a/lib/utils.c
 +++ b/lib/utils.c
-@@ -18,6 +18,7 @@
- #include <fcntl.h>
- #include <limits.h>
- #include <sys/socket.h>
-+#include <net/if_arp.h>
- #include <netinet/in.h>
- #include <string.h>
- #include <netdb.h>
-@@ -25,7 +26,6 @@
+@@ -25,7 +25,7 @@
  #include <asm/types.h>
  #include <linux/pkt_sched.h>
  #include <linux/param.h>
 -#include <linux/if_arp.h>
++#include <net/if_arp.h>
  #include <linux/mpls.h>
  #include <time.h>
  #include <sys/time.h>
 diff --git a/misc/ss.c b/misc/ss.c
-index 12763c9f..9ff78392 100644
+index 12763c9..9ff7839 100644
 --- a/misc/ss.c
 +++ b/misc/ss.c
 @@ -39,7 +39,6 @@
@@ -415,5 +423,5 @@ index 12763c9f..9ff78392 100644
  #include <linux/packet_diag.h>
  #include <linux/netlink_diag.h>
 -- 
-2.12.2
+2.13.2
 
diff --git a/pkg/iproute2/rev b/pkg/iproute2/rev
index 1e8b3149..7f8f011e 100644
--- a/pkg/iproute2/rev
+++ b/pkg/iproute2/rev
@@ -1 +1 @@
-6
+7
diff --git a/pkg/iproute2/src b/pkg/iproute2/src
-Subproject cbc7929b214be7fbb5119c7690f93f7e54deeee
+Subproject cdb90ce40652b6da7031a7e9e4fe8dddc541fe5