Update net/tinc to version 1.0.9. Pick up maintainership and set license.

Changes since version 1.0.7:

 - Apply patch from Max Rijevski fixing a memory leak when closing connections.
   It also cleans up more when stopping tinc, helping tools like valgrind.
 - Handle broadcast and multicast packets in router mode.
   Multicast packets are treated as broadcast packets.
 - Update the manpage as well, and some whitespace to make its source more legible.
 - Update documentation.
   - TCPOnly is not experimental.
   - Do not mention old Linux kernels and Ethertap anymore.
   - Document the DeviceType, PMTU and PMTUDiscovery options.
 - Enable PMTU discovery by default.
 - Update copyright information.
 - Update Dutch translation.
 - Make sure IPv6 sockets are IPv6 only.
 - This will get rid of the "Can't bind to 0.0.0.0 port 655/tcp: Address already
   in use" message on Linux.
 - Use TUNIFHEAD by default on FreeBSD to make sure IPv6 works.
 - Treat virtual network device as tap if Mode = switch or hub.
   On OpenBSD, the link0 flag should still be set in tinc-up or by other means.
 - Correct debug message.
 - Prevent freeing a NULL pointer when a hostname is unresolvable.
 - Do not try to send REQ_KEY or ANS_KEY requests to unreachable nodes.
 - Fix reading configuration files that do not end with a newline.
 - Make sure the prefixlength of subnets is sane.
 - Handle SERVICE_CONTROL_INTERROGATE requests. Thanks to Carsten Ralle for noticing this.
 - Don't free struct addrinfo too early. Spotted by Christian Cier-Zniewski.
 - Update dutch translation.
 - Make sure connection->name is never NULL.
 - Apply patch from "dnk" making sockets non-blocking under Windows.
 - Close the proper filedescriptor (if it exists).
 - Apply patch from Scott Lamb fixing some memory and resource leaks.
 - Apply patch from Scott Lamb preventing an infinite loop when sending SIGALRM.

3 files changed, 19 insertions, 27 deletions

diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index 98ef634cb5a..6f203b834f9 100644
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2008/01/18 05:08:50 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2009/04/18 19:27:11 tonnerre Exp $
 #
 
-DISTNAME=	tinc-1.0.7
-PKGREVISION=	2
+DISTNAME=	tinc-1.0.9
 CATEGORIES=	net
 MASTER_SITES=	http://www.tinc-vpn.org/packages/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	tonnerre@NetBSD.org
 HOMEPAGE=	http://www.tinc-vpn.org/
+LICENSE=	gnu-gpl-v2
 COMMENT=	Virtual Private Network (VPN) daemon
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/net/tinc/distinfo b/net/tinc/distinfo
index 0e63d3abbb7..e8bc7e177b2 100644
--- a/net/tinc/distinfo
+++ b/net/tinc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2007/04/21 15:19:01 obache Exp $
+$NetBSD: distinfo,v 1.7 2009/04/18 19:27:11 tonnerre Exp $
 
-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 (tinc-1.0.9.tar.gz) = 55de1bc3b47a48fb162b00ffbb3bac1e2058a7ed
+RMD160 (tinc-1.0.9.tar.gz) = 43ad67040ed7aaad710c5137659f8f0f1d908101
+Size (tinc-1.0.9.tar.gz) = 519048 bytes
+SHA1 (patch-aa) = 21bb1d30038faddedd9dea93e968d8a071b227a7
 SHA1 (patch-ab) = 482217af3b35ec7d3f9959857684ef38df1d72ce
diff --git a/net/tinc/patches/patch-aa b/net/tinc/patches/patch-aa
index 73565d11af9..79a077591cd 100644
--- a/net/tinc/patches/patch-aa
+++ b/net/tinc/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2007/04/21 15:19:01 obache Exp $
+$NetBSD: patch-aa,v 1.4 2009/04/18 19:27:11 tonnerre Exp $
 
---- src/protocol_auth.c.orig	2006-04-26 13:53:05.000000000 +0000
+--- src/protocol_auth.c.orig	2008-12-22 21:35:45.000000000 +0100
 +++ src/protocol_auth.c
 @@ -128,10 +128,10 @@ bool send_metakey(connection_t *c)
  
@@ -72,15 +72,7 @@ $NetBSD: patch-aa,v 1.3 2007/04/21 15:19:01 obache Exp $
  		return false;
  	}
  
-@@ -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;
- 	}
- 
-@@ -260,6 +272,7 @@ bool metakey_h(connection_t *c)
+@@ -260,6 +271,7 @@ bool metakey_h(connection_t *c)
  		
  		if(!c->incipher) {
  			logger(LOG_ERR, _("%s (%s) uses unknown cipher!"), c->name, c->hostname);
@@ -88,7 +80,7 @@ $NetBSD: patch-aa,v 1.3 2007/04/21 15:19:01 obache Exp $
  			return false;
  		}
  
-@@ -269,6 +282,7 @@ bool metakey_h(connection_t *c)
+@@ -269,6 +281,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));
@@ -96,7 +88,7 @@ $NetBSD: patch-aa,v 1.3 2007/04/21 15:19:01 obache Exp $
  			return false;
  		}
  
-@@ -284,11 +298,13 @@ bool metakey_h(connection_t *c)
+@@ -284,11 +297,13 @@ bool metakey_h(connection_t *c)
  
  		if(!c->indigest) {
  			logger(LOG_ERR, _("Node %s (%s) uses unknown digest!"), c->name, c->hostname);
@@ -110,7 +102,7 @@ $NetBSD: patch-aa,v 1.3 2007/04/21 15:19:01 obache Exp $
  			return false;
  		}
  	} else {
-@@ -299,6 +315,7 @@ bool metakey_h(connection_t *c)
+@@ -299,6 +314,7 @@ bool metakey_h(connection_t *c)
  
  	c->allow_request = CHALLENGE;
  
@@ -118,7 +110,7 @@ $NetBSD: patch-aa,v 1.3 2007/04/21 15:19:01 obache Exp $
  	return send_challenge(c);
  }
  
-@@ -306,6 +323,7 @@ bool send_challenge(connection_t *c)
+@@ -306,6 +322,7 @@ bool send_challenge(connection_t *c)
  {
  	char *buffer;
  	int len;
@@ -126,7 +118,7 @@ $NetBSD: patch-aa,v 1.3 2007/04/21 15:19:01 obache Exp $
  
  	cp();
  
-@@ -315,7 +333,7 @@ bool send_challenge(connection_t *c)
+@@ -315,7 +332,7 @@ bool send_challenge(connection_t *c)
  
  	/* Allocate buffers for the challenge */
  
@@ -135,7 +127,7 @@ $NetBSD: patch-aa,v 1.3 2007/04/21 15:19:01 obache Exp $
  
  	if(!c->hischallenge)
  		c->hischallenge = xmalloc(len);
-@@ -331,29 +349,37 @@ bool send_challenge(connection_t *c)
+@@ -331,29 +348,37 @@ bool send_challenge(connection_t *c)
  
  	/* Send the challenge */
  
@@ -179,7 +171,7 @@ $NetBSD: patch-aa,v 1.3 2007/04/21 15:19:01 obache Exp $
  		return false;
  	}
  
-@@ -370,6 +396,7 @@ bool challenge_h(connection_t *c)
+@@ -370,6 +395,7 @@ bool challenge_h(connection_t *c)
  
  	/* Rest is done by send_chal_reply() */