Maintainer update of chat/silc-server to version 0.9.5. Changes:

buildlink->buildlink2

Main changes from 0.9.2 to 0.9.5
=================================

 * Use the primary router as the origin of the locally connected server when
   it is disconnecting from the backup router since that's where it really
   is coming from.  Now the clients from the disconnecting server are removed
   correctly and "shadow" clients are not left to the backup router.

 * If normal server is standalone and found existing but disabled channel, do
   not re-create the channel since it creates duplicate same channels.

 * Added anonymous client connections support to server.  New "anonymous"
   configuration option to ConnectionParams section added.  If set to true,
   the username and hostname information of the client will be scrambled and
   anonymous user mode is set automatically to the user.

 * In JOIN notify handling, mark that the cache entry of the client cannot be
   expired.  Can cause crashes on normal server (asserts client->channels).

 * Added silcd configuration option Timestamp in the Logging section.

 * Fixed fingerprint checking to check for entirely empty fingerprint instead
   of two first bytes when determining if it is set.

 * Remove server/router operator privileges in DETACH command, since it's
   possible to resume to server where these privileges would not be allowed.

 * Do not re-create channel keys and send them when removing clients in server
   shutdown.

 * Completed backup router support for standalone routers.  Supports also
   servers in the cell that do not use the backup at all.  Server/router
   operator now receives notify when network switches to backup router and
   when it resumes the use of primary router.

 * Added -D option to server.  It can be used to give debug level.  The levels
   are from 0 - 99, and are predefined for smooth server debugging.

Patch submitted by Lubomir Sedlacik <salo@Xtrmntr.org> in PR 18278.

8 files changed, 103 insertions, 95 deletions

diff --git a/chat/silc-server/DEINSTALL b/chat/silc-server/DEINSTALL
index 43c66c8d69c..35a78bc5842 100644
--- a/chat/silc-server/DEINSTALL
+++ b/chat/silc-server/DEINSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.4 2002/01/26 14:43:16 hubertf Exp $
+# $NetBSD: DEINSTALL,v 1.5 2002/09/14 02:59:25 hubertf Exp $
 
 case ${STAGE} in
 DEINSTALL)
@@ -6,10 +6,12 @@ DEINSTALL)
 	@PREFIX@/etc/rc.d/silcd stop
 	;;
 POST-DEINSTALL)
-	${ECHO} ===========================================================================
-	${ECHO}
-	${ECHO} "If you won't be using silc-server any longer, you may want to remove"
-        ${ECHO} "your server keys located in @PKG_SYSCONFDIR@."
-	${ECHO}
+	if [ -f @PKG_SYSCONFDIR@/silcd.prv ]; then
+		${ECHO} ===========================================================================
+		${ECHO}
+		${ECHO} "If you won't be using silc-server any longer, you may want to remove"
+        	${ECHO} "your server keys located in @PKG_SYSCONFDIR@."
+		${ECHO}
+	fi
 	;;
 esac
diff --git a/chat/silc-server/INSTALL b/chat/silc-server/INSTALL
deleted file mode 100644
index 099e3cadd1b..00000000000
--- a/chat/silc-server/INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2002/01/26 14:43:16 hubertf Exp $
-
-case "${STAGE}" in
-POST-INSTALL)
-	if [ ! -f @PKG_SYSCONFDIR@/silcd.prv ]; then
-		${ECHO} "==> Server private key is missing."
-		@PREFIX@/sbin/silcd -C @PKG_SYSCONFDIR@
-		${ECHO} ===========================================================================
-	fi
-	;;
-esac
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 85f96999efe..70ae1f027a1 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2002/06/21 15:57:16 jschauma Exp $
+# $NetBSD: Makefile,v 1.13 2002/09/14 02:59:25 hubertf Exp $
 
-DISTNAME=		silc-server-0.9.2
+DISTNAME=		silc-server-0.9.5
 CATEGORIES=		chat security
 MASTER_SITES=		http://www.silcnet.org/download/server/sources/ \
 			ftp://ftp.silcnet.org/silc/server/sources/ \
