Update silc-server to version 0.9.1. Changes:

* Fixed CUMODE_CHANGE notify handling in server.

* Fixed USERS command to support empty channels.

* Check the watcher list before sending signoff notifys
  when closing client connection.

* Added better CMODE command rights checking.

* Fixed watcher list checking during server signoff.  It
  crashed the server.

* The JOIN command reply returns now the founder's public
  key.

* Announce the channel mode, and the mode properties with
  CMODE_CHANGE notify.

* Mark new channels by default disabled, untill at least
  one user joins the channel.

* The nickname argument to watch notify can be optional.
  Fixes a crash in server.

* Check the watcher list before and after changing nickname
  when the NICK_CHANGE notify is received.

* Added the founder's public key delivery to the
  CUMODE_CHANGE notify type as well.  Updated the protocol
  specs and the code.

* Added support for sending the founder's public key in
  the CMODE_CHANGE notify packet in the server.

* Changed the FOUNDER_AUTH authentication to use only
  public key authentication as defined by new protocol
  specs.  Passphrase authentication with that mode cannot
  be used anymore.  It is now possible to reclaim founder
  mode from any server in the network.

* Added permanent channels support by making the channel
  permanent when FOUNDER_AUTH mode is set on the channel.
  The channel will not be destroyed even if channel is empty
  when that mode is set.  Protocol TODO #17.

* Added BLOCK_INVITE user mode to be able to block incoming
  invite notifications.  Protoocol TODO #26.

* Disconnect Payload includes now the status type.  Updated
  the protocol specs and the code.  Protocol TODO #25.

* Defined that the nickname hash in Client ID MUST be from
  lowercase nickname.  This effectively changes nicknames in
  SILC to case-insensitive.  Updated the protocol specs and
  the code.

* Added new channel user modes BLOCK_MESSAGES_USERS and
  BLOCK_MESSAGES_ROBOTS.  Updated the protocol specs and the
  code.

* Added support for watch list.  It is possible to add nicknames
  to be watched, and when they come to network, leave network
  or user mode changes the watcher will be notified of this
  change.  Added SILC_COMMAND_WATCH command, added new
  notify type SILC_NOTIFY_TYPE_WATCH to deliver the watch
  notifications.  Updated the protocol specs and implemented
  this to library, client and server.  Protocol TODO #21.

* Fixed a bug in the pid writing function, which couldn't be
  written in a root-owned directory.

* Added detach_disabled and detach_timeout server config
  options to the server.

* Defined that server receives WHOIS command reply for private
  and secret channels too.  Updated protocol specs and the
  code in server.

* Defined <channel user mode list> argument to WHOIS command
  reply for returning user modes on the channels.  The
  channel list now doesn't include the user mode anymore but the
  actual channel mode.  Updated protocol specs and the code in
  client and server.

* Save the channels list in WHOIS command reply in normal server
  so that WHOIS always shows joined channels also in normal
  server and not just on router.

* Defined that server receives USERS command reply for private
  and secret channels too.  Updated protocol specs and the
  code in server.

* Changed the UMODE's mode mask argument to be optional.  If
  not provided then the command merely returns the current mode
  mask to the client.

* Added SILC session detachment/resuming support.  It is possible
  to detach by closing the network connection and then re-connect
  and resume to the old client session.  Added DETACHED user
  mode that server will set for detached client.  Added new
  packet RESUME_CLIENT which is used to perform the resuming
  process.  Added DETACH command.  Updated the protocol specs,
  core library, client and server.  Protocol TODO #22.

* Changed the CMODE's mode mask argument to be optional.  If
  not provided then the command merely returns the current mode
  mask to the client.  Updated protocol specs and the server.

* Added new user modes ANONYMOUS for special anonymous servers
  that may set the mode for client, and BLOCK_PRIVMSG which
  client may set to block incoming private messages unless the
  Private Message Key flag is set (using private keys to protect
  private messages).  Updated protocol specs and code in client
  and server and core library.  Protocol TODO #23.

* Added new channel user mode BLOCK_MESSAGES which the client
  may set to itself to tell server not send channel messages.
  Other packets such as channel key packets are still sent.
  Protocol TODO #23.  Updated the protocol specs, client and
  server.

* Fixed a bug in the fetch_logging() config callback.

* Drop root privileges when started in foreground.  Don't drop them
  if debugging also.

* Added STATS command to the protocol after all, to return
  various statistical information about the network.  It can
  be used by clients to retrieve statistical information, and
  servers may use it to to fetch cell and network wide
  statistics from router.  Updated the protocol specs and
  implemented it to the server.  Protocol TODO #16.

* Rewrote the version SKE version checking in client libary
  and in server to use the silc_parse_version_string.

* Added two new channel modes: SILC_CMODE_SILENCE_USERS
  and SILC_CMODE_SILENCE_OPERS which can be used to moderate
  the channel.  Updated protocol specs and impelemented this
  to client and server.  Protocol TODO #6.

* Deprecated all administrative commands from SILC protocol
  since they are highly implementation specific commands.
  Updated protocol specs.  Moved the old commands in
  implementations to private range of command types.

* Fixed a bug in server where sending unknown command crashes
  the server.

* Fixed the rekey protocol with PFS, which was totally broken.

* Merged version 1.1.4 of zlib. Even if it not currently in use,
  it's good not to have security holes here.

* Fixed a negative refcount situtuation for the config context.
  Affected file is silcd/serverconfig.c.

changes in silc-server package:
===============================

