Update tinc to 1.0.7.

News

Jan 5th 2007
Version 1.0.7 released.
 * Fixed a bug that caused slow network speeds on Windows.
 * Fixed a bug that caused tinc unable to write packets to the tun device on OpenBSD.

Dec 18th 2006
Version 1.0.6 released.
 * More flexible detection of the LZO libraries when compiling.
 * Fixed a bug where broadcasts in switch and hub modes sometimes would not work anymore when part of the VPN had become disconnected from the rest.

Nov 14th 2006
Version 1.0.5 released.
 * Lots of small fixes.
 * Broadcast packets no longer grow in size with each hop. This should fix switch mode (again).
 * Generic host-up and host-down scripts.
 * Optionally dump graph in graphviz format to a file or a script.
 * Support LZO 2.0 and later.

4 files changed, 39 insertions, 47 deletions

diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index e321fdd1d4d..e7b4576cc7a 100644
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/10/04 21:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/04/21 15:19:01 obache Exp $
 #
 
-DISTNAME=	tinc-1.0.4
+DISTNAME=	tinc-1.0.7
 CATEGORIES=	net
 MASTER_SITES=	http://www.tinc-vpn.org/packages/
 
@@ -10,9 +10,9 @@ HOMEPAGE=	http://www.tinc-vpn.org/
 COMMENT=	Virtual Private Network (VPN) daemon
 
 GNU_CONFIGURE=	yes
-INFO_FILES=	# PLIST
+INFO_FILES=	yes
 
-.include "../../archivers/liblzo/buildlink3.mk"
+.include "../../archivers/lzo/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/tinc/distinfo b/net/tinc/distinfo
index a5d1fa58b46..0e63d3abbb7 100644
--- a/net/tinc/distinfo
+++ b/net/tinc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2006/03/23 16:28:01 joerg Exp $
+$NetBSD: distinfo,v 1.6 2007/04/21 15:19:01 obache Exp $
 
-SHA1 (tinc-1.0.4.tar.gz) = b70c87a147e5a01edcb70593ea29155eed075785
-RMD160 (tinc-1.0.4.tar.gz) = f4ec33a10f5039c625ec124376216cc03aa5f318
-Size (tinc-1.0.4.tar.gz) = 480305 bytes
-SHA1 (patch-aa) = c43fabf6e3b7a42f2817d36fff72f2c87747f890
-SHA1 (patch-ab) = 4b5944886c18be5fcf8bca739a1d677650884dd0
+SHA1 (tinc-1.0.7.tar.gz) = 79b18aa72d5c694c2a9ee7f59c8cf274407ed908
+RMD160 (tinc-1.0.7.tar.gz) = 74ce43f65700b182dff879ac08c41859faee27c2
+Size (tinc-1.0.7.tar.gz) = 499135 bytes
+SHA1 (patch-aa) = 2bc5c4acf339a29a10c6f8b03ab74d5341f036b4
+SHA1 (patch-ab) = 482217af3b35ec7d3f9959857684ef38df1d72ce
diff --git a/net/tinc/patches/patch-aa b/net/tinc/patches/patch-aa
index 21d447ef7c8..73565d11af9 100644
--- a/net/tinc/patches/patch-aa
+++ b/net/tinc/patches/patch-aa
@@ -1,38 +1,29 @@
-$NetBSD: patch-aa,v 1.2 2005/06/17 15:32:44 hira Exp $
+$NetBSD: patch-aa,v 1.3 2007/04/21 15:19:01 obache Exp $
 
---- src/protocol_auth.c	Fri May 27 14:28:54 2005
-+++ src/protocol_auth.c	Fri May 27 14:28:30 2005
-@@ -118,7 +118,7 @@
+--- src/protocol_auth.c.orig	2006-04-26 13:53:05.000000000 +0000
++++ src/protocol_auth.c
+@@ -128,10 +128,10 @@ bool send_metakey(connection_t *c)
  
