update to latest upstream, fix musl compile

10 files changed, 87 insertions, 77 deletions

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 4202c26f8..21e38f214 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -4,12 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		iproute2
-PKG_VERSION:=		3.4.0
+PKG_VERSION:=		3.10.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		879d3fac4e90809598b2864ec4a0cbf8
+PKG_MD5SUM:=		45fb5427fc723a0001c72b92c931ba02
 PKG_DESCR:=		iproute2 routing control utility
 PKG_SECTION:=		route
 PKG_BUILDDEP:=		iptables libnl linux-atm
+PKG_DEPENDS:=		libnl
 PKG_URL:=		http://www.linuxfoundation.org/en/Net:Iproute2
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/net/iproute2/
 
diff --git a/package/iproute2/patches/patch-bridge_fdb_c b/package/iproute2/patches/patch-bridge_fdb_c
new file mode 100644
index 000000000..e8e899e78
--- /dev/null
+++ b/package/iproute2/patches/patch-bridge_fdb_c
@@ -0,0 +1,10 @@
+--- iproute2-3.10.0.orig/bridge/fdb.c	2013-07-16 19:06:36.000000000 +0200
++++ iproute2-3.10.0/bridge/fdb.c	2013-08-17 15:23:48.127356022 +0200
+@@ -20,6 +20,7 @@
+ #include <linux/if_ether.h>
+ #include <linux/neighbour.h>
+ #include <string.h>
++#include <limits.h>
+ 
+ #include "libnetlink.h"
+ #include "br_common.h"
diff --git a/package/iproute2/patches/patch-configure b/package/iproute2/patches/patch-configure
deleted file mode 100644
index 0d7bea8ae..000000000
--- a/package/iproute2/patches/patch-configure
+++ /dev/null
@@ -1,75 +0,0 @@
-	- use the compiler passed in $CC
-	- predefine iptables modules dir, since the check would
-	  always fail (cause of absolute search paths) and OpenADK
-	  (for now) doesn't compile iptables with shared objects
-	- do not discard compiler output from tests, they're useful
-	  for debugging
-
---- iproute2-3.3.0.orig/configure	2012-03-20 01:27:12.000000000 +0100
-+++ iproute2-3.3.0/configure	2012-03-22 20:48:53.022784090 +0100
-@@ -17,7 +17,7 @@ int main(int argc, char **argv) {
- 	return 0;
- }
- EOF
--gcc -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 
-+$CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 
- if [ $? -eq 0 ]
- then
-     echo "TC_CONFIG_ATM:=y" >>Config
-@@ -51,7 +51,7 @@ int main(int argc, char **argv)
- 
- EOF
- 
--if gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
-+if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
- then
- 	echo "TC_CONFIG_XT:=y" >>Config
- 	echo "using xtables"
-@@ -88,7 +88,7 @@ int main(int argc, char **argv) {
- }
- 
- EOF
--gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
-+$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
- 
- if [ $? -eq 0 ]
- then
-@@ -128,7 +128,7 @@ int main(int argc, char **argv) {
- }
- 
- EOF
--gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
-+$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
- 
- if [ $? -eq 0 ]
- then
-@@ -148,18 +148,8 @@ check_ipt()
- 
- check_ipt_lib_dir()
- {
--	IPT_LIB_DIR=""
--	for dir in /lib /usr/lib /usr/local/lib
--	do
--		for file in $dir/{xtables,iptables}/lib*t_*so ; do
--			if [ -f $file ]; then
--				echo ${file%/*}
--				echo "IPT_LIB_DIR:=${file%/*}" >> Config
--				return
--			fi
--		done
--	done
--	echo "not found!"
-+	echo "/usr/lib/$TABLES"
-+	echo "IPT_LIB_DIR:=/usr/lib/$TABLES" >> Config
- }
- 
- check_setns()
-@@ -172,7 +162,7 @@ int main(int argc, char **argv) 
- 	return 0;
- }
- EOF
--gcc -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1
-+$CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1
- if [ $? -eq 0 ]
- then
- 	echo "IP_CONFIG_SETNS:=y" >>Config
diff --git a/package/iproute2/patches/patch-ip_iplink_can_c b/package/iproute2/patches/patch-ip_iplink_can_c
new file mode 100644
index 000000000..aa1b2e0d7
--- /dev/null
+++ b/package/iproute2/patches/patch-ip_iplink_can_c
@@ -0,0 +1,11 @@
+--- iproute2-3.10.0.orig/ip/iplink_can.c	2013-07-16 19:06:36.000000000 +0200
++++ iproute2-3.10.0/ip/iplink_can.c	2013-08-17 15:08:28.418918323 +0200
+@@ -107,7 +107,7 @@ static int can_parse_opt(struct link_uti
+ 			if (get_u32(&bt.bitrate, *argv, 0))
+ 				invarg("invalid \"bitrate\" value\n", *argv);
+ 		} else if (matches(*argv, "sample-point") == 0) {
+-			float sp;
++			float sp = 0;
+ 
+ 			NEXT_ARG();
+ 			if (get_float(&sp, *argv))
diff --git a/package/iproute2/patches/patch-misc_ifstat_c b/package/iproute2/patches/patch-misc_ifstat_c
new file mode 100644
index 000000000..7f6584649
--- /dev/null
+++ b/package/iproute2/patches/patch-misc_ifstat_c
@@ -0,0 +1,11 @@
+--- iproute2-3.10.0.orig/misc/ifstat.c	2013-07-16 19:06:36.000000000 +0200
++++ iproute2-3.10.0/misc/ifstat.c	2013-08-17 15:27:59.236199157 +0200
+@@ -21,7 +21,7 @@
+ #include <sys/file.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <signal.h>
diff --git a/package/iproute2/patches/patch-misc_lnstat_h b/package/iproute2/patches/patch-misc_lnstat_h
new file mode 100644
index 000000000..f87c190d1
--- /dev/null
+++ b/package/iproute2/patches/patch-misc_lnstat_h
@@ -0,0 +1,10 @@
+--- iproute2-3.10.0.orig/misc/lnstat.h	2013-07-16 19:06:36.000000000 +0200
++++ iproute2-3.10.0/misc/lnstat.h	2013-08-17 15:55:30.403441174 +0200
+@@ -2,6 +2,7 @@
+ #define _LNSTAT_H
+ 
+ #include <limits.h>
++#include <sys/time.h>
+ 
+ #define LNSTAT_VERSION "0.02 041002"
+ 
diff --git a/package/iproute2/patches/patch-misc_nstat_c b/package/iproute2/patches/patch-misc_nstat_c
new file mode 100644
index 000000000..feed4df14
--- /dev/null
+++ b/package/iproute2/patches/patch-misc_nstat_c
@@ -0,0 +1,11 @@
+--- iproute2-3.10.0.orig/misc/nstat.c	2013-07-16 19:06:36.000000000 +0200
++++ iproute2-3.10.0/misc/nstat.c	2013-08-17 15:27:46.412360373 +0200
+@@ -21,7 +21,7 @@
+ #include <sys/file.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <signal.h>
diff --git a/package/iproute2/patches/patch-misc_rtacct_c b/package/iproute2/patches/patch-misc_rtacct_c
new file mode 100644
index 000000000..ac0c7d5e2
--- /dev/null
+++ b/package/iproute2/patches/patch-misc_rtacct_c
@@ -0,0 +1,11 @@
+--- iproute2-3.10.0.orig/misc/rtacct.c	2013-07-16 19:06:36.000000000 +0200
++++ iproute2-3.10.0/misc/rtacct.c	2013-08-17 15:26:02.313669072 +0200
+@@ -22,7 +22,7 @@
+ #include <sys/file.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
diff --git a/package/iproute2/patches/patch-tc_tc_stab_c b/package/iproute2/patches/patch-tc_tc_stab_c
new file mode 100644
index 000000000..8640292c8
--- /dev/null
+++ b/package/iproute2/patches/patch-tc_tc_stab_c
@@ -0,0 +1,10 @@
+--- iproute2-3.10.0.orig/tc/tc_stab.c	2013-07-16 19:06:36.000000000 +0200
++++ iproute2-3.10.0/tc/tc_stab.c	2013-08-17 15:19:18.866741086 +0200
+@@ -16,6 +16,7 @@
+ #include <syslog.h>
+ #include <fcntl.h>
+ #include <math.h>
++#include <sys/param.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
diff --git a/package/iproute2/patches/patch-tc_tc_util_c b/package/iproute2/patches/patch-tc_tc_util_c
new file mode 100644
index 000000000..8891b17f6
--- /dev/null
+++ b/package/iproute2/patches/patch-tc_tc_util_c
@@ -0,0 +1,10 @@
+--- iproute2-3.10.0.orig/tc/tc_util.c	2013-07-16 19:06:36.000000000 +0200
++++ iproute2-3.10.0/tc/tc_util.c	2013-08-17 15:20:53.313553729 +0200
+@@ -15,6 +15,7 @@
+ #include <unistd.h>
+ #include <syslog.h>
+ #include <fcntl.h>
++#include <sys/param.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>