main/net-tools: upgrade to git 20140218 and fix musl build

main/net-tools/APKBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=net-tools
-pkgver=1.60_git20130615
+pkgver=1.60_git20140218
 _ver=${pkgver%_git*}
 pkgrel=0
 pkgdesc="Linux networking base tools"
@@ -13,7 +13,9 @@ makedepends="$depends_dev bash"
 install=""
 subpackages="$pkgname-doc mii-tool:mii_tool"
 source="https://downloads.sourceforge.net/project/net-tools/net-tools-$_ver.tar.bz2
-	git.patch"
+	git.patch
+	musl-fixes.patch
+	"
 
 _builddir="$srcdir"/net-tools-$_ver
 prepare() {
@@ -84,8 +86,11 @@ mii_tool() {
 }
 
 md5sums="888774accab40217dde927e21979c165  net-tools-1.60.tar.bz2
-6c2b55f5258d23477fa0d9261bd363a5  git.patch"
+fe7b9dfa9f68adcf6ca23b9616decdb4  git.patch
+d57bcd8c1aa8b92b1128a4fea4f033df  musl-fixes.patch"
 sha256sums="7ae4dd6d44d6715f18e10559ffd270511b6e55a8900ca54fbebafe0ae6cf7d7b  net-tools-1.60.tar.bz2
-3d27ff819c909c97c515837971f4cdb76744e0a20adefd563b1840cbeafcf789  git.patch"
+6e0acc8f88135f2e12b79777914a732c64789b1f629ea97c1860ed324b21724c  git.patch
+538f0115911867423d27ee9b3fcc1177e339b474c131332eb7758f5c220928e1  musl-fixes.patch"
 sha512sums="8e1ae9bca726ad7d795a06c58388f9e11c1d617d94eebb9ed18bd11e5f34c6541e1ffe631706c407996db86e78df6e5cf1968a2d90b242b473596fda3b6d1eae  net-tools-1.60.tar.bz2
-95865c5be07585cc9994a1142a6585f482fdcc8f56a59fb87e71e8e947471af5ac42e99c6bccfa34dbc378449c9fcaad315815636879800950c97a6889e69d4a  git.patch"
+5edc92e8cf46da11898ac1999cfccb5b7ae3407f649c75c2da43c4264e1271b010eafbc84283e4c41219870bf89722e09666b25d28c84cb4ac60ceebee9adb2d  git.patch
+08c9e7681e069a42f4da714faf0b93ad1c569cf942a94a1b41103e86850235b507c0291e2f3839c84dd02aba0b1a16d79580fbfc55dd2af8d09b0ff71d714e9f  musl-fixes.patch"

main/net-tools/musl-fixes.patch

@@ -0,0 +1,94 @@
+diff --git a/lib/inet6_gr.c b/lib/inet6_gr.c
+index 72b4a66..2361809 100644
+--- a/lib/inet6_gr.c
++++ b/lib/inet6_gr.c
+@@ -23,7 +23,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-#ifndef __GLIBC__
++#ifdef HAVE_IPV6_ROUTE_H
+ #include <netinet6/ipv6_route.h>	/* glibc doesn't have this */
+ #endif
+ #include "version.h"
+diff --git a/lib/inet6_sr.c b/lib/inet6_sr.c
+index 1ad9510..96dbd5f 100644
+--- a/lib/inet6_sr.c
++++ b/lib/inet6_sr.c
+@@ -23,10 +23,10 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-#ifdef __GLIBC__
+-#include <net/route.h>
+-#else
++#ifdef HAVE_IPV6_ROUTE_H
+ #include <netinet6/ipv6_route.h>	/* glibc does not have this */
++#else
++#include <net/route.h>
+ #endif
+ #include "version.h"
+ #include "net-support.h"
+diff --git a/lib/inet_sr.c b/lib/inet_sr.c
+index 1a876ae..6a26a76 100644
+--- a/lib/inet_sr.c
++++ b/lib/inet_sr.c
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <asm-generic/param.h>
+ #include "version.h"
+ #include "net-support.h"
+ #include "pathnames.h"
+diff --git a/lib/util-ank.c b/lib/util-ank.c
+index b077f35..4ee59f6 100644
+--- a/lib/util-ank.c
++++ b/lib/util-ank.c
+@@ -14,6 +14,7 @@
+  * Rani Assaf <rani@magic.metawire.com> 980929:	resolve addresses
+  */
+ 
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+diff --git a/mii-tool.c b/mii-tool.c
+index 1cfecc2..fbc3b34 100644
+--- a/mii-tool.c
++++ b/mii-tool.c
+@@ -46,10 +46,6 @@
+ #include <net/if.h>
+ #include <linux/sockios.h>
+ 
+-#ifndef __GLIBC__
+-#include <linux/if_arp.h>
+-#include <linux/if_ether.h>
+-#endif
+ #include <linux/mii.h>
+ #include <linux/sockios.h>
+ #include "version.h"
+diff --git a/netstat.c b/netstat.c
+index d0c364f..8453f18 100644
+--- a/netstat.c
++++ b/netstat.c
+@@ -88,6 +88,7 @@
+ #include <sys/stat.h>
+ #include <net/if.h>
+ #include <dirent.h>
++#include <asm-generic/param.h>
+ 
+ #include "net-support.h"
+ #include "pathnames.h"
+diff --git a/slattach.c b/slattach.c
+index 5c81584..3ccde28 100644
+--- a/slattach.c
++++ b/slattach.c
+@@ -44,6 +44,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <getopt.h>
++#include <termios.h>
+ #include <linux/if_slip.h>
+ 
+ #if defined(__GLIBC__)