[Pkg-silc-commits] r70 - in /silc-server/trunk: ./ debian/ debian/po/ doc/

lunar at users.alioth.debian.org lunar at users.alioth.debian.org
Fri Jun 15 16:02:42 UTC 2007


Author: lunar
Date: Fri Jun 15 16:02:42 2007
New Revision: 70

URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=70
Log:
[svn-inject] Applying Debian modifications to trunk

Added:
    silc-server/trunk/debian/
    silc-server/trunk/debian/TODO
    silc-server/trunk/debian/changelog
    silc-server/trunk/debian/compat
    silc-server/trunk/debian/config
    silc-server/trunk/debian/control
    silc-server/trunk/debian/copyright
    silc-server/trunk/debian/dirs
    silc-server/trunk/debian/docs
    silc-server/trunk/debian/examples
    silc-server/trunk/debian/init.d
    silc-server/trunk/debian/logrotate
    silc-server/trunk/debian/po/
    silc-server/trunk/debian/po/POTFILES.in
    silc-server/trunk/debian/po/templates.pot
    silc-server/trunk/debian/postinst
    silc-server/trunk/debian/postrm
    silc-server/trunk/debian/rules   (with props)
    silc-server/trunk/debian/silcd-admin.conf.default
    silc-server/trunk/debian/silcd-primary-ip.conf.default
    silc-server/trunk/debian/silcd.conf.default
    silc-server/trunk/debian/templates
Removed:
    silc-server/trunk/config.guess
    silc-server/trunk/config.sub
Modified:
    silc-server/trunk/doc/silcd.8
    silc-server/trunk/doc/silcd.conf.5

Added: silc-server/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/TODO?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/TODO (added)
+++ silc-server/trunk/debian/TODO Fri Jun 15 16:02:42 2007
@@ -1,0 +1,18 @@
+TODO for the Debian silc-server
+===============================
+
+* Re-ask the debconf questions on unsuitable entry.
+* Ask upstream about forbidden chars in identifier string, and for a possible
+  escape sequence.
+* Implements checks or needed escaping.
+* Figure out why empty strings are not permitted in silcd.conf
+  (e.g. for Location).  If a change upstream is not possible, implements
+  comment/uncomment in the configuration file (might worth another
+  configuration file split).
+* Neither SIGHUP nor SIGUSR1 works as expected.  Might be an upstream bug.
+* Improve debconf templates.
+
+* Bugs to report upstream:
+  - silcd segfaults if no primary stanza exists in silcd.conf.
+  - silcd --create-key-pair always exit with 0 even when key creation fails.
+