@@ -15,10 +15,10 @@ MAINTAINER=		salo@silcnet.org
 HOMEPAGE=		http://www.silcnet.org/
 COMMENT=                Server for the Secure Internet Live Conferencing (SILC) protocol
 
-GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
-USE_LIBTOOL=		yes
-USE_BUILDLINK_ONLY=	yes
+GNU_CONFIGURE=		# defined
+USE_GMAKE=		# defined
+USE_BUILDLINK2=		# defined
+USE_LIBTOOL=		# defined
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -29,15 +29,17 @@ PKG_USERS=		${SILCD_USER}:${SILCD_GROUP}::SILC\\ Server\\ user
 
 PKG_SYSCONFSUBDIR?=	silcd
 
+MAKE_ENV+=		examplesdir=${PREFIX}/share/examples/silcd
+
 CONF_FILES_MODE=	0600
-CONF_FILES+=		${PREFIX}/share/doc/silcd/silcd.conf.default \
+CONF_FILES+=		${PREFIX}/share/examples/silcd/silcd.conf.default \
 			${PKG_SYSCONFDIR}/silcd.conf
-CONF_FILES+=		${PREFIX}/share/doc/silcd/silcalgs.conf.default \
+CONF_FILES+=		${PREFIX}/share/examples/silcd/silcalgs.conf.default \
 			${PKG_SYSCONFDIR}/silcalgs.conf
-CONF_FILES_PERMS+=	${PREFIX}/share/doc/silcd/motd.txt.default \
+CONF_FILES_PERMS+=	${PREFIX}/share/examples/silcd/motd.txt.default \
 			${PKG_SYSCONFDIR}/motd.txt \
 			${ROOT_USER} ${ROOT_GROUP} 0644
-SUPPORT_FILES_PERMS+=	${PREFIX}/share/doc/silcd/silcd.default \
+SUPPORT_FILES_PERMS+=	${PREFIX}/share/examples/silcd/silcd.default \
 			${PREFIX}/etc/rc.d/silcd \
 			${ROOT_USER} ${ROOT_GROUP} 0555
 
@@ -51,15 +53,16 @@ DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/silcd
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-silcd-config-file=${PKG_SYSCONFDIR}/silcd.conf
+CONFIGURE_ARGS+=	--with-simdir=${PREFIX}/lib/silcd/modules
 CONFIGURE_ARGS+=	--with-logsdir=/var/log/silcd
 CONFIGURE_ARGS+=	--with-silcd-pid-file=/var/run/silcd.pid
-CONFIGURE_ARGS+=	--without-ncurses
+CONFIGURE_ARGS+=	--without-iconv
 
-# list it into IPv6-ready packages
+# List it into IPv6-ready packages.
 BUILD_DEFS+=		USE_INET6
 CONFIGURE_ARGS+=	--enable-ipv6
 
-# If you want to debug silc-server, uncomment this
+# If you want to debug silc-server, uncomment this.
 #
 #CONFIGURE_ARGS+=       --enable-debug
 
@@ -70,14 +73,14 @@ CONFIGURE_ARGS+=	--disable-asm
 post-install:
 .if (${OPSYS} == "NetBSD")
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/silcd.sh \
-		> ${PREFIX}/share/doc/silcd/silcd.default
+		> ${PREFIX}/share/examples/silcd/silcd.default
 .else
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/silcd.generic \
-		> ${PREFIX}/share/doc/silcd/silcd.default
+		> ${PREFIX}/share/examples/silcd/silcd.default
 .endif
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/motd.txt \
-		> ${PREFIX}/share/doc/silcd/motd.txt.default
+		> ${PREFIX}/share/examples/silcd/motd.txt.default
 
