Update aiccu to 20060725. Added gnutls option (disabled by default).

ChangeLog:

aiccu (2006-07-25)
  * DragonFlyBSD fix

aiccu (2006-07-23)
  * The Nina'th release.
  * Verified AYIYA support on Windows, OpenBSD, FreeBSD and Linux ia32/AMD64/armeb.
  * Disabled TSP and L2TP (Teepee) support as they are not finished.
  * No more IPv4 interface as it is not used anymore.
  * On AIX we now compile with xlc_r.
  * Retrieves Tunnel Brokers from _aiccu.<search path> and from _aiccu.sixxs.net.

aiccu (2006-07-13)
  * Added no-configure and defaultroute options.
  * AYIYA now forks so that AYIYA heartbeats work.
  * Ctrl-C handling
  * Protocol and server can be specified in configuration file
  * AYIYA fixes: header alignment, Win32 TAP 8.1 support
  * TAP listing using --listtaps (windows)
  * Confuration can now be saved using a menu entry in the GUI (windows)
  * TAP interface renaming when it's the only TAP and name not in the config (windows)
  * Fedora fixes by Matt Domsch

aiccu (2006-03-10)
  * Changed Debian start/stop priority as noted by Mario 'BitKoenig' Holbe.
    They now match openvpn/pppd etc.

aiccu (2005-12-05)
  * DragonFlyBSD (uses the FreeBSD4 interface) added as noted by Geert Hendrickx.

aiccu (2005-08-14)
  * Mac OS X typo-fix (reported by Wim Biemolt)
  * GNUTLS support. TIC will go over TLS avoiding cleartext
    negotiations where possible.
  * Heartbeat stop & start per signal (requested by Peter Bieringer)
  * AYIYA Heartbeating.
  * L2TPv2 Support.
  * TSP Support.
  * Gary Coady's <gary@lyranthe.org> Debian/Ubuntu update:
    * Use dpkg-buildpackage to generate deb files
    * Remove configuration checks from Debian init script
    * Use common print functions in Debian init script
    * Add 'tunnels' parameter to aiccu, which reports available tunnels
    * Return non-zero exit code if unable to successfully authenticate
      to POP
    * Log to stderr instead of stdout
    * Send signal 0 to existing aiccu binary instead of SIGHUP
    * Add debconf support
    Thanks to Gary for these very nice addons!
  * Added OpenBSD PortInfo by Thomas Kaschwig
  * Added Makefile changes to support FreeBSD6, noted by Meno Abels
  * Added _NETBSD_SOURCE define as mentioned by Maarten Dammers
  * Changed aiccu_kame to do configuration differently depending
    if the interface is a proto-41 one or a tun device.
  * Solaris and AIX support + Endian Fixes.
  * 'version' option for unix_console.
  * 64bit fixes + compilation check against a big number of platforms.
  * Multiple Tunnelbrokers Support using TXT records from _aiccu.sixxs.net DNS.
  * AYIYA Port number set to 5072 (IANA assigned)

6 files changed, 82 insertions, 64 deletions

diff --git a/net/aiccu/Makefile b/net/aiccu/Makefile
index 64c1d44066f..d1c33c09551 100644
--- a/net/aiccu/Makefile
+++ b/net/aiccu/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/06/13 18:06:21 ghen Exp $
+# $NetBSD: Makefile,v 1.6 2006/08/31 08:49:34 ghen Exp $
 