Added: silc-server/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/changelog?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/changelog (added)
+++ silc-server/trunk/debian/changelog Fri Jun 15 16:02:42 2007
@@ -1,0 +1,6 @@
+silc-server (1.1~pre1-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Jérémy Bobbio <lunar at debian.org>  Thu, 14 Jun 2007 11:17:49 +0000
+

Added: silc-server/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/compat?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/compat (added)
+++ silc-server/trunk/debian/compat Fri Jun 15 16:02:42 2007
@@ -1,0 +1,1 @@
+5

Added: silc-server/trunk/debian/config
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/config?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/config (added)
+++ silc-server/trunk/debian/config Fri Jun 15 16:02:42 2007
@@ -1,0 +1,67 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+CONFIGFILE="/etc/silcd/silcd.conf"
+ADMINCONFIGFILE="/etc/silcd/silcd-admin.conf"
+
+read_config() {
+    FILE="$1"
+    PARAMETER="$2"
+    sed -n -e "s/^[^#]*$PARAMETER  *=  *\"\([^\"]*\)\".*$/\1/p" "$CONFIGFILE"
+}
+
+if [ -e "$CONFIGFILE" ]; then
+    PUBLIC_KEY="$(read_config "$CONFIGFILE" PublicKey)"
+    PRIVATE_KEY="$(read_config "$CONFIGFILE" PrivateKey)"
+
+    SERVER_NAME="$(read_config "$CONFIGFILE" ServerType)"
+    if [ -n "$SERVER_NAME" ]; then
+        db_set silcd/server-name "$SERVER_NAME"
+    fi
+    HOST_NAME="$(read_config "$CONFIGFILE" hostname)"
+    if [ -n "$HOST_NAME" ]; then
+        db_set silcd/host-name "$HOST_NAME"
+    fi
+    REAL_NAME="$(read_config "$CONFIGFILE" Admin)"
+    if [ -n "$REAL_NAME" ]; then
+        db_set silcd/real-name "$REAL_NAME"
+    fi
+    EMAIL="$(read_config "$CONFIGFILE" AdminEmail)"
+    if [ -n "$EMAIL" ]; then
+        db_set silcd/email "$EMAIL"
+    fi
+    COUNTRY="$(read_config "$CONFIGFILE" Location)"
+    if [ -n "$COUNTRY" ]; then
+        db_set silcd/country "$COUNTRY"
+    fi
+    ADMIN_NICK="$(read_config "$ADMINCONFIGFILE" Nick)"
+    if [ -n "$ADMIN_NICK" ]; then
+        db_set silcd/admin-nick "$ADMIN_NICK"
+    fi
+    ADMIN_PASSPHRASE="$(read_config "$ADMINCONFIGFILE" Passphrase)"
+    if [ -n "$ADMIN_PASSPHRASE" ]; then
+        db_set silcd/admin-passphrase "$ADMIN_PASSPHRASE"
+    fi
+else
+    PUBLIC_KEY="/etc/silcd/silcd.pub"
+    PRIVATE_KEY="/etc/silcd/silcd.prv"
+    HOST_NAME="$(hostname -f)"
+fi
+
+db_input high silcd/server-name || true
+db_input high silcd/host-name || true
+db_input high silcd/real-name || true
+db_input high silcd/email || true
+if ! [ -e "$PUBLIC_KEY" -a -e "$PRIVATE_KEY" ]; then
+    db_input high silcd/organization || true
+fi
+db_input high silcd/country || true
+db_go || true
+
+db_input high silcd/admin-nick || true
+db_input high silcd/admin-passphrase || true
+db_go || true
+

Added: silc-server/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/control?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/control (added)
+++ silc-server/trunk/debian/control Fri Jun 15 16:02:42 2007
@@ -1,0 +1,25 @@
+Source: silc-server
+Section: net
+Priority: extra
+Maintainer: Debian SILC Team <pkg-silc-devel at lists.alioth.debian.org>
+Uploaders: Jérémy Bobbio <lunar at debian.org>
+Build-Depends: debhelper (>= 5), autotools-dev, libsilc-1.1-1-dev, po-debconf
+Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/pkg-silc/silc-server/trunk
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk
+
+Package: silcd
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ucf
+Provides: silc-server
+Description: server for the Secure Live Internet Conferencing (SILC) protocol
+ silc-server is a server for the SILC protocol.
+ .
+ SILC (Secure Internet Live Conferencing) is a protocol which provides
+ secure conferencing services in the Internet over insecure channel.
+ SILC is IRC like softwarre although internally they are very different.
+ Biggest similarity between SILC and IRC is that they both provide
+ conferencing services and that SILC has almost same commands as IRC.  Other
+ than that they are nothing alike.  Biggest differences are that SILC is
+ secure what IRC is not in any way.  The network model is also entirely
+ different compared to IRC.

Added: silc-server/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/copyright?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/copyright (added)
+++ silc-server/trunk/debian/copyright Fri Jun 15 16:02:42 2007
@@ -1,0 +1,130 @@
+This package was debianized by Jérémy Bobbio <lunar at debian.org> on
+Thu, 14 Jun 2007 11:17:49 +0000.
+
+It was downloaded from http://silcnet.org/software/download/server/
+and http://silcnet.org/priikone/pre/ for pre-release versions.
+
+Upstream Author: 
+
+    Pekka Riikonen <priikone at silcnet.org>
+
+Copyright: 
+
+    Copyright (C) 1997-2007 Pekka Riikonen
+
+License:
+
+    silc-server is is distributed under the terms of the GNU General Public
+    License, version 2.
+
+The Debian packaging is (C) 2007, Jérémy Bobbio <lunar at debian.org> and
+is licensed under the GPL, version 2.
+
+On Debian systems, a copy of the GNU General Public License, version 2 is
+available in /usr/share/common-licenses/GPL-2 as part of the base-files
+package.
+
+Exceptions to the previous statements:
+
+  * lib/contrib/getopti.c,
+    lib/contrib/getopti.hh:
+
+    Public Domain.
+
+  * lib/contrib/nfkc.c,
+    lib/contrib/stringprep.c:
+
+    Copyright (C) 2002, 2003, 2004, 2005 Simon Josefsson
+
+    Licensed under the GNU General Public License, version 2.1 or any later
+    version.
+
+  * lib/contrib/regexpr.c,
+    lib/contrib/regexpr.h:
+
+    Copyright (C) 1991 Tatu Ylonen
+
+    Permission to use, copy, modify, distribute, and sell this software and its
+    documentation is hereby granted without fee, provided that the above
+    copyright notice appears in all source code copies, the name of Tatu Ylonen
+    is not used to advertise products containing this software or a derivation
+    thereof, and all modified versions are clearly marked as such.
+
+  * lib/silccrypt/aes.c:
+
+    Copyright (C) 1998-2006 Brian Gladman
+
+    Licensed under the GNU General Public License.
+  
+  * lib/silccrypt/aes_x86.asm,
+    lib/silccrypt/aes_x86_64.asm:
+
+    Copyright (C) 2002 Brian Gladman
+
+    Licensed under the GNU General Public License.
+
+  * lib/silccrypt/blowfish.c: 
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, dis-tribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+    THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the name of the authors shall not be
+    used in advertising or otherwise to promote the sale, use or other dealings
+    in this Software without prior written authorization from the authors.
+
+  * lib/silccrypt/md5.c,
+    lib/silccrypt/md5_internal.h:
+    
+    Public Domain.
+
+  * lib/silccrypt/rijndael_internal.h:
+    
+    Copyright (C) 1998-2006 Brian Gladman
+
+    Licensed under the GNU General Public License.
+
+  * lib/silccrypt/sha1.c,
+    lib/silccrypt/sha1_internal.h:
+    
+    Public Domain.
+
+  * lib/silccrypt/sha256.c:
+    
+    Public Domain.
+
+  * lib/silcrypt/twofish.c:
+
+    Copyright (C) 1999 Brian Gladman
+
+    Copyright in this implementation is held by Dr B R Gladman but I hereby
+    give permission for its free direct or derivative use subject to
+    acknowledgment of its origin and compliance with any conditions that the
+    originators of the algorithm place on its exploitation.
+
+  * lib/silcmath/tma.c,
+    lib/silcmath/tma.h:
+
+    Public Domain.
+
+  * lib/silcutil/silcsnprintf.c:
+
+    Copyright (C) 1995 Patrick Powell
+
+    This code is based on code written by Patrick Powell (papowell at astart.com)
+    It may be used for any purpose as long as this notice remains intact on all
+    source code distributions
+

Added: silc-server/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/dirs?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/dirs (added)
+++ silc-server/trunk/debian/dirs Fri Jun 15 16:02:42 2007
@@ -1,0 +1,2 @@
+usr/bin
+usr/sbin

Added: silc-server/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/docs?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/docs (added)
+++ silc-server/trunk/debian/docs Fri Jun 15 16:02:42 2007
@@ -1,0 +1,2 @@
+README
+TODO

Added: silc-server/trunk/debian/examples
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/examples?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/examples (added)
+++ silc-server/trunk/debian/examples Fri Jun 15 16:02:42 2007
@@ -1,0 +1,3 @@
+debian/silcd.conf.default
+debian/silcd-admin.conf.default
+debian/silcd-primary-ip.conf.default

Added: silc-server/trunk/debian/init.d
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/init.d?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/init.d (added)
+++ silc-server/trunk/debian/init.d Fri Jun 15 16:02:42 2007
@@ -1,0 +1,108 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          silcd
+# Required-Start:    $local_fs $remote_fs $network
+# Required-Stop:     $local_fs $remote_fs $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: SILC server
+# Description:       A server for the Secure Live Internet Conferencing (SILC)
+#                    protocol.
+### END INIT INFO
+
+# Author: Jérémy Bobbio <lunar at debian.org>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="SILC server"
+NAME=silcd
+DAEMON=/usr/sbin/$NAME
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+do_start()
+{
+    start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON \
+        --test > /dev/null || return 1
+    start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON \
+        || return 2
+}
+
+do_stop()
+{
+    start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 \
+        --pidfile $PIDFILE --name $NAME
+    RETVAL="$?"
+    [ "$RETVAL" = 2 ] && return 2
+    start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 \
+        --exec $DAEMON
+    [ "$?" = 2 ] && return 2
+    rm -f $PIDFILE
+    return "$RETVAL"
+}
+
+do_reload() {
+    start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE \
+        --name $NAME
+    return 0
+}
+
+case "$1" in
+    start)
+        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+        do_start
+        case "$?" in
+            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+        esac
+        ;;
+    stop)
+        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+        do_stop
+        case "$?" in
+            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+        esac
+        ;;
+    reload|force-reload)
+        log_daemon_msg "Reloading $DESC" "$NAME"
+        do_reload
+        log_end_msg $?
+        ;;
+    restart)
+        log_daemon_msg "Restarting $DESC" "$NAME"
+        do_stop
+        case "$?" in
+            0|1)
+                do_start
+                case "$?" in
+                    0) log_end_msg 0 ;;
+                    1) log_end_msg 1 ;; # Old process is still running
+                    *) log_end_msg 1 ;; # Failed to start
+                esac
+                ;;
+            *)
+                # Failed to stop
+                log_end_msg 1
+                ;;
+        esac
+        ;;
+    *)
+        echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+        exit 3
+        ;;
+esac
+
+:
+
+#vim et sw=4

