From 8207b8d44693503e1c086aea0fc30c592a59b15d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 1 Jan 2014 20:19:13 +0100 Subject: another round of updates and musl fixes --- package/tinc/Makefile | 7 +++---- package/tinc/patches/patch-src_Makefile_in | 11 ----------- package/tinc/patches/patch-src_have_h | 25 +++++++++++++++++++++++++ package/tinc/patches/patch-src_linux_device_c | 20 -------------------- 4 files changed, 28 insertions(+), 35 deletions(-) delete mode 100644 package/tinc/patches/patch-src_Makefile_in create mode 100644 package/tinc/patches/patch-src_have_h delete mode 100644 package/tinc/patches/patch-src_linux_device_c (limited to 'package/tinc') diff --git a/package/tinc/Makefile b/package/tinc/Makefile index 9e5d8b06b..f5c558bb0 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tinc -PKG_VERSION:= 1.0.11 +PKG_VERSION:= 1.0.23 PKG_RELEASE:= 1 -PKG_MD5SUM:= ee0b1a3366c6e379cae34be6fa5dcb15 +PKG_MD5SUM:= 762c0d47bdf1b33a40b19165d9c2761f PKG_DESCR:= VPN tunnel daemon PKG_SECTION:= net/security PKG_DEPENDS:= zlib liblzo libopenssl kmod-tun @@ -18,8 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,TINC,tinc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-kernel=${LINUX_DIR} \ - --with-zlib=${STAGING_TARGET_DIR}/usr/ \ +CONFIGURE_ARGS+= --with-zlib=${STAGING_TARGET_DIR}/usr/ \ --with-lzo-include=${STAGING_TARGET_DIR}/usr/include/lzo tinc-install: 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 + #endif + ++#if defined(__GLIBC__) + #ifdef HAVE_NET_ETHERNET_H + #include + #endif ++#endif + + #ifdef HAVE_NET_IF_ARP_H + #include +@@ -191,8 +193,10 @@ + #include + #endif + ++#if defined(__GLIBC__) + #ifdef HAVE_NETINET_IF_ETHER_H + #include + #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); -- cgit v1.2.3