-DISTNAME=		aiccu_2005.01.31
+DISTNAME=		aiccu_2006.07.25
 PKGNAME=		${DISTNAME:S/_/-/:S/.//g}
-PKGREVISION=		2
 CATEGORIES=		net
 MASTER_SITES=		http://www.sixxs.net/archive/sixxs/aiccu/unix/
 
@@ -10,8 +9,6 @@ MAINTAINER=		ghen@NetBSD.org
 HOMEPAGE=		http://www.sixxs.net/tools/aiccu/
 COMMENT=		Automatic IPv6 Connectivity Client Utility
 
-BUILD_DIRS=		unix-console
-
 USE_TOOLS+=		gmake
 
 SUBST_CLASSES+=		sysconfdir
@@ -26,6 +23,8 @@ CONF_FILES_MODE=	0600
 
 RCD_SCRIPTS=		aiccu
 
+.include "options.mk"
+
 # the distfile untars as ${WRKDIR}/aiccu/ but this would conflict with the
 # rc.d script that gets copied to the same name ${WRKDIR}/${RCD_SCRIPTS}
 post-extract:
diff --git a/net/aiccu/distinfo b/net/aiccu/distinfo
index 5483388d318..1d861e37491 100644
--- a/net/aiccu/distinfo
+++ b/net/aiccu/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2006/06/13 18:06:21 ghen Exp $
+$NetBSD: distinfo,v 1.3 2006/08/31 08:49:34 ghen Exp $
 
-SHA1 (aiccu_2005.01.31.tar.gz) = 2d3e9e1844e7e2b2ae144b00974a9d1022b45396
-RMD160 (aiccu_2005.01.31.tar.gz) = 48f9508bb62984acc8cde8419765c5003a7200f4
-Size (aiccu_2005.01.31.tar.gz) = 45672 bytes
-SHA1 (patch-aa) = 0fcff412c044961724d227bdfdd91f81b1b0c059
-SHA1 (patch-ab) = f1c48fd4698ee203ac3c2d7685b0b853abb4e54b
-SHA1 (patch-ac) = 8c35c669e05e9100489126ad8d0ebd164d5ad09a
-SHA1 (patch-ad) = 13d93a8ac8bb29566465525fcaee7eb21858c429
+SHA1 (aiccu_2006.07.25.tar.gz) = c031f4b29a92a0c1b5a0d4b9d9e81d6fe4da92aa
+RMD160 (aiccu_2006.07.25.tar.gz) = 599d181bfccb4a1a30d315f60469078bcb269270
+Size (aiccu_2006.07.25.tar.gz) = 64161 bytes
+SHA1 (patch-aa) = 698b8d89ebc1b33dfc920788d0ce776f84f8e9d4
+SHA1 (patch-ab) = 63bab81f2507c2e20042d53086f2cd8c774ae30a
+SHA1 (patch-ac) = e7df7fdb83f4898220ca36f4051539c911bfb6b7
+SHA1 (patch-ad) = 1fec51f11a7103bbc690eacdb9191d45b3666f1b
diff --git a/net/aiccu/patches/patch-aa b/net/aiccu/patches/patch-aa
index d5ece27184e..66b985483fe 100644
--- a/net/aiccu/patches/patch-aa
+++ b/net/aiccu/patches/patch-aa
@@ -1,23 +1,39 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/12/29 14:53:52 ghen Exp $
+$NetBSD: patch-aa,v 1.2 2006/08/31 08:49:34 ghen Exp $
 
---- unix-console/Makefile.orig	2005-01-31 19:59:30.000000000 +0100
+--- unix-console/Makefile.orig	2006-07-25 11:20:48.000000000 +0200
 +++ unix-console/Makefile
-@@ -15,11 +15,11 @@ INCS	= ../common/aiccu.h ../common/hash_
- OBJS	= main.o ../common/aiccu.o ../common/hash_md5.o ../common/hash_sha1.o ../common/common.o ../common/heartbeat.o ../common/tic.o ../common/ayiya.o ../common/aiccu_test.o
- CWARNS	= -pedantic -W -Wall -Wshadow -Wcast-align
+@@ -26,27 +26,15 @@ CWARNS += -W -Wall -Wshadow -Wpointer-ar
+ 
  #CFLAGS	+= $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0
--CFLAGS	+= $(CWARNS) -D_GNU_SOURCE -O3
-+CFLAGS	+= $(CWARNS) -D_GNU_SOURCE
- CC      = gcc
+ CFLAGS	+= $(CWARNS) -D_GNU_SOURCE
+-CC      = @gcc
++CC      = cc
  RM      = rm
  
--CFLAGS	+= -D AICCU_CONSOLE
-+CFLAGS	+= -DAICCU_CONSOLE
+-# Add -O3 when nothing is specified yet
+-ifeq ($(shell echo $(CFLAGS) | grep -c "\-O"),0)
+-CFLAGS	+= -O3
+-endif
+-
+ # This is a console client
+ CFLAGS	+= -D AICCU_CONSOLE
  
+-# GnuTLS Support ?
+-# Used by TIC to secure that communication
+-# Currently defaultly builds only on Linux, but other platforms might easily also support it
+-ifeq ($(shell uname | grep -c "Linux"),1)
+-CFLAGS	+= -D _LINUX -D AICCU_GNUTLS
+-LDFLAGS += -lgnutls
+-endif
+-
  # Linux
  ifeq ($(shell uname | grep -c "Linux"),1)
-@@ -49,6 +49,14 @@ CFLAGS	+= -pthread
- endif
++CFLAGS	+= -D _LINUX
+ CFLAGS  += -D AICCU_TYPE="\"linux\""
+ SRCS	+= ../common/aiccu_linux.c
+ OBJS	+= ../common/aiccu_linux.o
+@@ -80,12 +68,20 @@ OBJS	+= ../common/aiccu_freebsd4.o
+ CFLAGS	+= -pthread
  endif
  
 +# DragonFly
@@ -30,4 +46,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/12/29 14:53:52 ghen Exp $
 +
  # NetBSD
  ifeq ($(shell uname | grep -c "NetBSD"),1)
- CFLAGS  += -D AICCU_TYPE="\"kame\""
+-CFLAGS	+= -D _NETBSD -D AICCU_TYPE="\"kame\""
++CFLAGS	+= -D_NETBSD -DAICCU_TYPE="\"kame\""
+ SRCS	+= ../common/aiccu_kame.c
+ OBJS	+= ../common/aiccu_kame.o
+-CFLAGS	+= -pthread -D _NETBSD_SOURCE
++CFLAGS	+= -pthread -D_NETBSD_SOURCE
+ endif
+ 
+ # OpenBSD
diff --git a/net/aiccu/patches/patch-ab b/net/aiccu/patches/patch-ab
index cd8cba17dc2..c908f2ab625 100644
--- a/net/aiccu/patches/patch-ab
+++ b/net/aiccu/patches/patch-ab
@@ -1,18 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/12/29 14:53:52 ghen Exp $
+$NetBSD: patch-ab,v 1.2 2006/08/31 08:49:34 ghen Exp $
 
-Patch from https://noc.sixxs.net/forum/?msg=setup-219655
-This will be included in the next aiccu release.
-
---- common/common.h.orig	2005-01-31 21:32:50.000000000 +0100
+--- common/common.h.orig	2006-07-25 11:20:46.000000000 +0200
 +++ common/common.h
-@@ -24,6 +24,10 @@
- #endif
- #define __STRICT_ANSI__
- 
-+#ifdef __NetBSD__
-+#define _NETBSD_SOURCE
-+#endif
-+
- #include <stdio.h>
- #include <errno.h>
- #include <stdarg.h>
+@@ -57,7 +57,7 @@
+ #include <arpa/nameser_compat.h>
+ #else
+ #ifndef _WIN32
+-#if defined(_OPENBSD) || defined(_DFBSD) || defined(_FREEBSD)
++#if defined(_OPENBSD) || defined(_DFBSD) || defined(_FREEBSD) || defined(_NETBSD)
+ #include <sys/endian.h>
+ #else
+ #include <endian.h>
diff --git a/net/aiccu/patches/patch-ac b/net/aiccu/patches/patch-ac
index 67e6aa63d81..d3a0e96d74c 100644
--- a/net/aiccu/patches/patch-ac
+++ b/net/aiccu/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/12/29 14:53:52 ghen Exp $
+$NetBSD: patch-ac,v 1.2 2006/08/31 08:49:34 ghen Exp $
 
---- doc/aiccu.conf.orig	2005-01-09 17:15:19.000000000 +0100
+--- doc/aiccu.conf.orig	2006-07-18 23:24:30.000000000 +0200
 +++ doc/aiccu.conf
-@@ -6,7 +6,7 @@
- 
- # Interface names to use
- ipv4_interface eth0
+@@ -8,7 +8,7 @@
+ # ipv6_interface is the name of the interface that will be used as a tunnel interface.
+ # On *BSD the ipv6_interface should be set to gifX (eg gif0) for proto-41 tunnels
+ # or tunX (eg tun0) for AYIYA tunnels.
 -ipv6_interface sixxs
 +ipv6_interface gif0
  
diff --git a/net/aiccu/patches/patch-ad b/net/aiccu/patches/patch-ad
index 890cc9606f2..4d0dd2e988a 100644
--- a/net/aiccu/patches/patch-ad
+++ b/net/aiccu/patches/patch-ad
@@ -1,23 +1,23 @@
-$NetBSD: patch-ad,v 1.1 2006/06/13 18:06:21 ghen Exp $
+$NetBSD: patch-ad,v 1.2 2006/08/31 08:49:34 ghen Exp $
 
---- common/aiccu_kame.c.orig	2006-06-13 19:59:18.000000000 +0200
+--- common/aiccu_kame.c.orig	2006-07-23 16:55:14.000000000 +0200
 +++ common/aiccu_kame.c
-@@ -43,10 +43,18 @@ void aiccu_os_setup(struct TIC_Tunnel *h
+@@ -45,10 +45,18 @@ bool aiccu_os_setup(struct TIC_Tunnel *h
  			hTunnel->sIPv6_LinkLocal);
- 	}
  
+ 		/* Local side of the tunnel */
 +#ifdef __NetBSD__
-+        aiccu_exec(
-+                "ifconfig %s inet6 %s %s prefixlen 128 alias",
-+                g_aiccu->ipv6_interface,
-+                hTunnel->sIPv6_Local,
-+                hTunnel->sIPv6_POP);
-+#else
- 	aiccu_exec(
- 		"ifconfig %s inet6 %s prefixlen 128 alias",
- 		g_aiccu->ipv6_interface,
- 		hTunnel->sIPv6_Local);
++		aiccu_exec(
++			"ifconfig %s inet6 %s %s prefixlen 128 alias",
++			g_aiccu->ipv6_interface,
++			hTunnel->sIPv6_Local,
++			hTunnel->sIPv6_POP);
++#else  
+ 		aiccu_exec(
+ 			"ifconfig %s inet6 %s prefixlen 128 alias",
+ 			g_aiccu->ipv6_interface,
+ 			hTunnel->sIPv6_Local);
 +#endif
  
- 	aiccu_exec(
- 		"route add -inet6 %s -prefixlen 128 %s",
+ 		/* Remote side of the tunnel */
+ 		aiccu_exec(