main/iproute2: upgrade to 4.10

* Modernize abuild
* Update musl-fixes.patch

2 files changed, 33 insertions, 31 deletions

diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD
index 91094056460..686a0cf438c 100644
--- a/main/iproute2/APKBUILD
+++ b/main/iproute2/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iproute2
-pkgver=4.9.0
+pkgver=4.10.0
 _realver=$pkgver
 pkgrel=0
 pkgdesc="IP Routing Utilities"
@@ -13,16 +13,11 @@ makedepends="bison flex bash iptables-dev libelf-dev"
 subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
 source="http://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz
 	musl-fixes.patch"
+builddir="$srcdir"/$pkgname-$_realver
 
-_builddir="$srcdir"/$pkgname-$_realver
 prepare() {
-	cd "$_builddir"
-	local i
-	for i in $source; do
-		case $i in
-		*.patch) msg "$i";  patch -p0 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare || return 1
+	cd "$builddir"
 
 	sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
 	sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h || return 1
@@ -31,7 +26,7 @@ prepare() {
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -44,7 +39,7 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install || return 1
 }
 
@@ -60,9 +55,5 @@ bashcomp() {
 	rmdir -p "$pkgdir"/usr/share 2>/dev/null || true
 }
 
-md5sums="44a8371a4b2c40e48e4c9f98cbd41391  iproute2-4.9.0.tar.xz
-ea8ff3227b0b90717e305e0cdd7c158f  musl-fixes.patch"
-sha256sums="c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4  iproute2-4.9.0.tar.xz
-57678dafb510bf1797240d0713d173c9aa2f7bf137471fe490d07daaf68dd5f7  musl-fixes.patch"
-sha512sums="0d974d7c001eac75def0d90b628e432d9847024843d02a6cd27266ff30e3f7a9c874fa91115da74db5f321c2e815b486a847059ca6df3aa8ea49432ffa39a889  iproute2-4.9.0.tar.xz
-bb8f1f76e0f0a33785ee884b05ad8242780f2069dd9362624ec03b9952d567cac612febd9928b59fd489d5032fb97f179de13676c044cc533cf5280de932ce86  musl-fixes.patch"
+sha512sums="e54477e167455e7ef5da4adc168d63eaa96091b63dc987fffe918cbb005eceed18a62283ca99ee2512dc0e960f47ae21b39ffbe399c1612fd9cea147c34c581b  iproute2-4.10.0.tar.xz
+93dd53e15a78cb9e408b1ca20f89a53838bfef8caa22615c2b504d28a429f93fa69e0762927481552275d544a26b1dba148e73151fd67d5971ebd2d3f57ed6c7  musl-fixes.patch"
diff --git a/main/iproute2/musl-fixes.patch b/main/iproute2/musl-fixes.patch
index 0a4019180e1..ea50ed227a3 100644
--- a/main/iproute2/musl-fixes.patch
+++ b/main/iproute2/musl-fixes.patch
@@ -1,7 +1,7 @@
 Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
 
---- include/linux/if_bridge.h	2015-09-01 01:31:15.000000000 +0200
-+++ include/linux/if_bridge.h	2015-09-14 16:23:24.472434012 +0200
+--- a/include/linux/if_bridge.h	2015-09-01 01:31:15.000000000 +0200
++++ b/include/linux/if_bridge.h	2015-09-14 16:23:24.472434012 +0200
 @@ -15,7 +15,6 @@
  
  #include <linux/types.h>
@@ -10,8 +10,8 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
  
  #define SYSFS_BRIDGE_ATTR	"bridge"
  #define SYSFS_BRIDGE_FDB	"brforward"
---- include/linux/netfilter.h	2015-09-01 01:31:15.000000000 +0200
-+++ include/linux/netfilter.h	2015-09-14 16:27:34.928205553 +0200
+--- a/include/linux/netfilter.h	2015-09-01 01:31:15.000000000 +0200
++++ b/include/linux/netfilter.h	2015-09-14 16:27:34.928205553 +0200
 @@ -4,8 +4,6 @@
  #include <linux/types.h>
  
@@ -21,8 +21,8 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
  
  /* Responses from hook functions. */
  #define NF_DROP 0
---- include/linux/xfrm.h	2015-09-01 01:31:15.000000000 +0200
-+++ include/linux/xfrm.h	2015-09-14 16:23:24.473434008 +0200
+--- a/include/linux/xfrm.h	2015-09-01 01:31:15.000000000 +0200
++++ b/include/linux/xfrm.h	2015-09-14 16:23:24.473434008 +0200
 @@ -1,7 +1,6 @@
  #ifndef _LINUX_XFRM_H
  #define _LINUX_XFRM_H
@@ -31,8 +31,8 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
  #include <linux/types.h>
  
  /* All of the structures in this file may not change size as they are
---- include/utils.h	2015-09-01 01:31:15.000000000 +0200
-+++ include/utils.h	2015-09-14 16:23:24.472434012 +0200
+--- a/include/utils.h	2015-09-01 01:31:15.000000000 +0200
++++ b/include/utils.h	2015-09-14 16:23:24.472434012 +0200
 @@ -1,6 +1,7 @@
  #ifndef __UTILS_H__
  #define __UTILS_H__ 1
@@ -41,8 +41,8 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
  #include <sys/types.h>
  #include <asm/types.h>
  #include <resolv.h>
---- include/linux/netfilter_ipv4/ip_tables.h.orig
-+++ include/linux/netfilter_ipv4/ip_tables.h
+--- a/include/linux/netfilter_ipv4/ip_tables.h
++++ b/include/linux/netfilter_ipv4/ip_tables.h
 @@ -17,7 +17,6 @@
  
  #include <linux/types.h>
@@ -51,8 +51,8 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
  #include <linux/netfilter_ipv4.h>
  
  #include <linux/netfilter/x_tables.h>
---- include/bpf_scm.h.orig
-+++ include/bpf_scm.h
+--- a/include/bpf_scm.h
++++ b/include/bpf_scm.h
 @@ -3,6 +3,7 @@
  
  #include <sys/types.h>
@@ -61,8 +61,8 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
  
  #include "utils.h"
  #include "bpf_elf.h"
---- include/linux/if_tunnel.h
-+++ include/linux/if_tunnel.h
+--- a/include/linux/if_tunnel.h
++++ b/include/linux/if_tunnel.h
 @@ -2,9 +2,7 @@
  #define _IF_TUNNEL_H_
  
@@ -73,3 +73,14 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
  #include <asm/byteorder.h>
  
  
+--- 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
+