An important note to all server users:

The private key file format has changed due to a bug in the
older code.  When you run this server version it automatically
changes your private key file to the correct format.
The future versions of the SILC Server will not do that, so
do not skip this version or you will need to generate new key
pair after 0.9.11 is released.

Also backup router bugs was fixed which caused several
interesting decryption problems, so upgrading regardless
if you are runinng normal server, backup router or primary
router is strongly recommended.

Changes from 0.9.9.1 to 0.9.10
==============================

* Added the config directive PublicKeyDir for the client
  block.
* Extended the SILC_SERVER_LOG_ERROR macro to all available
  logging channels.
* Load only files with .pub suffix in PublicKeyDir.

* Fixed a typo in resuming code that fixed detach/resume
  code in server.
* Fixed CMODE setting in server when founder mode was set.
* Fixed wrong invite and ban list handling in server command
  reply.
* Fixed CUMODE founder authentication in server to not check
  for client's public key since it's not supposed to do that.
* Fixed backup router bugs: When backup resumes router and
  receives a CHANNEL_MESSAGE packet the backup must not act
  as router since the packet header decryption would be
  different.  Also, when relaying packets to channel, do not
  re-encrypt packets on backup that came from the primary
  since the connection isn't really router-router connection.

7 files changed, 73 insertions, 54 deletions

diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 4776a51bf7b..7150e784427 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2002/12/04 17:31:55 salo Exp $
+# $NetBSD: Makefile,v 1.18 2002/12/06 19:52:37 salo Exp $
 
-DISTNAME=		silc-server-0.9.9.1
+DISTNAME=		silc-server-0.9.10
 CATEGORIES=		chat security
 MASTER_SITES=		http://www.silcnet.org/download/server/sources/ \
 			ftp://ftp.silcnet.org/silc/server/sources/ \
@@ -19,6 +19,7 @@ GNU_CONFIGURE=		# defined
 USE_GMAKE=		# defined
 USE_BUILDLINK2=		# defined
 USE_LIBTOOL=		# defined
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/lib/silcmath/mpi/libtool
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -71,7 +72,7 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 
-# Temporary hack which prevents installation of static libraries
+# Ugly hack which prevents installation of static libraries.
 #
 post-build:
 	for f in \
diff --git a/chat/silc-server/PLIST b/chat/silc-server/PLIST
index 0f1f82fa1c1..6bf29462ca4 100644
--- a/chat/silc-server/PLIST
+++ b/chat/silc-server/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2002/12/04 17:31:56 salo Exp $
+@comment $NetBSD: PLIST,v 1.9 2002/12/06 19:52:37 salo Exp $
 etc/rc.d/silcd
 lib/silcd/libsilc-1.0.so
-lib/silcd/libsilc-1.0.so.0
-lib/silcd/libsilc-1.0.so.0.0
+lib/silcd/libsilc-1.0.so.1
+lib/silcd/libsilc-1.0.so.1.0
 lib/silcd/libsilc.la
 lib/silcd/libsilc.so
 lib/silcd/modules/aes.sim.so
diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo
index 47b73f9b987..92c944315e4 100644
--- a/chat/silc-server/distinfo
+++ b/chat/silc-server/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.15 2002/12/04 17:31:56 salo Exp $
+$NetBSD: distinfo,v 1.16 2002/12/06 19:52:37 salo Exp $
 
-SHA1 (silc-server-0.9.9.1.tar.bz2) = 8cfe9346708510933bb46d16bf5ca421b751e1da
-Size (silc-server-0.9.9.1.tar.bz2) = 1007282 bytes
+SHA1 (silc-server-0.9.10.tar.bz2) = a251ba080f774efea50dfc29c6dada272aa4b8c6
+Size (silc-server-0.9.10.tar.bz2) = 1048432 bytes
 SHA1 (patch-aa) = 5e36211392b9e24debfd40cb6da83c4558742798