- removed INSTALL file, don't generate server keys during installation,
  if missing, generate them on server startup


Patch contributed by Lubomir Sedlacik <salo@Xtrmntr.org> in PR 16981

4 files changed, 19 insertions, 16 deletions

diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 48bbccfafec..45d1b4579ec 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2002/05/03 22:02:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2002/05/24 22:15:36 hubertf Exp $
 
-DISTNAME=		silc-server-0.8.4
+DISTNAME=		silc-server-0.9.1
 CATEGORIES=		chat
 MASTER_SITES=		http://www.silcnet.org/download/server/sources/ \
 			ftp://ftp.silcnet.org/silc/server/sources/ \
@@ -46,14 +46,13 @@ RCD_SCRIPTS_MODE=	0555
 
 OWN_DIRS_PERMS+=	/var/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700
 
-INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 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-logsdir=/var/log/silcd
-CONFIGURE_ARGS+=	--with-silcd-pid-file=/var/log/silcd/silcd.pid
+CONFIGURE_ARGS+=	--with-silcd-pid-file=/var/run/silcd.pid
 CONFIGURE_ARGS+=	--without-ncurses
 
 # list it into IPv6-ready packages
@@ -75,7 +74,7 @@ post-install:
 .else
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/silcd.generic \
 		> ${PREFIX}/share/doc/silcd/silcd.default
-.endif	
+.endif
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/motd.txt \
 		> ${PREFIX}/share/doc/silcd/motd.txt.default
 
diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo
index dc75aec118b..80805ee7182 100644
--- a/chat/silc-server/distinfo
+++ b/chat/silc-server/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2002/05/03 22:02:49 hubertf Exp $
+$NetBSD: distinfo,v 1.11 2002/05/24 22:15:36 hubertf Exp $
 
-SHA1 (silc-server-0.8.4.tar.bz2) = 1549594faa6f21b760f4240ae167bc501efa3101
-Size (silc-server-0.8.4.tar.bz2) = 940368 bytes
+SHA1 (silc-server-0.9.1.tar.bz2) = b925d8102efe90cdced7415fb9be501d3ef3c3c5
+Size (silc-server-0.9.1.tar.bz2) = 960514 bytes
 SHA1 (patch-aa) = 97ccff02e5d2d1bd3ff64a1a1942525e5a4522bd
 SHA1 (patch-ab) = 482b7580cb95a0833c85f64a3d94c16b2b1c984f
diff --git a/chat/silc-server/files/silcd.generic b/chat/silc-server/files/silcd.generic
index c8280e49670..6fceb7dd7d9 100644
--- a/chat/silc-server/files/silcd.generic
+++ b/chat/silc-server/files/silcd.generic
@@ -1,4 +1,4 @@
-# $NetBSD: silcd.generic,v 1.1 2002/05/03 22:02:49 hubertf Exp $
+# $NetBSD: silcd.generic,v 1.2 2002/05/24 22:15:36 hubertf Exp $
 #
 
 KILL="/bin/kill"
@@ -9,7 +9,7 @@ name="silcd"
 confdir="@PKG_SYSCONFDIR@"
 required_files="$confdir/silcd.conf"
 required_dirs="/var/log/silcd"
-pidfile="/var/log/silcd/${name}.pid"
+pidfile="/var/run/${name}.pid"
 command="@PREFIX@/sbin/silcd"
 start_precmd="silcd_precmd"
 
diff --git a/chat/silc-server/files/silcd.sh b/chat/silc-server/files/silcd.sh
index 60c255c95b9..774b79fb015 100644
--- a/chat/silc-server/files/silcd.sh
+++ b/chat/silc-server/files/silcd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: silcd.sh,v 1.4 2002/05/03 22:02:49 hubertf Exp $
+# $NetBSD: silcd.sh,v 1.5 2002/05/24 22:15:36 hubertf Exp $
 #
 # PROVIDE: silcd
 # REQUIRE: DAEMON
@@ -15,7 +15,7 @@ rcvar=$name
 confdir="@PKG_SYSCONFDIR@"
 required_files="$confdir/silcd.conf"
 required_dirs="/var/log/silcd"
-pidfile="/var/log/silcd/${name}.pid"
+pidfile="/var/run/${name}.pid"
 command="@PREFIX@/sbin/silcd"
 start_precmd="silcd_precmd"
 stop_cmd="silcd_stop"
@@ -29,7 +29,11 @@ silcd_precmd()
 
 silcd_stop()
 {
-	if [ -z "$_pid" ]; then
+	# Backward compat with NetBSD <1.6:
+	[ -z "$rc_pid" ] && rc_pid=$_pid
+	[ -z "$rc_pidcmd" ] && rc_pidcmd=$_pidcmd
+
+	if [ -z "$rc_pid" ]; then
 		if [ -n "$pidfile" ]; then
 			echo "${name} not running? (check $pidfile)."
 		else
@@ -40,11 +44,11 @@ silcd_stop()
 
 	echo "Stopping ${name}."
 	_doit=\
-"${_user:+su -m $_user -c '}kill -${sig_stop:-TERM} $_pid${_user:+'}"
+"${_user:+su -m $_user -c '}kill -${sig_stop:-TERM} $rc_pid${_user:+'}"
 	eval $_doit
 
-	eval $_pidcmd
-	if [ ! $_pid ]; then
+	eval $rc_pidcmd
+	if [ ! $rc_pid ]; then
 		rm -f $pidfile
 	fi
 }