diff options
Diffstat (limited to 'package/tinc')
| -rw-r--r-- | package/tinc/Config.in | 13 | ||||
| -rw-r--r-- | package/tinc/Makefile | 12 | ||||
| -rw-r--r-- | package/tinc/patches/patch-src_linux_device_c | 27 | ||||
| -rw-r--r-- | package/tinc/patches/patch-src_net_setup_c | 20 |
4 files changed, 17 insertions, 55 deletions
diff --git a/package/tinc/Config.in b/package/tinc/Config.in deleted file mode 100644 index 6ef68ec46..000000000 --- a/package/tinc/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config ADK_PACKAGE_TINC - prompt "tinc.............................. VPN tunneling daemon" - tristate - default n - select ADK_KPACKAGE_KMOD_TUN - select ADK_PACKAGE_LIBLZO - select ADK_PACKAGE_LIBOPENSSL - select ADK_PACKAGE_ZLIB - help - A VPN tunneling daemon - - http://www.tinc-vpn.org/ - diff --git a/package/tinc/Makefile b/package/tinc/Makefile index 27f61a2ca..29b443a4a 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -4,27 +4,23 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tinc -PKG_VERSION:= 1.0.9 +PKG_VERSION:= 1.0.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= f907acebada53512e01235bea6b4cdf1 +PKG_MD5SUM:= ee0b1a3366c6e379cae34be6fa5dcb15 PKG_DESCR:= VPN tunnel daemon PKG_SECTION:= net PKG_DEPENDS:= zlib liblzo libopenssl kmod-tun +PKG_BUILDDEP+= zlib liblzo openssl PKG_URL:= http://www.tinc-vpn.org -PKG_SITES:= http://www.tinc-vpn.org/packages/ \ - http://ftp.yi.se/pub/tinc/ \ - http://www.mirrors.wiretapped.net/security/network-security/tinc/ +PKG_SITES:= http://www.tinc-vpn.org/packages/ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,TINC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-kernel=${LINUX_DIR} \ --with-zlib=${STAGING_DIR}/usr/ \ --with-lzo-include=${STAGING_DIR}/usr/include/lzo -BUILD_STYLE:= auto -INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_TINC}/usr/sbin diff --git a/package/tinc/patches/patch-src_linux_device_c b/package/tinc/patches/patch-src_linux_device_c index 6a5b66e3c..9a5c09059 100644 --- a/package/tinc/patches/patch-src_linux_device_c +++ b/package/tinc/patches/patch-src_linux_device_c @@ -1,21 +1,20 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- tinc-1.0.9.orig/src/linux/device.c 2006-12-16 17:54:05.000000000 +0100 -+++ tinc-1.0.9/src/linux/device.c 2009-05-11 23:55:39.000000000 +0200 -@@ -64,7 +64,7 @@ bool setup_device(void) - #ifdef HAVE_LINUX_IF_TUN_H - iface = netname; +--- 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 = rindex(device, '/') ? rindex(device, '/') + 1 : device; -+ iface = strrchr(device, '/') ? strrchr(device, '/') + 1 : device; +- 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); -@@ -104,7 +104,7 @@ bool setup_device(void) - overwrite_mac = true; - device_info = _("Linux ethertap device"); +@@ -105,7 +105,7 @@ bool setup_device(void) { device_type = DEVICE_TYPE_ETHERTAP; -- iface = rindex(device, '/') ? rindex(device, '/') + 1 : device; -+ iface = strrchr(device, '/') ? strrchr(device, '/') + 1 : device; + 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); + logger(LOG_INFO, "%s is a %s", device, device_info); diff --git a/package/tinc/patches/patch-src_net_setup_c b/package/tinc/patches/patch-src_net_setup_c deleted file mode 100644 index dd4d7b495..000000000 --- a/package/tinc/patches/patch-src_net_setup_c +++ /dev/null @@ -1,20 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- tinc-1.0.9.orig/src/net_setup.c 2008-12-22 21:35:45.000000000 +0100 -+++ tinc-1.0.9/src/net_setup.c 2009-05-11 23:52:07.000000000 +0200 -@@ -358,14 +358,14 @@ bool setup_myself(void) - } - } - } else -- myself->cipher = EVP_bf_cbc(); -+ myself->cipher = EVP_des_cbc(); - - if(myself->cipher) - myself->keylength = myself->cipher->key_len + myself->cipher->iv_len; - else - myself->keylength = 1; - -- myself->connection->outcipher = EVP_bf_ofb(); -+ myself->connection->outcipher = EVP_des_ofb(); - - myself->key = xmalloc(myself->keylength); - RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength); |