-SHA1 (patch-ab) = 17500e9fdf04e0691e4398c9aaf5e0d9274e87a7
-SHA1 (patch-ac) = 657bfdbbe71bc7104aaeef06ba8ace393be62d61
+SHA1 (patch-ab) = 55b3f00076c5b8a443465753ae07b9e812236f18
+SHA1 (patch-ac) = 4703cda5c31aeae07c77600e0051b5344aed3e67
+SHA1 (patch-ad) = d6bde1a93f0804abe5f68db9885fceb83031f691
+SHA1 (patch-ae) = 44ff4256b9c8f40a22e610ff9c20afdfac5546c8
diff --git a/chat/silc-server/patches/patch-ab b/chat/silc-server/patches/patch-ab
index 8ad0872a2d0..b47992100b5 100644
--- a/chat/silc-server/patches/patch-ab
+++ b/chat/silc-server/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2002/09/14 02:59:26 hubertf Exp $
+$NetBSD: patch-ab,v 1.8 2002/12/06 19:52:38 salo Exp $
 
---- 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 @@
+--- doc/example_silcd.conf.in.orig	Sat Nov 30 15:09:21 2002
++++ doc/example_silcd.conf.in	Fri Dec  6 19:04:31 2002
+@@ -166,14 +166,14 @@
  	#
  	# Server name (FQDN)
  	#
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.7 2002/09/14 02:59:26 hubertf Exp $
  		port = 706;
  	};
  
-@@ -162,8 +162,7 @@
+@@ -181,8 +181,7 @@
  	# Secondary listener(s).  If you need to bind your server into
  	# several interfaces use the Secondary to specify the listener(s).
  	#
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.7 2002/09/14 02:59:26 hubertf Exp $
  
  	#
  	# ServerType field specifies the purpose of this server
-@@ -174,7 +173,7 @@
+@@ -193,7 +192,7 @@
  	#
  	# Geographic location
  	#
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.7 2002/09/14 02:59:26 hubertf Exp $
  
  	#
  	# Full admin name
-@@ -190,8 +189,8 @@
+@@ -209,8 +208,8 @@
  	# Run SILC server as specific user and group.  The server must be
  	# initially run as root.
  	#
@@ -49,7 +49,7 @@ $NetBSD: patch-ab,v 1.7 2002/09/14 02:59:26 hubertf Exp $
  
  	#
  	# Public and private keys
-@@ -204,7 +203,7 @@
+@@ -223,7 +222,7 @@
  	#
  	# Specifies the text file displayed on client connection
  	#
@@ -58,7 +58,7 @@ $NetBSD: patch-ab,v 1.7 2002/09/14 02:59:26 hubertf Exp $
  
  	#
  	# Pid file
-@@ -236,7 +235,7 @@
+@@ -255,7 +254,7 @@
  	# reduces memory usage.  By default it is false and log files are
  	# written with FlushDelay timeout.
  	#
@@ -67,7 +67,7 @@ $NetBSD: patch-ab,v 1.7 2002/09/14 02:59:26 hubertf Exp $
  
  	# FlushDelay tells log files update delay (seconds) in case you
  	# have chosen buffering output.  This setting has effect only if
-@@ -402,9 +401,9 @@
+@@ -435,9 +434,9 @@
  # required.
  #
  Admin {
@@ -78,30 +78,9 @@ $NetBSD: patch-ab,v 1.7 2002/09/14 02:59:26 hubertf Exp $
 +	User = "admin";
 +	Nick = "admin";
  	Passphrase = "verysecret";
- 	# PublicKey = "/path/to/the/public.key";
+ 	# PublicKey = "/path/to/the/public.pub";
  };
-@@ -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";
--	Passphrase = "verysecret";
--	#PublicKey = "/path/to/the/public.key";
--	Params = "normal";
--	Backup = false;
--};
-+#ServerConnection {
-+#	Host = "10.2.1.7";
-+#	Passphrase = "verysecret";
-+#	#PublicKey = "/path/to/the/public.key";
-+#	Params = "normal";
-+#	Backup = false;
-+#};
- 
- #
- # Configured router connections
-@@ -463,17 +462,17 @@
+@@ -496,17 +495,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.
  #
@@ -109,7 +88,7 @@ $NetBSD: patch-ab,v 1.7 2002/09/14 02:59:26 hubertf Exp $
 -	Host = "10.2.1.100";
 -	Port = 706;
 -	Passphrase = "verysecret";
--	#PublicKey = "/path/to/the/public.key";
+-	#PublicKey = "/path/to/the/public.pub";
 -	Params = "normal";
 -	Initiator = true;
 -	#BackupHost = "10.2.1.6";
