Update to 1.1.6:

1.1.6:
This version fixes a rekey timeout crash.

1.1.5:
This release fixes the KILL command and disconnection related
problems.

1.1.4:
This version fixes 64-bit alignment issues.

1.1.3:
This version fixes several crashes, a WATCH command busy-loop, QoS
rate limit handling, and many other bugs.

1.1.2:
This version fixes a possible buffer overflow.

1.1.1:
This version fixes a crash related to processing of NEW_CLIENT
packets.

1.1:
This version was ported to the new SILC Toolkit 1.1. Support for
dynamic router connections and HTTP statistics back end were added.
Support was added for the upcoming SILC Protocol version 1.3 and
SILC Public Key version 2. Other major bugfixes were also made.

1.1beta4:
This version fixes public key authentication as responder, OPER
and SILCOPER public key authentication, and other minor bugs.

1.1beta3:
This version fixes a CTR mode rekey crash and other CTR mode issues.

1.1beta2:
This beta release fixes many crash bugs.

3 files changed, 9 insertions, 31 deletions

diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 0c2ae6662da..c91805b424a 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2007/11/11 23:42:39 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2008/04/24 08:30:49 wiz Exp $
 #
 
-DISTNAME=		silc-server-1.0.4
+DISTNAME=		silc-server-1.1.6
 CATEGORIES=		chat security
 MASTER_SITES=		http://www.silcnet.org/download/server/sources/ \
 			ftp://ftp.silcnet.org/silc/server/sources/ \
@@ -60,11 +60,8 @@ CONFIGURE_ARGS+=	--with-logsdir=${VARBASE}/log/silcd
 CONFIGURE_ARGS+=	--with-silcd-pid-file=${VARBASE}/run/silcd.pid
 CONFIGURE_ARGS+=	--without-iconv
 CONFIGURE_ARGS+=	--without-libtoolfix
-CONFIGURE_ARGS+=	--enable-shared
-
-# XXX: Avoid an ICE in gcc2 on sparc64
-#
-CONFIGURE_ENV+=		F77=${FALSE:Q}
+# Doesn't work -- shared libraries are not installed
+#CONFIGURE_ARGS+=	--enable-shared
 
 .if ${MACHINE_ARCH} != "i386"
 CONFIGURE_ARGS+=	--disable-asm
diff --git a/chat/silc-server/PLIST b/chat/silc-server/PLIST
index be0bde7b5d2..3445e72febe 100644
--- a/chat/silc-server/PLIST
+++ b/chat/silc-server/PLIST
@@ -1,30 +1,13 @@
-@comment $NetBSD: PLIST,v 1.18 2005/06/19 01:22:17 salo Exp $
-lib/silc-server/libsilc.la
-lib/silc-server/modules/aes.sim.so
-lib/silc-server/modules/blowfish.sim.so
-lib/silc-server/modules/cast.sim.so
-lib/silc-server/modules/md5.sim.so
-lib/silc-server/modules/none.sim.so
-lib/silc-server/modules/rc5.sim.so
-lib/silc-server/modules/rsa.sim.so
-lib/silc-server/modules/sha1.sim.so
-lib/silc-server/modules/twofish.sim.so
+@comment $NetBSD: PLIST,v 1.19 2008/04/24 08:30:49 wiz Exp $
 man/man5/silcd.conf.5
 man/man8/silcd.8
 sbin/silcd
-share/doc/silc-server/CHANGES
 share/doc/silc-server/COPYING
 share/doc/silc-server/CREDITS
 share/doc/silc-server/FAQ
 share/doc/silc-server/INSTALL
 share/doc/silc-server/README
 share/doc/silc-server/TODO
-share/doc/silc-server/draft-riikonen-presence-attrs-03.txt
-share/doc/silc-server/draft-riikonen-silc-commands-06.txt
-share/doc/silc-server/draft-riikonen-silc-flags-payloads-04.txt
-share/doc/silc-server/draft-riikonen-silc-ke-auth-08.txt
-share/doc/silc-server/draft-riikonen-silc-pp-09.txt
-share/doc/silc-server/draft-riikonen-silc-spec-08.txt
 share/examples/rc.d/silcd
 share/examples/silc-server/README
 share/examples/silc-server/cell_backup.conf
@@ -38,5 +21,3 @@ share/examples/silc-server/silcd.prv
 share/examples/silc-server/silcd.pub
 @dirrm share/examples/silc-server
 @dirrm share/doc/silc-server
-@dirrm lib/silc-server/modules
-@dirrm lib/silc-server
diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo
index c7c4357c705..f5215ce6f8f 100644
--- a/chat/silc-server/distinfo
+++ b/chat/silc-server/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.33 2007/05/18 21:13:54 salo Exp $
+$NetBSD: distinfo,v 1.34 2008/04/24 08:30:49 wiz Exp $
 
-SHA1 (silc-server-1.0.4.tar.bz2) = 6b3f2a5c61710b3ae3f1c08087c9c6b5ff597ec8
-RMD160 (silc-server-1.0.4.tar.bz2) = 0ff1fd41b8e1fb379ad75a4e53c694d135aa752a
-Size (silc-server-1.0.4.tar.bz2) = 895370 bytes
+SHA1 (silc-server-1.1.6.tar.bz2) = 2f06d07e49a4313ad1458c5e1c79684418e242d3
+RMD160 (silc-server-1.1.6.tar.bz2) = f309ba57222ed4278e904a2eaab5230893b58095
+Size (silc-server-1.1.6.tar.bz2) = 924011 bytes
 SHA1 (patch-aa) = 3b189047000593b36305f23301987982706355dc
 SHA1 (patch-ab) = 55b3f00076c5b8a443465753ae07b9e812236f18