diff --git a/srcpkgs/iproute2/patches/musl.patch b/srcpkgs/iproute2/patches/musl.patch index 5db80d5046e..347d9d96732 100644 --- a/srcpkgs/iproute2/patches/musl.patch +++ b/srcpkgs/iproute2/patches/musl.patch @@ -22,6 +22,17 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. #include +--- include/linux/l2tp.h.orig 2017-02-20 17:47:52.000000000 +0100 ++++ include/linux/l2tp.h 2017-03-01 13:28:13.023515139 +0100 +@@ -9,8 +9,6 @@ + + #include + #include +-#include +-#include + + #define IPPROTO_L2TP 115 + --- include/linux/netfilter.h 2015-09-01 01:31:15.000000000 +0200 +++ include/linux/netfilter.h 2015-09-14 16:27:34.928205553 +0200 @@ -4,8 +4,6 @@ diff --git a/srcpkgs/iproute2/patches/tipc-bearer-missing-def.patch b/srcpkgs/iproute2/patches/tipc-bearer-missing-def.patch deleted file mode 100644 index f37be3eeae0..00000000000 --- a/srcpkgs/iproute2/patches/tipc-bearer-missing-def.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- tipc/bearer.c.orig 2015-06-26 21:28:25.000000000 +0200 -+++ tipc/bearer.c 2015-06-28 09:24:34.836132040 +0200 -@@ -26,6 +26,10 @@ - #include "msg.h" - #include "bearer.h" - -+#ifndef TIPC_MAX_BEARER_NAME -+#define TIPC_MAX_BEARER_NAME 32 -+#endif -+ - static void _print_bearer_opts(void) - { - fprintf(stderr, diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template index 2d40b4b22f4..35ec0456fa8 100644 --- a/srcpkgs/iproute2/template +++ b/srcpkgs/iproute2/template @@ -1,7 +1,7 @@ # Template file for 'iproute2' pkgname=iproute2 -version=4.9.0 -revision=2 +version=4.10.0 +revision=1 hostmakedepends="pkg-config perl flex" makedepends="libfl-devel libmnl-devel db-devel iptables-devel" conf_files=" @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="http://www.linux-foundation.org/en/Net:Iproute2" license="GPL-2" distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz" -checksum=c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4 +checksum=22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8 do_configure() { ./configure