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)

1 files changed, 37 insertions, 13 deletions

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