another round of updates and musl fixes

3 files changed, 25 insertions, 31 deletions

diff --git a/package/tinc/patches/patch-src_Makefile_in b/package/tinc/patches/patch-src_Makefile_in
deleted file mode 100644
index 49bcf90dc..000000000
--- a/package/tinc/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tinc-1.0.11.orig/src/Makefile.in	2009-11-01 16:23:33.000000000 +0100
-+++ tinc-1.0.11/src/Makefile.in	2011-01-21 23:31:11.568658762 +0100
-@@ -197,7 +197,7 @@ noinst_HEADERS = conf.h connection.h dev
- tincd_LDADD = \
- 	$(top_builddir)/lib/libvpn.a
- 
--AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
-+AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
- all: all-am
- 
- .SUFFIXES:
diff --git a/package/tinc/patches/patch-src_have_h b/package/tinc/patches/patch-src_have_h
new file mode 100644
index 000000000..4efd602ac
--- /dev/null
+++ b/package/tinc/patches/patch-src_have_h
@@ -0,0 +1,25 @@
+--- tinc-1.0.23.orig/src/have.h	2013-09-25 21:21:09.000000000 +0200
++++ tinc-1.0.23/src/have.h	2013-12-30 19:30:24.000000000 +0100
+@@ -175,9 +175,11 @@
+ #include <netinet/ip6.h>
+ #endif
+ 
++#if defined(__GLIBC__)
+ #ifdef HAVE_NET_ETHERNET_H
+ #include <net/ethernet.h>
+ #endif
++#endif
+ 
+ #ifdef HAVE_NET_IF_ARP_H
+ #include <net/if_arp.h>
+@@ -191,8 +193,10 @@
+ #include <netinet/icmp6.h>
+ #endif
+ 
++#if defined(__GLIBC__)
+ #ifdef HAVE_NETINET_IF_ETHER_H
+ #include <netinet/if_ether.h>
+ #endif
++#endif
+ 
+ #endif /* __TINC_SYSTEM_H__ */
diff --git a/package/tinc/patches/patch-src_linux_device_c b/package/tinc/patches/patch-src_linux_device_c
deleted file mode 100644
index 9a5c09059..000000000
--- a/package/tinc/patches/patch-src_linux_device_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- tinc-1.0.11.orig/src/linux/device.c	2009-09-27 12:27:54.000000000 +0200
-+++ tinc-1.0.11/src/linux/device.c	2009-12-06 02:30:32.000000000 +0100
-@@ -61,7 +61,7 @@ bool setup_device(void) {
- 		if (netname != NULL)
- 			iface = xstrdup(netname);
- #else
--		iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
-+		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
- #endif
- 	device_fd = open(device, O_RDWR | O_NONBLOCK);
- 
-@@ -105,7 +105,7 @@ bool setup_device(void) {
- 		device_type = DEVICE_TYPE_ETHERTAP;
- 		if(iface)
- 			free(iface);
--		iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
-+		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
- 	}
- 
- 	logger(LOG_INFO, "%s is a %s", device, device_info);