-.include "../../devel/glib/buildlink.mk"
+.include "../../devel/glib/buildlink2.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/silc-server/PLIST b/chat/silc-server/PLIST
index 7dbd1b94056..a4b48c384b4 100644
--- a/chat/silc-server/PLIST
+++ b/chat/silc-server/PLIST
@@ -1,4 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2002/03/03 23:49:49 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/09/14 02:59:26 hubertf Exp $
+lib/silcd/modules/aes.sim.so
+lib/silcd/modules/blowfish.sim.so
+lib/silcd/modules/cast.sim.so
+lib/silcd/modules/mars.sim.so
+lib/silcd/modules/md5.sim.so
+lib/silcd/modules/none.sim.so
+lib/silcd/modules/rc5.sim.so
+lib/silcd/modules/rc6.sim.so
+lib/silcd/modules/rsa.sim.so
+lib/silcd/modules/sha1.sim.so
+lib/silcd/modules/twofish.sim.so
 sbin/silcd
 share/doc/silcd/CHANGES
 share/doc/silcd/COPYING
@@ -8,22 +19,18 @@ share/doc/silcd/FAQ
 share/doc/silcd/INSTALL
 share/doc/silcd/README
 share/doc/silcd/TODO
-share/doc/silcd/silcalgs.conf.default
-share/doc/silcd/silcd.conf.default
-share/doc/silcd/silcd.default
-share/doc/silcd/motd.txt.default
-share/doc/silcd/examples/README
-share/doc/silcd/examples/cell1_backup.conf
-share/doc/silcd/examples/cell1_router.conf
-share/doc/silcd/examples/cell1_server1.conf
-share/doc/silcd/examples/cell1_server2.conf
-share/doc/silcd/examples/cell2_router.conf
-share/doc/silcd/examples/cell2_server1.conf
-share/doc/silcd/examples/cell2_server2.conf
-share/doc/silcd/examples/cell3_router.conf
-share/doc/silcd/examples/cell3_server1.conf
-share/doc/silcd/examples/cell3_server2.conf
-share/doc/silcd/examples/silcd.prv
-share/doc/silcd/examples/silcd.pub
-@dirrm share/doc/silcd/examples
+share/examples/silcd/README
+share/examples/silcd/cell_backup.conf
+share/examples/silcd/cell_router.conf
+share/examples/silcd/cell_server1.conf
+share/examples/silcd/cell_server2.conf
+share/examples/silcd/motd.txt.default
+share/examples/silcd/silcalgs.conf.default
+share/examples/silcd/silcd.conf.default
+share/examples/silcd/silcd.default
+share/examples/silcd/silcd.prv
+share/examples/silcd/silcd.pub
+@dirrm lib/silcd/modules
+@dirrm lib/silcd
 @dirrm share/doc/silcd
+@dirrm share/examples/silcd
diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo
index 99e177ed72f..9cc7410765a 100644
--- a/chat/silc-server/distinfo
+++ b/chat/silc-server/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2002/06/21 15:57:16 jschauma Exp $
+$NetBSD: distinfo,v 1.13 2002/09/14 02:59:26 hubertf Exp $
 
