summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chat/silc-server/DEINSTALL108
-rw-r--r--chat/silc-server/INSTALL104
-rw-r--r--chat/silc-server/Makefile66
-rw-r--r--chat/silc-server/PLIST3
-rw-r--r--chat/silc-server/distinfo10
-rw-r--r--chat/silc-server/files/motd.txt29
-rw-r--r--chat/silc-server/files/silcd.sh23
-rw-r--r--chat/silc-server/patches/patch-aa8
-rw-r--r--chat/silc-server/patches/patch-ab62
9 files changed, 122 insertions, 291 deletions
diff --git a/chat/silc-server/DEINSTALL b/chat/silc-server/DEINSTALL
index cfbd3fd3c4f..43c66c8d69c 100644
--- a/chat/silc-server/DEINSTALL
+++ b/chat/silc-server/DEINSTALL
@@ -1,107 +1,15 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.3 2001/12/21 09:07:09 hubertf Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-CMP="@CMP@"
-RM="@RM@"
-RMDIR="@RMDIR@"
-TRUE="@TRUE@"
-
-SERVERROOT="@SILCD_CONF_DIR@"
-DATADIR=${PKG_PREFIX}/share/silcd
-LOGDIR=/var/log/silcd
-SAMPLECONFDIR=${PKG_PREFIX}/share/doc/silcd
-CONFDIR=${SERVERROOT}
-RCSCRIPT="@CONF_DIR@/rc.d/silcd"
-CONFFILES="silcd.conf motd.txt"
-NONCONFFILES="silcd.pub silcd.prv"
+# $NetBSD: DEINSTALL,v 1.4 2002/01/26 14:43:16 hubertf Exp $
case ${STAGE} in
DEINSTALL)
- # Stop silcd if running
- ${RCSCRIPT} stop >/dev/null 2>&1 || ${TRUE}
-
- # Remove configuration files if they don't differ from the default
- # config file.
- #
- for file in ${CONFFILES}
- do
- FILE=${CONFDIR}/${file}
- SAMPLEFILE=${SAMPLECONFDIR}/${file}.default
- if ${CMP} -s ${FILE} ${SAMPLEFILE}
- then
- ${RM} -f ${FILE}
- fi
- done
- ${RM} -f ${RCSCRIPT}
+ ${ECHO} "==> Try to stop silcd if running."
+ @PREFIX@/etc/rc.d/silcd stop
;;
-
POST-DEINSTALL)
- modified_files=''
- for file in ${CONFFILES} ${NONCONFFILES}
- do
- FILE=${CONFDIR}/${file}
- if [ -f ${FILE} ]
- then
- modified_files="${modified_files} ${FILE}"
- fi
- done
-
- ${RMDIR} ${LOGDIR} 2>/dev/null || ${TRUE}
- ${RMDIR} ${SERVERROOT} 2>/dev/null || ${TRUE}
-
- existing_dirs=''
- for dir in ${CONFDIR} ${LOGDIR}
- do
- if [ -d ${dir} ]
- then
- existing_dirs="${existing_dirs} ${dir}"
- fi
- done
-
- if [ -n "${modified_files}" -o -n "${existing_dirs}" ]
- then
- ${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove:
-EOF
- if [ -n "${modified_files}" ]
- then
- ${CAT} << EOF
-
- * the following files:
-
-EOF
- for file in ${modified_files}
- do
- echo " ${file}"
- done
- fi
- if [ -n "${existing_dirs}" ]
- then
- ${CAT} << EOF
-
- * the following directories:
-
-EOF
- for dir in ${existing_dirs}
- do
- echo " ${dir}"
- done
- fi
- ${CAT} << EOF
-===========================================================================
-EOF
- fi
- ;;
-
-*)
- echo "Unexpected argument: ${STAGE}"
- exit 1
+ ${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}
;;
esac
-exit 0
diff --git a/chat/silc-server/INSTALL b/chat/silc-server/INSTALL
index 00601f1d8d2..099e3cadd1b 100644
--- a/chat/silc-server/INSTALL
+++ b/chat/silc-server/INSTALL
@@ -1,103 +1,11 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.2 2001/12/17 00:43:10 hubertf Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-CHMOD="@CHMOD@"
-CHOWN="@CHOWN@"
-CP="@CP@"
-MKDIR="@MKDIR@"
-
-SERVERROOT="@SILCD_CONF_DIR@"
-LOGDIR=/var/log/silcd
-SAMPLECONFDIR=${PKG_PREFIX}/share/doc/silcd
-CONFDIR=${SERVERROOT}
-CONFFILES="silcd.conf motd.txt"
-PUBKEY="silcd.pub"
-PRIVKEY="silcd.prv"
-
-case ${STAGE} in
-PRE-INSTALL)
- ;;
+# $NetBSD: INSTALL,v 1.3 2002/01/26 14:43:16 hubertf Exp $
+case "${STAGE}" in
POST-INSTALL)
- ${MKDIR} ${SERVERROOT}
- ${CAT} << EOF
-===========================================================================
-
- * creating directory for log files owned by root, group nobody:
-
-EOF
-
- if [ -d ${LOGDIR} ]
- then
- echo " WARNING: ${LOGDIR} already exists, owner"
- echo " and permissions may be changed."
- else
- ${MKDIR} ${LOGDIR}
- echo " ${LOGDIR}"
+ if [ ! -f @PKG_SYSCONFDIR@/silcd.prv ]; then
+ ${ECHO} "==> Server private key is missing."
+ @PREFIX@/sbin/silcd -C @PKG_SYSCONFDIR@
+ ${ECHO} ===========================================================================
fi
-
- ${CHOWN} root:nobody ${LOGDIR}
- ${CHMOD} 2775 ${LOGDIR}
-
- ${CAT} << EOF
-
- * don't forget to change this if you will setup silcd to run with
- different UID and GID in silcd.conf!
-
-===========================================================================
-
- * installing configuration files:
-
-EOF
-
- for file in ${CONFFILES}
- do
- FILE=${CONFDIR}/${file}
- SAMPLEFILE=${SAMPLECONFDIR}/${file}.default
- if [ -f ${FILE} ]
- then
- echo " ${FILE} already exists"
- else
- echo " ${FILE}"
- ${CP} ${SAMPLEFILE} ${FILE}
- fi
- done
- ${CHMOD} 600 ${CONFDIR}/silcd.conf
- ${CHMOD} 644 ${CONFDIR}/motd.txt
- ${CAT} << EOF
-
- * you might need to customize your configuration file and the MOTD
-
-===========================================================================
-
-EOF
-
- if [ -f ${CONFDIR}/${PUBKEY} ] && [ -f ${CONFDIR}/${PRIVKEY} ]
- then
- echo " * ${PUBKEY} and ${PRIVKEY} already exist:"
- echo
- echo " ${CONFDIR}/${PUBKEY}"
- echo " ${CONFDIR}/${PRIVKEY}"
- else
- echo " * one or all of your server keys is missing,"
- echo
- ${PKG_PREFIX}/sbin/silcd -C ${CONFDIR}
- fi
-
- ${CAT} << EOF
-
-===========================================================================
-EOF
- ;;
-
-*)
- echo "Unexpected argument: ${STAGE}"
- exit 1
;;
esac
-exit 0
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 40707991eee..68fcf2db905 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2001/12/28 21:29:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2002/01/26 14:43:16 hubertf Exp $
-DISTNAME= silc-server-0.7.3
+DISTNAME= silc-server-0.7.6
CATEGORIES= chat
MASTER_SITES= http://silcnet.org/download/server/sources/ \
ftp://ftp.silcnet.org/silc/server/sources/ \
@@ -23,47 +23,49 @@ USE_BUILDLINK_ONLY= yes
.include "../../mk/bsd.prefs.mk"
+SILCD_USER?= silcd
+SILCD_GROUP?= silcd
+PKG_GROUPS= ${SILCD_GROUP}
+PKG_USERS= ${SILCD_USER}:${SILCD_GROUP}::SILC\\ Server\\ user
+
PKG_SYSCONFSUBDIR?= silcd
-CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/silcd \
- --with-etcdir=${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR} \
- --with-silcd-config-file=${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR}/silcd.conf \
- --with-silcd-pid-file=/var/run/silcd.pid \
- --with-logsdir=/var/log/silcd \
- --without-ncurses
+CONF_FILES_MODE= 0600
+CONF_FILES= ${PREFIX}/share/doc/silcd/silcd.conf.default \
+ ${PKG_SYSCONFDIR}/silcd.conf
+CONF_FILES_PERMS= ${PREFIX}/share/doc/silcd/motd.txt.default \
+ ${PKG_SYSCONFDIR}/motd.txt \
+ ${ROOT_USER} ${ROOT_GROUP} 0644
+SUPPORT_FILES_PERMS= ${PREFIX}/share/doc/silcd/silcd.default \
+ ${PREFIX}/etc/rc.d/silcd \
+ ${ROOT_USER} ${ROOT_GROUP} 0555
-INSTALL_FILE= ${WRKDIR}/INSTALL
-DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
+RCD_SCRIPTS= silcd
+RCD_SCRIPTS_MODE= 0555
-FILES_SUBST+= PREFIX=${PREFIX}
-FILES_SUBST+= CAT=${CAT:Q}
-FILES_SUBST+= CHMOD=${CHMOD:Q}
-FILES_SUBST+= CHOWN=${CHOWN:Q}
-FILES_SUBST+= CMP=${CMP:Q}
-FILES_SUBST+= CP=${CP:Q}
-FILES_SUBST+= MKDIR=${MKDIR:Q}
-FILES_SUBST+= RM=${RM:Q}
-FILES_SUBST+= RMDIR=${RMDIR:Q}
-FILES_SUBST+= TRUE=${TRUE:Q}
-FILES_SUBST+= SILCD_CONF_DIR=${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR}
-FILES_SUBST+= CONF_DIR=${PKG_SYSCONFBASE}
-FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/}
+OWN_DIRS_PERMS+= /var/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700
-pre-install:
- ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
- ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
- ${SED} ${FILES_SUBST_SED} ${FILESDIR}/silcd.sh > ${WRKDIR}/silcd.sh
- ${SED} ${FILES_SUBST_SED} ${FILESDIR}/motd.txt > ${WRKDIR}/motd.txt
+INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL
+DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL
-post-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/motd.txt ${PREFIX}/share/doc/silcd/motd.txt.default
- @PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
- ${INSTALL_SCRIPT} ${WRKDIR}/silcd.sh ${PKG_SYSCONFBASE}/rc.d/silcd
+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-silcd-pid-file=/var/run/silcd.pid
+CONFIGURE_ARGS+= --with-logsdir=/var/log/silcd
+CONFIGURE_ARGS+= --without-ncurses
.if (${MACHINE_ARCH} != "i386")
CONFIGURE_ARGS+= --disable-asm
.endif
+post-install:
+ @${SED} ${FILES_SUBST_SED} ${FILESDIR}/silcd.sh \
+ > ${PREFIX}/share/doc/silcd/silcd.default
+ @${SED} ${FILES_SUBST_SED} ${FILESDIR}/motd.txt \
+ > ${PREFIX}/share/doc/silcd/motd.txt.default
+
.include "../../devel/glib/buildlink.mk"
.include "../../devel/pth/buildlink.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 9b9aabbaa78..e31d5825839 100644
--- a/chat/silc-server/PLIST
+++ b/chat/silc-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/17 00:43:10 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/01/26 14:43:16 hubertf Exp $
sbin/silcd
share/doc/silcd/CHANGES
share/doc/silcd/COPYING
@@ -9,6 +9,7 @@ share/doc/silcd/INSTALL
share/doc/silcd/README
share/doc/silcd/TODO
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
diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo
index 51dde92f252..d9e334fce10 100644
--- a/chat/silc-server/distinfo
+++ b/chat/silc-server/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/12/28 21:29:16 hubertf Exp $
+$NetBSD: distinfo,v 1.5 2002/01/26 14:43:16 hubertf Exp $
-SHA1 (silc-server-0.7.3.tar.bz2) = 4974c0cc1a14498b4cbc9861b9b96337768ea281
-Size (silc-server-0.7.3.tar.bz2) = 945075 bytes
-SHA1 (patch-aa) = b0d1100685af0e429a4405abf601d53bd8550fff
-SHA1 (patch-ab) = 84e7e136d32b76a05654ddb07f65ab9c3a70efe2
+SHA1 (silc-server-0.7.6.tar.bz2) = aec5ad2715c9179dc44b14eb707314f70fdee28f
+Size (silc-server-0.7.6.tar.bz2) = 955592 bytes
+SHA1 (patch-aa) = b448a5e53564c9e72076adc58c252a527971f35e
+SHA1 (patch-ab) = 91395362f578ffd75419a57399bed0bf3ba2d5ff
diff --git a/chat/silc-server/files/motd.txt b/chat/silc-server/files/motd.txt
index 78a7c3e77dd..0e0aa04eca4 100644
--- a/chat/silc-server/files/motd.txt
+++ b/chat/silc-server/files/motd.txt
@@ -1,10 +1,25 @@
--
-- Message of the Day:
--
-- This is new installed SILC Server from the NetBSD pkgsrc package.
--
-- Example configuration files are located in the following directory:
+- Message of the day: , ,
+- /( )`
+- \ \___ / |
+- /- _ `-/ '
+- (/\/ \ \ /\
+- / / | ` \
+- O O ) / |
+- `-^--'`< '
+- (_.) _ ) /
+- WELCOME! `.___/` /
+- `-----' /
+- This is a fresh new SILC <----. __ / __ \
+- Server installed from the <----|====O)))==) \) /====
+- NetBSD pkgsrc package. <----' `--' `.__,' \
+- | |
+- \ /
+- Example configuration files ______( (_ / \_____
+- are located in the following ,' ,-----' | \
+- directory: `--{__________) \/
+- (FL)
- @PREFIX@/share/doc/silcd/examples/
-
-- For more information about the SILC browse to http://silcnet.org/
+--------------------------------------------------------------
+- For more information about SILC browse to http://silcnet.org
-
diff --git a/chat/silc-server/files/silcd.sh b/chat/silc-server/files/silcd.sh
index 45b8bc90d53..91ba94bded0 100644
--- a/chat/silc-server/files/silcd.sh
+++ b/chat/silc-server/files/silcd.sh
@@ -1,27 +1,29 @@
#!/bin/sh
#
-# $NetBSD: silcd.sh,v 1.2 2001/12/17 00:43:11 hubertf Exp $
+# $NetBSD: silcd.sh,v 1.3 2002/01/26 14:43:17 hubertf Exp $
#
# PROVIDE: silcd
# REQUIRE: DAEMON
+#
+# To start silcd at startup, copy this script to /etc/rc.d and set
+# silcd=YES in /etc/rc.conf.
. /etc/rc.subr
name="silcd"
+rcvar=$name
+confdir="@PKG_SYSCONFDIR@"
+required_files="$confdir/silcd.conf"
+required_dirs="/var/log/silcd"
pidfile="/var/run/${name}.pid"
command="@PREFIX@/sbin/silcd"
start_precmd="silcd_precmd"
stop_cmd="silcd_stop"
-confdir="@SILCD_CONF_DIR@"
silcd_precmd()
{
- if [ -f $confdir/silcd.conf ]; then
- if [ ! -f $confdir/silcd.prv ]; then
- $command -C $confdir
- fi
- else
- warn "Cannot open $confdir/silcd.conf"
+ if [ ! -f $confdir/silcd.prv ]; then
+ $command -C $confdir
fi
}
@@ -36,10 +38,6 @@ silcd_stop()
exit 1
fi
- if ! eval $_precmd && [ -z "$_rc_force_run" ]; then
- return 1
- fi
-
echo "Stopping ${name}."
_doit=\
"${_user:+su -m $_user -c '}kill -${sig_stop:-TERM} $_pid${_user:+'}"
@@ -51,4 +49,5 @@ silcd_stop()
fi
}
+load_rc_config $name
run_rc_command "$1"
diff --git a/chat/silc-server/patches/patch-aa b/chat/silc-server/patches/patch-aa
index 42a69dee9ae..e4804672ecf 100644
--- a/chat/silc-server/patches/patch-aa
+++ b/chat/silc-server/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2001/12/17 00:43:11 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2002/01/26 14:43:18 hubertf Exp $
---- Makefile.in.orig Sun Dec 9 21:24:29 2001
-+++ Makefile.in Sun Dec 9 23:09:26 2001
+--- Makefile.in.orig Tue Jan 22 20:40:58 2002
++++ Makefile.in
@@ -528,25 +528,12 @@
-rm -rf $(distdir)
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.2 2001/12/17 00:43:11 hubertf Exp $
- fi
-
-sim-install:
-- -cp -fR $(srcdir)/lib/silcsim/modules/*.so $(modulesdir)/
+- $(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
doc-install:
$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
diff --git a/chat/silc-server/patches/patch-ab b/chat/silc-server/patches/patch-ab
index 93d7d2262b5..ad18372502f 100644
--- a/chat/silc-server/patches/patch-ab
+++ b/chat/silc-server/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2001/12/28 21:29:17 hubertf Exp $
+$NetBSD: patch-ab,v 1.3 2002/01/26 14:43:18 hubertf Exp $
---- doc/example_silcd.conf.in.orig Thu Nov 29 21:23:19 2001
-+++ doc/example_silcd.conf.in Sun Dec 9 23:47:33 2001
+--- doc/example_silcd.conf.in.orig Mon Jan 14 23:03:37 2002
++++ doc/example_silcd.conf.in
@@ -8,25 +8,27 @@
# Configured ciphers.
#
@@ -56,15 +56,17 @@ $NetBSD: patch-ab,v 1.2 2001/12/28 21:29:17 hubertf Exp $
#
[PKCS]
rsa
-@@ -59,6 +63,7 @@
+@@ -59,30 +63,34 @@
# run as root.
#
# Format: <user>:<group>
-+# Example: silcd:silcd
++# Example: nobody:nobody
#
[Identity]
- nobody:nobody
-@@ -67,22 +72,25 @@
+-nobody:nobody
++silcd:silcd
+
+ #
# Server's administrative information.
#
# Format: <location>:<server type>:<admin's name>:<admin's email address>
@@ -106,24 +108,22 @@ $NetBSD: patch-ab,v 1.2 2001/12/28 21:29:17 hubertf Exp $
#
# Log files.
-@@ -107,12 +116,13 @@
+@@ -120,9 +129,13 @@
# warninglogile:<path>:<max byte size>
# errorlogile:<path>:<max byte size>
# fatallogile:<path>:<max byte size>
-+# Example: infologfile:/usr/local/silc/logs/silcd.log:10000
++# Example: quicklogs:no:
++# flushdelay:10:
++# infologfile:/usr/local/silc/logs/silcd.log:10000
++#
#
[Logging]
- infologfile:@LOGSDIR@/silcd.log:10000
--#warninglogfile:@LOGSDIR@/silcd_warning.log:10000
--#errorlogfile:@LOGSDIR@/error.log:10000
--#fatallogfile:@LOGSDIR@/silcd_error.log:
-+warninglogfile:@LOGSDIR@/silcd_warning.log:10000
-+errorlogfile:@LOGSDIR@/error.log:10000
-+fatallogfile:@LOGSDIR@/silcd_error.log:
-
- #
- # Connection classes.
-@@ -121,6 +131,7 @@
+-quicklogs:no:
++quicklogs:yes:
+ flushdelay:300:
+ infologfile:@LOGSDIR@/silcd.log:50000
+ warninglogfile:@LOGSDIR@/silcd_warnings.log:50000
+@@ -136,6 +149,7 @@
# used to optimize the server and the connections.#
#
# Format: <class number>:<ping freq>:<connect freq>:<max links>
@@ -131,7 +131,7 @@ $NetBSD: patch-ab,v 1.2 2001/12/28 21:29:17 hubertf Exp $
#
[ConnectionClass]
1:100:100:100
-@@ -130,6 +141,7 @@
+@@ -145,6 +159,7 @@
# Configured client connections.
#
# Format: <remote host>:<auth method>:<auth data>:<port>:<class>
@@ -139,7 +139,7 @@ $NetBSD: patch-ab,v 1.2 2001/12/28 21:29:17 hubertf Exp $
#
# The <auth data> is either passphrase or file path to the public key
# file.
-@@ -141,12 +153,13 @@
+@@ -156,12 +171,13 @@
# Configured server administrator connections
#
# Format: <host>:<username>:<nickname>:<auth method>:<auth data>
@@ -154,7 +154,7 @@ $NetBSD: patch-ab,v 1.2 2001/12/28 21:29:17 hubertf Exp $
#
# Configured server connections.
-@@ -158,6 +171,10 @@
+@@ -173,6 +189,10 @@
#
# Format: <remote host>:<auth method>:<auth data>:<port>:
# <version ID>:<class>:<backup connection>
@@ -165,7 +165,7 @@ $NetBSD: patch-ab,v 1.2 2001/12/28 21:29:17 hubertf Exp $
#
# The <auth data> is either passphrase or file path to the public key
# file. If the connection is backup connection then set the <backup
-@@ -165,10 +182,6 @@
+@@ -180,10 +200,6 @@
# set to value 1 then this server will be backup router.
#
[ServerConnection]
@@ -176,7 +176,7 @@ $NetBSD: patch-ab,v 1.2 2001/12/28 21:29:17 hubertf Exp $
#
# Configured router connections.
-@@ -181,6 +194,9 @@
+@@ -196,6 +212,9 @@
# Format: <remote host>:<auth method>:<auth data>:<port>:<version ID>:
# <class>:<initiator>:<backup replace IP>:<backup replace port>:
# <local backup>
@@ -186,7 +186,7 @@ $NetBSD: patch-ab,v 1.2 2001/12/28 21:29:17 hubertf Exp $
#
# The <auth data> is either passphrase or file path to the public key
# file. If you are the initiator of the connection then set the <initiator>
-@@ -195,9 +211,6 @@
+@@ -210,9 +229,6 @@
# If the backup router is in other cell then set it to value 0.
#
[RouterConnection]
@@ -196,7 +196,7 @@ $NetBSD: patch-ab,v 1.2 2001/12/28 21:29:17 hubertf Exp $
#
# Denied connections.
-@@ -205,22 +218,28 @@
+@@ -220,22 +236,27 @@
# These connections are denied to connect our server.
#
# Format: <remote host>:<port>:<comment>
@@ -220,15 +220,13 @@ $NetBSD: patch-ab,v 1.2 2001/12/28 21:29:17 hubertf Exp $
+@ETCDIR@/motd.txt
#
--# Pid File
-+# Pidfile
-+#
-+# Specify the pidfile where it will be written.
+ # Pid File
#
-# specify the pidfile where it will be written:
++# Specify the pidfile where it will be written.
+ #
+# Format: <filename>
+# Example: /var/run/silcd.pid
- #
[pid]
-@PIDFILE@
+/var/run/silcd.pid