- bool send_metakey(connection_t *c)
- {
--	char buffer[MAX_STRING_SIZE];
-+	char *buffer;
- 	int len;
- 	bool x;
- 
-@@ -129,10 +129,11 @@
  	/* Allocate buffers for the meta key */
  
+-	buffer = alloca(2 * len + 1);
++	buffer = xmalloc_and_zero(2 * len + 1);
+ 	
  	if(!c->outkey)
 -		c->outkey = xmalloc(len);
 +		c->outkey = xmalloc_and_zero(len);
  
  	if(!c->outctx)
  		c->outctx = xmalloc_and_zero(sizeof(*c->outctx));
-+	buffer = xmalloc_and_zero(2 * len + 1);
- 	cp();
- 	/* Copy random data to the buffer */
- 
-@@ -167,6 +168,7 @@
- 	if(RSA_public_encrypt(len, c->outkey, buffer, c->rsa_key, RSA_NO_PADDING) != len) {
+@@ -169,6 +169,7 @@ bool send_metakey(connection_t *c)
+ 	if(RSA_public_encrypt(len, (unsigned char *)c->outkey, (unsigned char *)buffer, c->rsa_key, RSA_NO_PADDING) != len) {
  		logger(LOG_ERR, _("Error during encryption of meta key for %s (%s)"),
  			   c->name, c->hostname);
 +		free(buffer);
  		return false;
  	}
  
-@@ -191,35 +193,45 @@
+@@ -193,35 +194,45 @@ bool send_metakey(connection_t *c)
  					c->outcipher->iv_len)) {
  			logger(LOG_ERR, _("Error during initialisation of cipher for %s (%s): %s"),
  					c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
@@ -81,15 +72,15 @@ $NetBSD: patch-aa,v 1.2 2005/06/17 15:32:44 hira Exp $
  		return false;
  	}
  
-@@ -240,6 +252,7 @@
- 	if(RSA_private_decrypt(len, buffer, c->inkey, myself->connection->rsa_key, RSA_NO_PADDING) != len) {	/* See challenge() */
+@@ -242,6 +253,7 @@ bool metakey_h(connection_t *c)
+ 	if(RSA_private_decrypt(len, (unsigned char *)buffer, (unsigned char *)c->inkey, myself->connection->rsa_key, RSA_NO_PADDING) != len) {	/* See challenge() */
  		logger(LOG_ERR, _("Error during encryption of meta key for %s (%s)"),
  			   c->name, c->hostname);
 +		free(buffer);
  		return false;
  	}
  
-@@ -258,6 +271,7 @@
+@@ -260,6 +272,7 @@ bool metakey_h(connection_t *c)
  		
  		if(!c->incipher) {
  			logger(LOG_ERR, _("%s (%s) uses unknown cipher!"), c->name, c->hostname);
@@ -97,7 +88,7 @@ $NetBSD: patch-aa,v 1.2 2005/06/17 15:32:44 hira Exp $
  			return false;
  		}
  
-@@ -267,6 +281,7 @@
+@@ -269,6 +282,7 @@ bool metakey_h(connection_t *c)
  					c->incipher->iv_len)) {
  			logger(LOG_ERR, _("Error during initialisation of cipher from %s (%s): %s"),
  					c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
@@ -105,7 +96,7 @@ $NetBSD: patch-aa,v 1.2 2005/06/17 15:32:44 hira Exp $
  			return false;
  		}
  
-@@ -282,11 +297,13 @@
+@@ -284,11 +298,13 @@ bool metakey_h(connection_t *c)
  
  		if(!c->indigest) {
  			logger(LOG_ERR, _("Node %s (%s) uses unknown digest!"), c->name, c->hostname);
@@ -119,7 +110,7 @@ $NetBSD: patch-aa,v 1.2 2005/06/17 15:32:44 hira Exp $
  			return false;
  		}
  	} else {
-@@ -297,19 +314,22 @@
+@@ -299,6 +315,7 @@ bool metakey_h(connection_t *c)
  
  	c->allow_request = CHALLENGE;
  
@@ -127,23 +118,24 @@ $NetBSD: patch-aa,v 1.2 2005/06/17 15:32:44 hira Exp $
  	return send_challenge(c);
  }
  
- bool send_challenge(connection_t *c)
+@@ -306,6 +323,7 @@ bool send_challenge(connection_t *c)
  {
--	char buffer[MAX_STRING_SIZE];
-+	char *buffer;
+ 	char *buffer;
  	int len;
 +	bool ret;
  
  	cp();
  
- 	/* CHECKME: what is most reasonable value for len? */
- 
- 	len = RSA_size(c->rsa_key);
-+	buffer = xmalloc_and_zero(2 * len + 1);
+@@ -315,7 +333,7 @@ bool send_challenge(connection_t *c)
  
  	/* Allocate buffers for the challenge */
  
-@@ -327,29 +347,37 @@
+-	buffer = alloca(2 * len + 1);
++	buffer = xmalloc_and_zero(2 * len + 1);
+ 
+ 	if(!c->hischallenge)
+ 		c->hischallenge = xmalloc(len);
+@@ -331,29 +349,37 @@ bool send_challenge(connection_t *c)
  
  	/* Send the challenge */
  
@@ -187,7 +179,7 @@ $NetBSD: patch-aa,v 1.2 2005/06/17 15:32:44 hira Exp $
  		return false;
  	}
  
-@@ -366,6 +394,7 @@
+@@ -370,6 +396,7 @@ bool challenge_h(connection_t *c)
  
  	/* Rest is done by send_chal_reply() */
  
diff --git a/net/tinc/patches/patch-ab b/net/tinc/patches/patch-ab
index b8d6f3ced78..a5378ae505a 100644
--- a/net/tinc/patches/patch-ab
+++ b/net/tinc/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2006/03/23 16:28:01 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2007/04/21 15:19:01 obache Exp $
 
---- configure.orig	2006-03-23 15:55:08.000000000 +0000
+--- configure.orig	2007-01-05 12:51:40.000000000 +0000
 +++ configure
-@@ -6198,7 +6198,7 @@ _ACEOF
+@@ -6399,7 +6399,7 @@ _ACEOF
  
       rm -f src/device.c; ln -sf linux/device.c src/device.c
    ;;