Added: silc-server/trunk/debian/logrotate
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/logrotate?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/logrotate (added)
+++ silc-server/trunk/debian/logrotate Fri Jun 15 16:02:42 2007
@@ -1,0 +1,15 @@
+/var/log/silcd/*.log {
+	weekly
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	create 640 root adm
+	sharedscripts
+	postrotate
+		if [ -f /var/run/silcd.pid ]; then
+			/usr/sbin/invoke-rc.d silcd reload > /dev/null
+		fi
+	endscript
+}

Added: silc-server/trunk/debian/po/POTFILES.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/po/POTFILES.in?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/po/POTFILES.in (added)
+++ silc-server/trunk/debian/po/POTFILES.in Fri Jun 15 16:02:42 2007
@@ -1,0 +1,1 @@
+[type: gettext/rfc822deb] templates

Added: silc-server/trunk/debian/po/templates.pot
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/po/templates.pot?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/po/templates.pot (added)
+++ silc-server/trunk/debian/po/templates.pot Fri Jun 15 16:02:42 2007
@@ -1,0 +1,151 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: pkg-silc-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-06-15 13:50+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "silcd server name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"Please enter the name of the SILC server. (e.g. Some random SILC server)"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "silcd hostname:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid ""
+"Please enter the hostname (or the IP address) of the SILC server. (e.g. silc."
+"example.com)"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid "silcd administrator real name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid ""
+"Please enter the real name of the operator running the SILC server. (e.g. "
+"Foo T. Bar)"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#: ../templates:3001 ../templates:4001 ../templates:5001 ../templates:6001
+msgid "This field may be left empty."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "silcd administrator email address:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid ""
+"Please enter the email address of the operator running the SILC server. (e."
+"g. silc at example.com)"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "silcd organization:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"Please enter the organization running the SILC server. (e.g. Some "
+"Organization)"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "silcd location:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Please enter the country where is located the SILC server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "silcd administrator nickname:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Please enter the nickname of the administrator of the SILC server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid ""
+"Administrator will need to use this nickname in order to authenticate "
+"herself."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../templates:8001
+msgid "silcd administrator passphrase:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../templates:8001
+msgid ""
+"Please enter the passphrase that will authenticate the SILC server "
+"administrator."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../templates:8001
+msgid ""
+"Admnisitrator will need to enter this passphrase to authenticate herself."
+msgstr ""

Added: silc-server/trunk/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/postinst?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/postinst (added)
+++ silc-server/trunk/debian/postinst Fri Jun 15 16:02:42 2007
@@ -1,0 +1,150 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+CONFIGDIR="/etc/silcd"
+CONFIGFILE="$CONFIGDIR/silcd.conf"
+IPCONFIGFILE="$CONFIGDIR/silcd-primary-ip.conf"
+ADMINCONFIGFILE="$CONFIGDIR/silcd-admin.conf"
+DEFAULT_CONFIGDIR="/usr/share/doc/silcd/examples"
+DEFAULT_CONFIGFILE="$DEFAULT_CONFIGDIR/silcd.conf.default.gz"
+DEFAULT_IPCONFIGFILE="$DEFAULT_CONFIGDIR/silcd-primary-ip.conf.default"
+DEFAULT_ADMINCONFIGFILE="$DEFAULT_CONFIGDIR/silcd-admin.conf.default"
+
+read_config() {
+    PARAMETER="$1"
+    sed -n -e "s/^[^#]*$PARAMETER  *=  *\"\([^\"]*\)\".*$/\1/p" "$CONFIGFILE"
+}
+
+if [ -e "$CONFIGFILE" ]; then
+    PUBLIC_KEY="$(read_config PublicKey)"
+    PRIVATE_KEY="$(read_config PrivateKey)"
+else
+    PUBLIC_KEY="/etc/silcd/silcd.pub"
+    PRIVATE_KEY="/etc/silcd/silcd.prv"
+fi
+
+retrieve_debconf_answers() {
+    db_get silcd/server-name
+    SERVER_NAME="$RET"
+    db_get silcd/host-name
+    HOST_NAME="$RET"
+    db_get silcd/real-name
+    REAL_NAME="$RET"
+    db_get silcd/email
+    EMAIL="$RET"
+    db_get silcd/organization
+    ORGANIZATION="$RET"
+    db_get silcd/country
+    COUNTRY="$RET"
+    db_get silcd/admin-nick
+    ADMIN_NICK="$RET"
+    db_get silcd/admin-passphrase
+    ADMIN_PASSPHRASE="$RET"
+}
+
+create_key_pair() {
+    retrieve_debconf_answers
+
+    IDENTIFIER="UN=$SERVER_NAME,HN=$HOST_NAME"
+    if [ -n "$REAL_NAME" ]; then
+        IDENTIFIER="$IDENTIFIER,RN=$REAL_NAME"
+    fi
+    if [ -n "$EMAIL" ]; then
+        IDENTIFIER="$IDENTIFIER,E=$EMAIL"
+    fi
+    if [ -n "$COUNTRY" ]; then
+        IDENTIFIER="$IDENTIFIER,C=$COUNTRY"
+    fi
+
+    TMPDIR=$(mktemp -d -t silcd.XXXXXX)
+    chmod 700 "$TMPDIR"
+    /usr/sbin/silcd --create-key-pair="$TMPDIR" --identifier="$IDENTIFIER"
+    mkdir -p "$(dirname "$PUBLIC_KEY")" "$(dirname "$PRIVATE_KEY")"
+    mv -f "$TMPDIR/silcd.pub" "$PUBLIC_KEY"
+    mv -f "$TMPDIR/silcd.prv" "$PRIVATE_KEY"
+    chmod 0600 "$PRIVATE_KEY"
+    rmdir "$TMPDIR"
+}
+
+change_setting() {
+    FILE="$1"
+    shift
+    KEY="$1"
+    shift
+    VALUE="$*"
+ 
+    VALUE="$(echo "$VALUE" | sed 's,/,\\/,g')"
+    sed -i -e "s/\([^#]*$KEY  *=  *\"\)[^\"]*\(\"\)/\1$VALUE\2/" "$FILE"
+}
+
+update_config_file() {
+    retrieve_debconf_answers
+    IP="$(getent hosts "$HOST_NAME" | awk '{print $1}')" 
+
+    # silcd.conf
+    TEMPFILE=$(tempfile)
+    zcat "$DEFAULT_CONFIGFILE" > "$TEMPFILE"
+
+    change_setting "$TEMPFILE" ServerType "$SERVER_NAME"
+    change_setting "$TEMPFILE" hostname "$HOST_NAME"
+    change_setting "$TEMPFILE" Admin "$REAL_NAME"
+    change_setting "$TEMPFILE" AdminEmail "$EMAIL"
+    change_setting "$TEMPFILE" Location "$COUNTRY"
+
+    ucf --debconf-ok "$TEMPFILE" "$CONFIGFILE"
+
+    rm -f "$TEMPFILE"
+
+    # silcd-primary-ip.conf
+    TEMPFILE=$(tempfile)
+    cat "$DEFAULT_IPCONFIGFILE" > "$TEMPFILE"
+
+    change_setting "$TEMPFILE" ip "$IP"
+
+    ucf --debconf-ok "$TEMPFILE" "$IPCONFIGFILE"
+
+    rm -f "$TEMPFILE"
+
+    # silcd-admin.conf
+    TEMPFILE="$(tempfile)"
+    cat "$DEFAULT_ADMINCONFIGFILE" > "$TEMPFILE"
+
+    change_setting "$TEMPFILE" Nick "$ADMIN_NICK"
+    change_setting "$TEMPFILE" Passphrase "$ADMIN_PASSPHRASE"
+
+    ucf --debconf-ok "$TEMPFILE" "$ADMINCONFIGFILE"
+
+    rm -f "$TEMPFILE"
+}
+
+case "$1" in
+    configure)
+        if [ "$DEBCONF_RECONFIGURE" = "$1" ] ||
+           ! [ -e "$PUBLIC_KEY" -a -e "$PRIVATE_KEY" ]; then
+            create_key_pair
+            update_config_file
+        fi
+        ;;
+
+    reconfigure)
+        create_key_pair
+        update_config_file
+        ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+        ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+#vim: et sw=4

Added: silc-server/trunk/debian/postrm
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/postrm?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/postrm (added)
+++ silc-server/trunk/debian/postrm Fri Jun 15 16:02:42 2007
@@ -1,0 +1,41 @@
+#!/bin/sh
+
+set -e
+
+CONFIGDIR="/etc/silcd"
+CONFIGFILE="$CONFIGDIR/silcd.conf"
+IPCONFIGFILE="$CONFIGDIR/silcd-primary-ip.conf"
+ADMINCONFIGFILE="$CONFIGDIR/silcd-admin.conf"
+
+case "$1" in
+    purge)
+        if [ -d /var/log/silcd ]; then
+            rm -rf /var/log/silcd
+        fi
+
+        # Remove conffile from ucf's database if ucf is available
+        if [ -x /usr/bin/ucf ]; then
+            for conffile in "$CONFIGFILE" "$IPCONFIGFILE" "$ADMINCONFIGFILE"; do
+                ucf --purge "$conffile"
+            done
+
+        fi
+
+        # Remove silcd configuration directory
+        rm -rf "$CONFIGDIR"
+        ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+# vim: et sw=4

Added: silc-server/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/rules?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/rules (added)
+++ silc-server/trunk/debian/rules Fri Jun 15 16:02:42 2007
@@ -1,0 +1,88 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	rm -f config.sub config.guess
+	ln -sf /usr/share/misc/config.sub config.sub
+	ln -sf /usr/share/misc/config.guess config.guess
+	./configure \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--docdir=\$${prefix}/share/doc/silcd \
+		--sysconfdir=/etc/silcd \
+		--with-silcd-config-file=/etc/silcd/silcd.conf \
+		--localstatedir=/var/run \
+		--with-logsdir=/var/log/silcd \
+		CFLAGS="$(CFLAGS)" \
+		LDFLAGS="-Wl,-z,defs"
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+	$(MAKE)
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	debconf-updatepo
+	rm -f build-stamp 
+	-$(MAKE) distclean
+	rm -f config.sub config.guess
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+	$(MAKE) DESTDIR=$(CURDIR)/debian/silcd install
+	rm -f $(CURDIR)/debian/silcd/usr/share/doc/silcd/COPYING
+	rm -f $(CURDIR)/debian/silcd/usr/share/doc/silcd/INSTALL
+	rm -f $(CURDIR)/debian/silcd/etc/silcd/silcd.conf
+
+# Build architecture-independent files here.
+binary-indep: build install
+	# We have nothing to do.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs CHANGES
+	dh_installdocs
+	dh_installexamples
+	dh_installdebconf	
+	dh_installlogrotate
+	dh_installinit
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 

Propchange: silc-server/trunk/debian/rules
------------------------------------------------------------------------------
    svn:executable = *

Added: silc-server/trunk/debian/silcd-admin.conf.default
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/silcd-admin.conf.default?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/silcd-admin.conf.default (added)
+++ silc-server/trunk/debian/silcd-admin.conf.default Fri Jun 15 16:02:42 2007
@@ -1,0 +1,28 @@
+#
+# silcd-primary-ip.conf
+#
+# Debian configuration file for the administrator of the SILC server.  Some
+# options in this file is managed using debconf.  You can invoke
+# `dpkg-reconfigure silcd` if you want to change such options.
+#
+# To gain administrator privileges, the OPER user and arguments must match
+# what is defined in this file.
+
+# IP used by the server administrator (any IP will be allowed if unset).
+#Host = "10.2.1.199";
+
+# Username used by the server administrator (any username will be allowed if
+# unset).
+#User = "priikone";
+
+# Nickname used by the server administrator (any nickname will be allowed if
+# unset).
+Nick = "";
+
+# Passphrase used for authentication (given as an argument to the OPER
+# command).  Passphrase authentication will be disabled if unset.
+Passphrase = "";
+
+# Publickey of the system administrator (no key verification will happen if
+# unset).
+#PublicKey = "/etc/silcd/admin.pub";

Added: silc-server/trunk/debian/silcd-primary-ip.conf.default
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/silcd-primary-ip.conf.default?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/silcd-primary-ip.conf.default (added)
+++ silc-server/trunk/debian/silcd-primary-ip.conf.default Fri Jun 15 16:02:42 2007
@@ -1,0 +1,9 @@
+#
+# silcd-primary-ip.conf
+#
+# Debian configuration file for the primary IP of the SILC server.  Some
+# options in this file is managed using debconf.  You can invoke
+# `dpkg-reconfigure silcd` if you want to change such options.
+
+ip = "";
+port = 706;

Added: silc-server/trunk/debian/silcd.conf.default
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/silcd.conf.default?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/silcd.conf.default (added)
+++ silc-server/trunk/debian/silcd.conf.default Fri Jun 15 16:02:42 2007
@@ -1,0 +1,538 @@
+#
+# silcd.conf
+#
+# Main Debian configuration file for the SILC server.  Some option in this file # are managed using debconf.  You can invoke `dpkg-reconfigure silcd` if
+# you want to change such options.
+#
+# The syntax and options of this file are documented in silcd.conf(5).
+#
+# Most of the settings in this file are optional.  If some setting is
+# mandatory it is mentioned separately.  If some setting is omitted it means
+# that its builtin default value will be used.  Boolean values, that is
+# setting something on or off, is done by setting either "true" or "false"
+# value, respectively.
+#
+# The ServerInfo section is mandatory section.  Other sections are optional.
+# However, if General section is defined it must be defined before the
+# ConnectionParams sections.  On the other hand, the ConnectionParams section
+# must be defined before Client, ServerConnection or RouterConnection
+# sections.  Other sections can be in free order.
+#
+
+#
+# Include global algorithms from the "silcalgs.conf" file.  This file defines
+# ciphers, hash functions, HMACs and PKCS algorithms that can be used.
+#
+Include "/etc/silcd/silcalgs.conf";
+
+#
+# General configuration options
+#
+# These defines the default behaviour of the server.  Most of these values
+# can be overridden with ConnectionParams, which can be defined independently
+# for different connections.
+#
+General {
+	# 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 = "";
+
+	# If both passphrase and public key authentication is set for a
+	# connection the public key authentication is the preferred one
+	# to use.  Set this to `true' to prefer passphrase authentication
+	# over public key authentication in these cases.
+	#prefer_passphrase_auth = true;
+
+	# Set this to true if the server should require fully qualified
+	# domain names (FQDN) for incoming connections.  If true, a host
+	# without FQDN cannot connect to the server.
+	#require_reverse_lookup = true;
+
+	# Maximum number of connections server can handle.  If you want
+	# to limit the number of incoming connections, define the
+	# connections_max in the ConnectionParams.
+	connections_max = 1000;
+
+	# Maximum number of incoming connections allowed per single host.
+	# For example, if this is one (1) it means a host can link only
+	# once to the server.  Attempting to connect more than once would
+	# be refused.  This can be overridden with ConnectionParams.
+	#connections_max_per_host = 10;
+
+	# Required version of the remote side.  If these are specified then
+	# the remote must be of at least this version, or newer.  If older
+	# then the connection will not be allowed.
+	#
+	# version_protocol         - SILC protocol version ("major.minor")
+	# version_software         - software version ("major.minor")
+	# version_software_vendor  - vendor specific version extension
+	#
+	# The version_software_vendor may be for example a string or a build
+	# number of the software.  The string can be a regex string to match
+	# more widely.  Usually the vendor version checking is not necessary
+	# and can be omitted.  These can be overridden with ConnectionParams.
+	#version_protocol = "1.3";
+	#version_software = "2.0";
+	#version_software_vendor = "SomeVendor";
+
+	# Default keepalive frequency (seconds).  This can be overridden with
+	# with ConnectionParams.
+	keepalive_secs = 300;
+
+	# Default reconnection parameters defines how the server reconnect
+	# to the remote if the connection was lost.  The reconnection phase
+	# use so called exponential backoff algorithm;  The reconnect
+	# interval grows when reconnect count grows.  Next example will
+	# attempt to reconnect after 10 seconds of disconnect, and the
+	# interval grows up to 600 seconds or until 7 times was attempted
+	# to reconnect.  These settings has effect only when connecting
+	# as initiator.
+	#
+	# reconnect_count        - how many times reconnect is attempted
+	# reconnect_interval	 - how often reconnect it performed (seconds)
+	# reconnect_interval_max - maximum interval for reconnect, the
+	#                          server never waits longer than this to
+	#                          reconnect (seconds).
+	# reconnect_keep_trying  - whether to keep trying even after
+	#                          reconnect_count is reached (the interval
+	#                          will be reconnect_interval_max).
+	#
+	# These can be overridden with ConnectionParams.
+	reconnect_count = 7;
+	reconnect_interval = 10;
+	reconnect_interval_max = 600;
+	reconnect_keep_trying = true;
+
+	# Key exchange protocol rekey interval (seconds).  How often to
+	# regenerate the session key with the remote.  Initiator will perform
+	# the rekey and this setting affects only when connecting as initiator.
+	# This can be overridden with ConnectionParams.
+	#key_exchange_rekey = 3600;
+
+	# Key exchange with Perfect Forward Secrecy (PFS).  This will perform
+	# the rekey process with PFS, making the new key more secure since it
+	# is not dependent in any way of the old key.  This will make the rekey
+	# process somewhat slower, than without PFS.  This can be overridden
+	# with ConnectionParams.
+	#key_exchange_pfs = true;
+
+	# Key exchange timeout (seconds).  If the key exchange protocol is not
+	# finished in this time period the remote connection will be closed.
+	#key_exchange_timeout = 60;
+
+	# Connection authentication timeout (seconds).  If the connection
+	# authentication protocol is not finished in this time period the
+	# remote connection will be closed.
+	#conn_auth_timeout = 60;
+
+	# Channel key rekey interval (seconds).  How often channel key is
+	# regenerated.  Note that channel key is regenerated also always when
+	# someone joins or leaves the channel.
+	#channel_rekey_secs = 3600;
+
+	# SILC session detachment disabling and limiting.  By default clients
+	# can detach their sessions from server.  If you set detach_disabled
+	# to true the DETACH command cannot be used by clients.  If you want
+	# to limit for how long the server keeps detached sessions you can
+	# set the time (minutes) in detach_timeout.  After that timeout the
+	# detached session is closed if it is not resumed.  By default
+	# sessions are persistent as long as server is running.
+	#detach_disabled = true;
+	#detach_timeout = 1440;
+
+	# Quality of Service (QoS) settings.  The QoS can be used to handle
+	# the incoming data and limit its handling rate to avoid flooding.
+	# By default QoS is disabled and can be enabled by setting "qos" to
+	# true value.  The "qos_rate_limit" is the data reads per second,
+	# and if more frequently is read due to for example data flooding,
+	# QoS is applied to the data.  The "qos_bytes_limit" is maximum bytes
+	# allowed for incoming data.  If more is received at once the QoS
+	# is applied to the data.  The "qos_limit_sec" and "qos_limit_usec"
+	# is the timeout used to delay the data handling, seconds and
+	# microseconds, respectively.  NOTE: If you enable QoS in General
+	# section it applies to server connections as well.  Server
+	# connections SHOULD NOT use QoS.  This can be overridden with
+	# ConnectionParams.
+	#qos = true;
+	#qos_rate_limit = 10;
+	#qos_bytes_limit = 2048;
+	#qos_limit_sec = 0;
+	#qos_limit_usec = 500000;
+
+	# Limit on how many channels one client can join.  Default is 50.
+	#channel_join_limit = 100;
+
+	# HTTP server access to the server for retrieving server statistics
+	# with a web browser.  This is disabled by default.
+	#http_server = true;
+	#http_server_ip = "127.0.0.1";
+	#http_server_port = 5000;
+
+	# Debug string.  Debug string can be set to print debugging from
+	# the running server.  The debug is redirected to stderr.
+	#debug_string = "";
+};
+
+#
+# Server information
+#
+ServerInfo {
+	#
+	# Server name (FQDN)
+	#
+	hostname = "";
+
+	#
+	# Primary listener.  Specify the IP address and the port to bind
+	# the server.
+	#
+	Primary {
+                Include "/etc/silcd/silcd-primary-ip.conf";
+	};
+
+	#
+	# 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.160"; port = 706; };
+
+	#
+	# ServerType field specifies the purpose of this server
+	# This is only a descriptive field.
+	#
+	ServerType = "";
+
+	#
+	# Geographic location
+	#
+	Location = "";
+
+	#
+	# Full admin name
+	#
+	Admin = "";
+
+	#
+	# Admin's email address
+	#
+	AdminEmail = "";
+
+	#
+	# Run SILC server as specific user and group.  The server must be
+	# initially run as root.
+	#
+	User = "nobody";
+	Group = "nogroup";
+
+	#
+	# Public and private keys
+	#
+	PublicKey = "/etc/silcd/silcd.pub";
+	PrivateKey = "/etc/silcd/silcd.prv";
+
+	#
+	# Motd file
+	#
+	# Specifies the text file displayed on client connection
+	#
+	#MotdFile = "/etc/silcd/motd.txt";
+
+	#
+	# Pid file
+	#
+	PidFile = "/var/run/silcd.pid";
+};
+
+#
+# Log files.
+#
+# This section is used to set various logging files, their paths, maximum
+# sizes and logging options.
+#
+# There are only four defined channels allowed for defining (see below).
+# The log channels have an importance value, and most important channels
+# are redirected on the less important ones, thus setting a valid logging
+# file for "Info" will ensure logging for all channels, while setting
+# logging file for "Errors" will ensure logging for channels "Errors"
+# and "Fatals".  If only, for example, "Info" is set then all logs go to
+# that file (like in example below).
+#
+Logging {
+	# Use timestamp in the logging files? (Usually it is a good idea,
+	# but you may want to disable this if you run silcd under some
+	# daemontool).
+	Timestamp = true;
+
+	# If QuickLogs is true, then the logging files will be updated
+	# real-time.  This causes a bit more CPU and HDD activity, but
+	# reduces memory usage.  By default it is false and log files are
+	# written with FlushDelay timeout.
+	#
+	#QuickLogs = true;
+
+	# FlushDelay tells log files update delay (seconds) in case you
+	# have chosen buffering output.  This setting has effect only if
+	# the QuickLogs is false.
+	#
+	FlushDelay = 180;
+
+	# Informational messages
+	Info {
+		File = "/var/log/silcd/silcd.log";
+		Size = "100k";
+	};
+
+	# Warning messages
+	#Warnings {
+	#	File = "/var/log/silcd/silcd_warnings.log";
+	#	Size = "50k";
+	#};
+
+	# Error messages
+	#Errors {
+	#	File = "/var/log/silcd/silcd_errors.log";
+	#	Size = "50k";
+	#};
+
+	# Fatal messages
+	#Fatals {
+	#	File = "/var/log/silcd/silcd_fatals.log";
+	#	Size = "50k";
+	#};
+};
+
+#
+# Connection Parameters
+#
+# This section defined connection parameters.  It is possible to use
+# specific parameters in different connections, and to define different
+# parameters to different connections.  The parameters can define how the
+# connection is handled and how the session is managed.  If connection
+# parameters are not used in connections the default values will apply
+# (or values defined in General section).  You can have multiple
+# ConnectionParams blocks defined.
+#
+ConnectionParams {
+	# unique name.  The name is used to reference to this parameter
+	# block from the connections.  This field is mandatory.
+	name = "normal";
+
+	# Maximum number of connections allowed.  More connections will be
+	# refused.  This can be used for example to limit number of clients.
+	# Note that this never can be larger than the connections_max
+	# specified in General section.
+	connections_max = 200;
+
+	# Maximum number of connections allowed per host.  For example, if
+	# this is one (1) it means a host can link only once to the server.
+	# Attempting to link more than once would be refused.
+	#
+	# If this connection parameters block is used with incoming server
+	# connections it is recommended that this value is set to one (1).
+	connections_max_per_host = 10;
+
+	# Required version of the remote side.  If these are specified then
+	# the remote must be of at least this version, or newer.  If older
+	# then the connection will not be allowed.
+	#
+	# version_protocol         - SILC protocol version ("major.minor")
+	# version_software         - software version ("major.minor")
+	# version_software_vendor  - vendor specific version extension
+	#
+	# The version_software_vendor may be for example a string or a build
+	# number of the software.  The string can be a regex string to match
+	# more widely.  Usually the vendor version checking is not necessary
+	# and can be omitted.  These can be overridden with ConnectionParams.
+	#version_protocol = "1.1";
+	#version_software = "1.3";
+	#version_software_vendor = "SomeVendor";
+
+	# Keepalive frequency (seconds).
+	keepalive_secs = 300;
+
+	# Reconnection parameters defines how the server reconnects to
+	# the remote if the connection was lost.  The reconnection phase
+	# use so called exponential backoff algorithm;  The reconnect
+	# interval grows when reconnect count grows.  Next example will
+	# attempt to reconnect after 10 seconds of disconnect, and the
+	# interval grows up to 600 seconds or until 7 times was attempted
+	# to reconnect.  These settings has effect only when connecting
+	# as initiator.
+	#
+	# reconnect_count        - how many times reconnect is attempted
+	# reconnect_interval	 - how often reconnect it performed (seconds)
+	# reconnect_interval_max - maximum interval for reconnect, the
+	#                          server never waits longer than this to
+	#                          reconnect (seconds).
+	# reconnect_keep_trying  - whether to keep trying even after
+	#                          reconnect_count is reached (the interval
+	#                          will be reconnect_interval_max).
+	reconnect_count = 7;
+	reconnect_interval = 10;
+	reconnect_interval_max = 600;
+	reconnect_keep_trying = true;
+
+	# Key exchange protocol rekey interval (seconds).  How often to
+	# regenerate the session key with the remote.  Initiator will perform
+	# the rekey and this setting affects only when connecting as initiator.
+	#key_exchange_rekey = 3600;
+
+	# Key exchange with Perfect Forward Secrecy (PFS). This will perform
+	# the rekey process with PFS, making the new key more secure since it
+	# is not dependent in any way of the old key. This will make the rekey
+	# process somewhat slower, than without PFS.
+	#key_exchange_pfs = true;
+
+	# Anonymous connection.  This setting has effect only when this
+	# this is used with client connections.  If set to true then clients
+	# using this connection parameter will be anonymous connections.
+	# This means that the client's username and hostname information
+	# is scrambled and anonymous mode is set for the user.
+	#anonymous = true;
+
+	# Quality of Service (QoS) settings.  The QoS can be used to handle
+	# the incoming data and limit its handling rate to avoid flooding.
+	# By default QoS is disabled and can be enabled by setting "qos" to
+	# true value.  The "qos_rate_limit" is the incmoing data reading
+	# per second, and if more frequently than the set limit is read the
+	# QoS is applied to the data.  The "qos_bytes_limit" is maximum bytes
+	# allowed for incoming data.  If more is received at once the QoS
+	# is applied to the data.  The "qos_limit_sec" and "qos_limit_usec"
+	# is the timeout used to delay the data handling, seconds and
+	# microseconds, respectively.  For server connections QoS SHOULD NOT
+	# be set.
+	#qos = true;
+	#qos_rate_limit = 10;
+	#qos_bytes_limit = 2048;
+	#qos_limit_sec = 0;
+	#qos_limit_usec = 500000;
+};
+
+#
+# Configured client connections.
+#
+# The "Host" defines the incoming IP address or hostname of the client.
+# If it is omitted all hosts will match this client connection.  The
+# "Params" is optional and can be used to set specific connection parameters
+# for this connection.
+#
+# The authentication data is specified by Passphrase and/or PublicKey.
+# If both are provided then both password and public key based authentication
+# is allowed.  The "PublicKey" includes the single key contained in the
+# specified file, while "PublicKeyDir" includes all files in the specified
+# directory, which must all be valid public keys with ".pub" suffix.
+#
+# Next example connection will match to all incoming client connections,
+# and no authentication is required.
+#
+Client {
+	#Host = "10.1.*";
+	#Passphrase = "secret";
+	#PublicKey = "/path/to/the/user_my.pub";
+	#PublicKey = "/path/to/the/user_221.pub";
+	#PublicKey = "/path/to/the/user_313.pub";
+	#PublicKeyDir = "/path/to/keys/dir/";
+	Params = "normal";
+};
+
+#
+# Configured server administrator connections
+#
+# The fields "Host", "User", and "Nick", are optional but you are encouraged
+# in using them to better identify your admins.
+#
+# The authentication data is specified by Passphrase and/or PublicKey.
+# If both are provided then both password and public key based authentication
+# is allowed.  If the PublicKey is used it includes the file path to the
+# public key file.  If none of them is provided then authentication is not
+# required.
+#
+Admin {
+        Include "/etc/silcd/silcd-admin.conf";
+};
+
+#
+# Configured server connections.
+#
+# If server connections are configured it means that this server is
+# router server.  Normal servers must not configure server connections.
+# Thus, if this server is not router do not configure this section.  If
+# your server is router, this must be configured.  The Host (mandatory)
+# specifies the remote server.
+#
+# The authentication data is specified by Passphrase and/or PublicKey.
+# If both are provided then both password and public key based authentication
+# is allowed.  If the PublicKey is used it includes the file path to the
+# public key file.  If none of them is provided then authentication is not
+# required.
+#
+# If the connection is backup connection then set the "Backup" option
+# 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";
+#	Passphrase = "verysecret";
+#	#PublicKey = "/etc/silcd/router.pub";
+#	Params = "normal";
+#	Backup = false;
+#};
+
+#
+# Configured router connections
+#
+# For normal servers only one entry maybe configured to this section.  It
+# must be the router this server will be connected to.  For router servers,
+# this section includes all configured router connections.  The first
+# configured connection is the primary route.  The Host (mandatory) specifies
+# the remote hostname or IP address.  The Port specifies the remote port
+# to connect when Initiator is true.  When Initiator is false the Port
+# specifies the local port (listener port).
+#
+# The authentication data is specified by Passphrase and/or PublicKey.
+# If both are provided then both password and public key based authentication
+# is allowed.  If the PublicKey is used it includes the file path to the
+# public key file.  If none of them is provided then authentication is not
+# required.
+#
+# If you are the initiator of the connection then set the "Initiator"
+# option to true.  If you are the responder of the connection (waiting for
+# incoming connection) then set it to false.
+#
+# If the connection is backup router connection then set the "BackupHost"
+# option to the IP address of the router that the backup router will
+# replace if it becomes unavailable.  Set also the router's port to the
+# "BackupPort" option.  For normal connection leave both commented.  If this
+# 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.
+#
+#RouterConnection {
+#	Host = "10.2.1.100";
+#	Port = 706;
+#	Passphrase = "verysecret";
+#	#PublicKey = "/etc/silcd/router.pub";
+#	Params = "normal";
+#	Initiator = true;
+#	#BackupHost = "10.2.1.6";
+#	#BackupPort = 706;
+#	#BackupLocal = true;
+#};
+
+#
+# Denied connections
+#
+# These connections are denied to connect to our server.
+#
+# The "Reason" field is mandatory, while the "Host" field can be omitted to
+# match everything.
+#
+#Deny {
+#	Host = "10.2.1.99";
+#	Reason = "Go away spammer";
+#};
+#Deny {
+#	Host = "10.3.*";
+#	Reason = "You are not welcome.";
+#};

Added: silc-server/trunk/debian/templates
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/templates?rev=70&op=file
==============================================================================
--- silc-server/trunk/debian/templates (added)
+++ silc-server/trunk/debian/templates Fri Jun 15 16:02:42 2007
@@ -1,0 +1,57 @@
+Template: silcd/server-name
+Type: string
+_Description: silcd server name:
+ Please enter the name of the SILC server. (e.g. Some random SILC server)
+
+Template: silcd/host-name
+Type: string
+_Description: silcd hostname:
+ Please enter the hostname (or the IP address) of the SILC server.
+ (e.g. silc.example.com)
+
+Template: silcd/real-name
+Type: string
+_Description: silcd administrator real name:
+ Please enter the real name of the operator running the SILC server.
+ (e.g. Foo T. Bar)
+ .
+ This field may be left empty.
+
+Template: silcd/email
+Type: string
+_Description: silcd administrator email address:
+ Please enter the email address of the operator running the SILC server.
+ (e.g. silc at example.com)
+ .
+ This field may be left empty.
+
+Template: silcd/organization
+Type: string
+_Description: silcd organization:
+ Please enter the organization running the SILC server.
+ (e.g. Some Organization)
+ .
+ This field may be left empty.
+
+Template: silcd/country
+Type: string
+_Description: silcd location:
+ Please enter the country where is located the SILC server.
+ .
+ This field may be left empty.
+
+Template: silcd/admin-nick
+Type: string
+_Description: silcd administrator nickname:
+ Please enter the nickname of the administrator of the SILC server.
+ .
+ Administrator will need to use this nickname in order to authenticate
+ herself.
+
+Template: silcd/admin-passphrase
+Type: password
+_Description: silcd administrator passphrase:
+ Please enter the passphrase that will authenticate the SILC server
+ administrator.
+ .
+ Admnisitrator will need to enter this passphrase to authenticate herself.

Modified: silc-server/trunk/doc/silcd.8
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/doc/silcd.8?rev=70&op=diff
==============================================================================
--- silc-server/trunk/doc/silcd.8 (original)
+++ silc-server/trunk/doc/silcd.8 Fri Jun 15 16:02:42 2007
@@ -82,7 +82,7 @@
 SILC is designed and written by Pekka Riikonen <priikone at iki\&.fi> and rest
 of the SILC Project\&.
 .PP 
-This manpage was written by Mika \'Bostik\' Boström <bostik at lut\&.fi>
+This manpage was written by Mika \'Bostik\' Bostr\[:o]m <bostik at lut\&.fi>
 .PP 
 See \fBCREDITS\fP for full list of contributors\&.
 .PP 

Modified: silc-server/trunk/doc/silcd.conf.5
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/doc/silcd.conf.5?rev=70&op=diff
==============================================================================
--- silc-server/trunk/doc/silcd.conf.5 (original)
+++ silc-server/trunk/doc/silcd.conf.5 Fri Jun 15 16:02:42 2007
@@ -617,6 +617,6 @@
 Configuration file format and parser is by Giovanni Giacobbi
 <giovanni at giacobbi\&.net>\&.
 .PP 
-This manpage was written by Mika \'Bostik\' Boström <bostik at lut\&.fi>
+This manpage was written by Mika \'Bostik\' Bostr\[:o]m <bostik at lut\&.fi>
 .PP 
 See \fBCREDITS\fP for full list of contributors\&.




More information about the Pkg-silc-commits mailing list