From f8df73eb3dca3029d17b381f227f20e0b1a595dd Mon Sep 17 00:00:00 2001 From: rh Date: Fri, 29 Mar 2002 11:34:51 +0000 Subject: Update silc-server to 0.8.1. Update provided by the package maintainer, Lubomir Sedlacik in PR pkg/16099, thanks! Changes from 0.8 to 0.8.1 ========================= * IPv6 fixes. IPv6 should work without problems now. * Fixed a minor bug in looking up correct client entry in KICKED notify in server. * Don't change the topic if olod topic is same as new one. * Packet relaying is now done by router without any extra memory allocations. * Fixed the INVITE notify handling. It took wrong arguments as invite list and invite delete. * Added check for INVITE, TOPIC_SET, KICKED, CMODE_CHANGE notify types that particular action is allowed by the client. * Fixed a packet sending bug on very high load, where outgoing packet queue wasn't handled correctly and packets got corrupted. * Added checks for maximum length of channel message payload and private message payload also. * Added checks for maximum packet length in server and in client library. * Added new configuration params: version_protocol, version_software and version_software_vendor to specify what version the remote host must at least be to be able to connect to server. The vendor string can be regex matched too. * Added new function silc_server_connection_allowed to check maximum number of allowed connections, and allowed versions for incoming connections. * Added logging of DISCONNECT packet message in the server. * Check for valid socket connection in client entries before sending any messages. Fixes a crash, but doesn't fix some other underlaying bug that is lurking there. * Added support for specifying multiple public keys for Client connection section in server configuration file. This makes it possible to accept multiple public keys from same host, or to make a section that accepts any incoming host, and have the accepted public keys listed in the section. * Added more error printing to logs in server code. --- chat/silc-server/Makefile | 8 +++-- chat/silc-server/distinfo | 8 ++--- chat/silc-server/patches/patch-ab | 65 +++++++++++++-------------------------- 3 files changed, 32 insertions(+), 49 deletions(-) (limited to 'chat') diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 6b874a367dc..6909c8431cb 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2002/03/03 23:49:49 hubertf Exp $ +# $NetBSD: Makefile,v 1.9 2002/03/29 11:34:51 rh Exp $ -DISTNAME= silc-server-0.8 +DISTNAME= silc-server-0.8.1 CATEGORIES= chat MASTER_SITES= http://www.silcnet.org/download/server/sources/ \ ftp://ftp.silcnet.org/silc/server/sources/ \ @@ -56,6 +56,10 @@ CONFIGURE_ARGS+= --with-silcd-pid-file=/var/run/silcd.pid CONFIGURE_ARGS+= --with-logsdir=/var/log/silcd CONFIGURE_ARGS+= --without-ncurses +# list it into IPv6-ready packages +BUILD_DEFS+= USE_INET6 +CONFIGURE_ARGS+= --enable-ipv6 + # If you want to debug silc-server, uncomment this # #CONFIGURE_ARGS+= --enable-debug diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo index 2e8eee3f543..a09cdb655fd 100644 --- a/chat/silc-server/distinfo +++ b/chat/silc-server/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2002/03/03 23:49:49 hubertf Exp $ +$NetBSD: distinfo,v 1.9 2002/03/29 11:34:51 rh Exp $ -SHA1 (silc-server-0.8.tar.bz2) = 9198f8afec6cbc042633b13abf375416f5bfd77c -Size (silc-server-0.8.tar.bz2) = 919208 bytes +SHA1 (silc-server-0.8.1.tar.bz2) = fe2f3e677c5ef1580a888aa5b3c5b01ea229cca0 +Size (silc-server-0.8.1.tar.bz2) = 931438 bytes SHA1 (patch-aa) = 97ccff02e5d2d1bd3ff64a1a1942525e5a4522bd -SHA1 (patch-ab) = c80a6746f04d153690b67709874acf443e0afc21 +SHA1 (patch-ab) = 482b7580cb95a0833c85f64a3d94c16b2b1c984f diff --git a/chat/silc-server/patches/patch-ab b/chat/silc-server/patches/patch-ab index 710b14b6ca6..5b98e4f4441 100644 --- a/chat/silc-server/patches/patch-ab +++ b/chat/silc-server/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.4 2002/03/03 23:49:49 hubertf Exp $ +$NetBSD: patch-ab,v 1.5 2002/03/29 11:34:51 rh Exp $ ---- doc/example_silcd.conf.in.orig Wed Feb 27 17:47:05 2002 -+++ doc/example_silcd.conf.in Fri Mar 1 18:53:08 2002 +--- doc/example_silcd.conf.in.orig Sun Mar 17 14:39:17 2002 ++++ doc/example_silcd.conf.in Wed Mar 27 21:05:25 2002 @@ -36,7 +36,7 @@ # This is the default path where to search modules. If omitted # built-in modules will be used. Built-in modules will also be @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/03 23:49:49 hubertf Exp $ # If both passphrase and public key authentication is set for a # connection the public key authentication is the preferred one -@@ -123,37 +123,37 @@ +@@ -139,8 +139,8 @@ # # Server FQDN and IP address # @@ -22,31 +22,16 @@ $NetBSD: patch-ab,v 1.4 2002/03/03 23:49:49 hubertf Exp $ port = 706; # - # ServerType field specifies the purpose of this server - # This is only a descriptive field. - # -- ServerType = "Test Server"; -+ ServerType = "NetBSD Test Server"; - +@@ -152,7 +152,7 @@ # # Geographic location # - Location = "Kuopio, Finland"; -+ Location = "Default City, Default Country"; ++ Location = "Generic City, Generic Country"; # # Full admin name - # -- Admin = "Foo T. Bar"; -+ Admin = "Root of All Evil"; - - # - # Admin's email address - # -- AdminEmail = "foo-admin@bar.com"; -+ AdminEmail = "root@localhost"; - - # +@@ -168,8 +168,8 @@ # Run SILC server as specific user and group. The server must be # initially run as root. # @@ -57,7 +42,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/03 23:49:49 hubertf Exp $ # # Public and private keys -@@ -166,12 +166,12 @@ +@@ -182,7 +182,7 @@ # # Specifies the text file displayed on client connection # @@ -66,22 +51,16 @@ $NetBSD: patch-ab,v 1.4 2002/03/03 23:49:49 hubertf Exp $ # # Pid file +@@ -209,7 +209,7 @@ + # reduces memory usage. By default it is false and log files are + # written with FlushDelay timeout. # -- PidFile = "@PIDFILE@"; -+ PidFile = "/var/run/silcd.pid"; - }; - - # -@@ -193,7 +193,7 @@ - # real-time. This causes a bit more CPU and HDD activity, but - # reduces memory usage. (if unsure say true). - # -- QuickLogs = false; +- #QuickLogs = true; + QuickLogs = true; - # - # (Only if QuickLogs is false) -@@ -327,9 +327,9 @@ + # FlushDelay tells log files update delay (seconds) in case you + # have chosen buffering output. This setting has effect only if +@@ -368,9 +368,9 @@ # required. # Admin { @@ -92,30 +71,30 @@ $NetBSD: patch-ab,v 1.4 2002/03/03 23:49:49 hubertf Exp $ + User = "admin"; + Nick = "admin"; Passphrase = "verysecret"; - # Publickey = "/path/to/the/public.key"; + # PublicKey = "/path/to/the/public.key"; }; -@@ -352,13 +352,13 @@ +@@ -393,13 +393,13 @@ # to true. For normal connections set it false. If it is set to true then # this server will be backup router. # -ServerConnection { - Host = "10.2.1.7"; - Passphrase = "verysecret"; -- #Publickey = "/path/to/the/public.key"; +- #PublicKey = "/path/to/the/public.key"; - Params = "normal"; - Backup = false; -}; +#ServerConnection { +# Host = "10.2.1.7"; +# Passphrase = "verysecret"; -+# #Publickey = "/path/to/the/public.key"; ++# #PublicKey = "/path/to/the/public.key"; +# Params = "normal"; +# Backup = false; +#}; # # Configured router connections -@@ -385,17 +385,17 @@ +@@ -426,17 +426,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. # @@ -123,7 +102,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/03 23:49:49 hubertf Exp $ - Host = "10.2.1.100"; - Port = 706; - Passphrase = "verysecret"; -- #Publickey = "/path/to/the/public.key"; +- #PublicKey = "/path/to/the/public.key"; - Params = "normal"; - Initiator = true; - #BackupHost = "10.2.1.6"; @@ -134,7 +113,7 @@ $NetBSD: patch-ab,v 1.4 2002/03/03 23:49:49 hubertf Exp $ +# Host = "10.2.1.100"; +# Port = 706; +# Passphrase = "verysecret"; -+# #Publickey = "/path/to/the/public.key"; ++# #PublicKey = "/path/to/the/public.key"; +# Params = "normal"; +# Initiator = true; +# #BackupHost = "10.2.1.6"; -- cgit v1.2.3