@@ -120,7 +99,7 @@ $NetBSD: patch-ab,v 1.7 2002/09/14 02:59:26 hubertf Exp $
 +#	Host = "10.2.1.100";
 +#	Port = 706;
 +#	Passphrase = "verysecret";
-+#	#PublicKey = "/path/to/the/public.key";
++#	#PublicKey = "/path/to/the/public.pub";
 +#	Params = "normal";
 +#	Initiator = true;
 +#	#BackupHost = "10.2.1.6";
diff --git a/chat/silc-server/patches/patch-ac b/chat/silc-server/patches/patch-ac
index 40692294c73..978ff08d884 100644
--- a/chat/silc-server/patches/patch-ac
+++ b/chat/silc-server/patches/patch-ac
@@ -1,12 +1,14 @@
-$NetBSD: patch-ac,v 1.5 2002/12/04 17:31:57 salo Exp $
+$NetBSD: patch-ac,v 1.6 2002/12/06 19:52:38 salo Exp $
 
---- lib/Makefile.in.orig	Fri Nov 29 08:58:20 2002
-+++ lib/Makefile.in	Wed Dec  4 17:32:17 2002
-@@ -542,7 +542,6 @@
- install-exec-hook:
- 	-mkdir -p $(libdir)
- 	-$(LIBTOOL) $(INSTALL) libsilc.la $(libdir)/
--	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(libdir)/
+--- lib/Makefile.in.orig	Fri Dec  6 19:08:55 2002
++++ lib/Makefile.in	Fri Dec  6 19:12:26 2002
+@@ -544,9 +544,6 @@
+ @SILC_DIST_TOOLKIT_FALSE@install-exec-hook:
+ @SILC_DIST_TOOLKIT_FALSE@	-mkdir -p $(libdir)
+ @SILC_DIST_TOOLKIT_FALSE@	-$(LIBTOOL) $(INSTALL) libsilc.la $(libdir)/
+-@SILC_DIST_TOOLKIT_FALSE@	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(libdir)/
+-@SILC_DIST_TOOLKIT_FALSE@	-rm -rf $(libdir)/libsilc.a
+-@SILC_DIST_TOOLKIT_FALSE@	-rm -rf $(libdir)/libsilcclient.a
  
  # WIN32 DLL generation
  @SILC_DIST_WIN32DLL_TRUE@silc.dll: libsilc.a
diff --git a/chat/silc-server/patches/patch-ad b/chat/silc-server/patches/patch-ad
new file mode 100644
index 00000000000..769ada64dd1
--- /dev/null
+++ b/chat/silc-server/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.3 2002/12/06 19:52:39 salo Exp $
+
+--- lib/silcsim/Makefile.in.orig	Thu Dec  5 22:44:07 2002
++++ lib/silcsim/Makefile.in	Fri Dec  6 19:18:00 2002
+@@ -561,7 +561,7 @@
+ $(SIM_CIPHER_OBJS):
+ 	@if test '!' -f lib$*.la ; then \
+ 	  $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) \
+-		../silccrypt/$*.lo -o lib$*.la --libtool-enable-shared; \
++		../silccrypt/$*.lo -o lib$*.la ; \
+ 	  cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so \
+ 		$(srcdir)/$*.sim.so; \
+ 	fi
+@@ -569,7 +569,7 @@
+ $(SIM_HASH_OBJS):
+ 	@if test '!' -f lib$*.la ; then \
+ 	  $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) \
+-		../silccrypt/$*.lo -o lib$*.la --libtool-enable-shared; \
++		../silccrypt/$*.lo -o lib$*.la ; \
+ 	  cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so \
+ 		$(srcdir)/$*.sim.so; \
+ 	fi
diff --git a/chat/silc-server/patches/patch-ae b/chat/silc-server/patches/patch-ae
new file mode 100644
index 00000000000..d01e589f142
--- /dev/null
+++ b/chat/silc-server/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2002/12/06 19:52:39 salo Exp $
+
+--- lib/silccrypt/Makefile.in.orig	Thu Dec  5 22:44:06 2002
++++ lib/silccrypt/Makefile.in	Fri Dec  6 19:18:48 2002
+@@ -106,7 +106,7 @@
+ CCDEPMODE = @CCDEPMODE@
+ 
+ # Tell libtool to compile silccrypt as shared since silcsim will need it.
+-CFLAGS = --libtool-enable-shared
++#CFLAGS = --libtool-enable-shared
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@