iproute2: Update to 4.10.0

5 files changed, 47 insertions, 7 deletions

diff --git a/pkg/iproute2/gen.rc b/pkg/iproute2/gen.rc
index 1b2f2f20..710ce6b0 100644
--- a/pkg/iproute2/gen.rc
+++ b/pkg/iproute2/gen.rc
@@ -11,7 +11,7 @@ lib libnetlink.a lib/^(\
 	\
 	utils.c rt_names.c ll_types.c ll_proto.c ll_addr.c\
 	inet_proto.c namespace.c json_writer.c\
-	names.c color.c\
+	names.c color.c bpf.c exec.c fs.c\
 	(dnet ipx mpls)^_ntop.c (dnet ipx mpls)^_pton.c\
 )
 
@@ -20,12 +20,13 @@ 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_vlan.c link_veth.c link_gre.c iplink_can.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\
 ) libnetlink.a
 
 exe bin/bridge\
diff --git a/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch b/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch
index d753bb1d..0ce4bbf1 100644
--- a/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch
+++ b/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch
@@ -1,4 +1,4 @@
-From bcadf970c7f63973b5a765dcf817da932f29301a Mon Sep 17 00:00:00 2001
+From f502f9dfabf67e118d4d799b09afbddb74f8ab2a Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 25 Apr 2015 17:37:46 +0000
 Subject: [PATCH] Remove redundant linux/in{,6}.h includes
@@ -6,9 +6,10 @@ Subject: [PATCH] Remove redundant linux/in{,6}.h includes
 ---
  include/linux/if_bridge.h | 1 -
  include/linux/if_tunnel.h | 2 --
+ include/linux/l2tp.h      | 2 --
  include/linux/netfilter.h | 2 --
  include/linux/xfrm.h      | 1 -
- 4 files changed, 6 deletions(-)
+ 5 files changed, 8 deletions(-)
 
 diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
 index b7393dd..a7028ab 100644
@@ -36,8 +37,21 @@ index 4f975f5..2680646 100644
  #include <asm/byteorder.h>
  
  
+diff --git a/include/linux/l2tp.h b/include/linux/l2tp.h
+index 8a80007..c1c8546 100644
+--- a/include/linux/l2tp.h
++++ b/include/linux/l2tp.h
+@@ -9,8 +9,6 @@
+ 
+ #include <linux/types.h>
+ #include <linux/socket.h>
+-#include <linux/in.h>
+-#include <linux/in6.h>
+ 
+ #define IPPROTO_L2TP		115
+ 
 diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
-index b71b4c9..3e4e6ae 100644
+index d8bc1e6..f8b48e0 100644
 --- a/include/linux/netfilter.h
 +++ b/include/linux/netfilter.h
 @@ -4,8 +4,6 @@
@@ -62,5 +76,5 @@ index d2dd1fd..8c72966 100644
  
  /* All of the structures in this file may not change size as they are
 -- 
-2.11.0
+2.11.1
 
diff --git a/pkg/iproute2/patch/0002-Add-forward-declaration-of-sockaddr_un.patch b/pkg/iproute2/patch/0002-Add-forward-declaration-of-sockaddr_un.patch
new file mode 100644
index 00000000..c8c54381
--- /dev/null
+++ b/pkg/iproute2/patch/0002-Add-forward-declaration-of-sockaddr_un.patch
@@ -0,0 +1,25 @@
+From de53ffffbdbaeaaf8b70b4930e067e367de644ef Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Wed, 22 Feb 2017 18:45:48 -0800
+Subject: [PATCH] Add forward declaration of sockaddr_un
+
+---
+ include/bpf_scm.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/bpf_scm.h b/include/bpf_scm.h
+index 35117d1..612d17d 100644
+--- a/include/bpf_scm.h
++++ b/include/bpf_scm.h
+@@ -11,6 +11,8 @@
+ #define BPF_SCM_MAX_FDS		ELF_MAX_MAPS
+ #define BPF_SCM_MSG_SIZE	1024
+ 
++struct sockaddr_un;
++
+ struct bpf_elf_st {
+ 	dev_t st_dev;
+ 	ino_t st_ino;
+-- 
+2.11.1
+
diff --git a/pkg/iproute2/rev b/pkg/iproute2/rev
index b8626c4c..7ed6ff82 100644
--- a/pkg/iproute2/rev
+++ b/pkg/iproute2/rev
@@ -1 +1 @@
-4
+5
diff --git a/pkg/iproute2/src b/pkg/iproute2/src
-Subproject ae0969c89351de7f56387d857dc76a98b425809
+Subproject f36ba8a4cdbc8239a6054d35ff00dd387b7fc2f