-SHA1 (silc-server-0.9.2.tar.bz2) = 08fbd405661245d101f2ae3cb410e22999bd669d
-Size (silc-server-0.9.2.tar.bz2) = 964021 bytes
-SHA1 (patch-aa) = 97ccff02e5d2d1bd3ff64a1a1942525e5a4522bd
-SHA1 (patch-ab) = c1563b7d56fca05113b6cc884c4f7c266383de82
+SHA1 (silc-server-0.9.5.tar.bz2) = b1c044184ddf1d905862d9266d059f5f613f9da4
+Size (silc-server-0.9.5.tar.bz2) = 974855 bytes
+SHA1 (patch-aa) = 2bea3a68a7f7999709f851c3d97ab5249c7c2dba
+SHA1 (patch-ab) = 17500e9fdf04e0691e4398c9aaf5e0d9274e87a7
diff --git a/chat/silc-server/files/motd.txt b/chat/silc-server/files/motd.txt
index 0e0aa04eca4..1dd22c766bf 100644
--- a/chat/silc-server/files/motd.txt
+++ b/chat/silc-server/files/motd.txt
@@ -18,7 +18,7 @@
 -  are located in the following      ,'  ,-----'   |       \ 
 -  directory:                        `--{__________)       \/
 -                                                    (FL)
--   @PREFIX@/share/doc/silcd/examples/
+-   @PREFIX@/share/examples/silcd/
 -
 --------------------------------------------------------------
 - For more information about SILC browse to http://silcnet.org
diff --git a/chat/silc-server/patches/patch-aa b/chat/silc-server/patches/patch-aa
index 3baa58e33d1..f113342ab5c 100644
--- a/chat/silc-server/patches/patch-aa
+++ b/chat/silc-server/patches/patch-aa
@@ -1,36 +1,51 @@
-$NetBSD: patch-aa,v 1.5 2002/03/03 23:49:49 hubertf Exp $
+$NetBSD: patch-aa,v 1.6 2002/09/14 02:59:26 hubertf Exp $
 
---- Makefile.in.orig	Fri Mar  1 11:26:19 2002
-+++ Makefile.in	Fri Mar  1 18:58:44 2002
-@@ -527,11 +527,7 @@
+--- Makefile.in.orig	Tue Sep 10 21:32:01 2002
++++ Makefile.in	Thu Sep 12 23:20:46 2002
+@@ -530,11 +530,9 @@
  	-rm -rf $(distdir)
  
  install-dirs:
 -	-mkdir -p $(etcdir)
--	-mkdir -p $(modulesdir)
+ 	-mkdir -p $(modulesdir)
 -	-mkdir -p $(helpdir)
  	-mkdir -p $(docdir)
 -	-mkdir -p $(logsdir)
++	-mkdir -p $(examplesdir)
  
  generate-server-key:
  	-@if test '!' -f $(etcdir)/silcd.pub ; then \
-@@ -544,8 +540,8 @@
+@@ -547,8 +545,8 @@
  doc-install:
  	$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
 -	$(INSTALL_DATA) $(srcdir)/doc/example_* $(docdir)/
 -	$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
-+	$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/silcd.conf.default
-+	$(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf $(docdir)/silcalgs.conf.default
++	$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(examplesdir)/silcd.conf.default
++	$(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf $(examplesdir)/silcalgs.conf.default
  	$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-@@ -579,7 +575,7 @@
+@@ -562,10 +560,9 @@
+ 	-$(INSTALL_DATA) $(srcdir)/lib/doc/*.gif $(docdir)/toolkit
+ 
+ examples-install:
+-	-mkdir -p $(docdir)/examples/
+-	$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
+-	$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
+-	$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/
++	$(INSTALL_DATA) $(srcdir)/doc/examples/README $(examplesdir)
++	$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(examplesdir)
++	$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(examplesdir)
+ 
+ etc-install:
+ 	-@if test '!' -f $(etcdir)/silcd.conf ; then \
+@@ -582,7 +579,7 @@
  
  @SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install
  @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs generate-server-key sim-install doc-install toolkit-install examples-install etc-install
 -@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install
-+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs doc-install examples-install
++@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs sim-install doc-install examples-install
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff --git a/chat/silc-server/patches/patch-ab b/chat/silc-server/patches/patch-ab
index ae04e9463fc..8ad0872a2d0 100644
--- a/chat/silc-server/patches/patch-ab
+++ b/chat/silc-server/patches/patch-ab
@@ -1,17 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2002/06/21 16:00:14 jschauma Exp $
+$NetBSD: patch-ab,v 1.7 2002/09/14 02:59:26 hubertf Exp $
 
---- doc/example_silcd.conf.in.orig	Thu May 30 16:09:43 2002
-+++ doc/example_silcd.conf.in	Tue Jun 18 01:27:59 2002
-@@ -36,7 +36,7 @@
- 	# This is the default path where to search modules.  If omitted
- 	# built-in modules will be used.  Built-in modules will also be
- 	# used if a module file cannot be located.
--	module_path = "@MODULESDIR@";
-+	module_path = "";
- 
- 	# If both passphrase and public key authentication is set for a
- 	# connection the public key authentication is the preferred one
-@@ -148,14 +148,14 @@
+--- doc/example_silcd.conf.in.orig	Sat Sep  7 22:13:20 2002
++++ doc/example_silcd.conf.in	Wed Sep 11 14:18:58 2002
+@@ -147,14 +147,14 @@
  	#
  	# Server name (FQDN)
  	#
@@ -28,16 +19,17 @@ $NetBSD: patch-ab,v 1.6 2002/06/21 16:00:14 jschauma Exp $
  		port = 706;
  	};
  
-@@ -164,7 +164,7 @@
+@@ -162,8 +162,7 @@
+ 	# Secondary listener(s).  If you need to bind your server into
  	# several interfaces use the Secondary to specify the listener(s).
  	#
- 	#Secondary { ip = "10.2.1.60"; port = 706; };
+-	#Secondary { ip = "10.2.1.60"; port = 706; };
 -	#Secondary { ip = "10.2.1.160"; port = 706; };
 +	Secondary { ip = "::1"; port = 706; };
  
  	#
  	# ServerType field specifies the purpose of this server
-@@ -175,7 +175,7 @@
+@@ -174,7 +173,7 @@
  	#
  	# Geographic location
  	#
@@ -46,8 +38,8 @@ $NetBSD: patch-ab,v 1.6 2002/06/21 16:00:14 jschauma Exp $
  
  	#
  	# Full admin name
-@@ -191,8 +191,8 @@
- 	# Run SILC server as specific user and group. The server must be 
+@@ -190,8 +189,8 @@
+ 	# Run SILC server as specific user and group.  The server must be
  	# initially run as root.
  	#
 -	User = "nobody";
@@ -57,7 +49,7 @@ $NetBSD: patch-ab,v 1.6 2002/06/21 16:00:14 jschauma Exp $
  
  	#
  	# Public and private keys
-@@ -205,7 +205,7 @@
+@@ -204,7 +203,7 @@
  	#
  	# Specifies the text file displayed on client connection
  	#
@@ -66,16 +58,16 @@ $NetBSD: patch-ab,v 1.6 2002/06/21 16:00:14 jschauma Exp $
  
  	#
  	# Pid file
-@@ -232,7 +232,7 @@
+@@ -236,7 +235,7 @@
  	# reduces memory usage.  By default it is false and log files are
  	# written with FlushDelay timeout.
  	#
 -	#QuickLogs = true;
 +	QuickLogs = true;
  
- 	# FlushDelay tells log files update delay (seconds) in case you 
+ 	# FlushDelay tells log files update delay (seconds) in case you
  	# have chosen buffering output.  This setting has effect only if
-@@ -391,9 +391,9 @@
+@@ -402,9 +401,9 @@
  # required.
  #
  Admin {
@@ -88,9 +80,9 @@ $NetBSD: patch-ab,v 1.6 2002/06/21 16:00:14 jschauma Exp $
  	Passphrase = "verysecret";
  	# PublicKey = "/path/to/the/public.key";
  };
-@@ -416,13 +416,13 @@
- # to true. For normal connections set it false. If it is set to true then
- # this server will be backup router.
+@@ -427,13 +426,13 @@
+ # to true.  For normal connections set it false.  If it is set to true then
+ # your server will be backup router.
  #
 -ServerConnection {
 -	Host = "10.2.1.7";
@@ -109,7 +101,7 @@ $NetBSD: patch-ab,v 1.6 2002/06/21 16:00:14 jschauma Exp $
  
  #
  # Configured router connections
-@@ -452,17 +452,17 @@
+@@ -463,17 +462,17 @@
  # backup router is in our cell then set the "BackupLocal" option to true.
  # If the backup router is in other cell then set it to false.
  #