From 466c1dcd3d5d0e10f0e211e9db7cd4c7d35313de Mon Sep 17 00:00:00 2001 From: salo Date: Wed, 4 Dec 2002 17:31:55 +0000 Subject: Update to version 0.9.9.1. Changes from 0.9.8 to 0.9.9.1 ============================= * Updated protocol version to 1.2. Clients and servers with support for 1.1 are not compatible with the new protocol! * Print notify for server opers when backup router comes online. * Resolve the client's public key in JOIN command if the founder auth data is being requested but we don't know the client's public key. * Added idle and signon fields to the ATTRIBUTE_SERVICE attribute to indicate the user's current idle and signon timeof a service. * Added MAC field to the Private Message Payload to protect against chosen ciphertext attacks. * Defined the SILC_MESSAGE_FLAG_SIGNED. * Added ERR_UNSUPPORTED_PUBLIC_KEY and ERR_OPERATION_ALLOWED status types. * Added support for normal client to kill its own entries from the network. * Compute maximum padding for authentication packets to make passphrase approximation attacks impossible (padding must be at least 8 bytes now). * Added support for rekey before 2^32 sequence number wraps. * Added Encrypt-Then-MAC order to SILC packet MAC generation. Deprecated the old Encrypt-And-MAC order. * Added Encrypt-Then-MAC order to Channel Message Payload MAC generation. * Added support for setting FOUNDER mode on channel with specific public key which can be set with CMODE command. * Don't wait for EOF after socket error has occurred, but close the connection. * Assure the RESUME_CLIENT packet is not sent to twice to backup router if the detached client was originated from the backup. * Added support for removing client from invite list when kicked from channel, as SILC 1.2 dictates. * Added support for the SILC 1.2 BAN and INVITEcommands and new ban and invite lists to server. * Remove client from invite list in KILLED notify and in KILL command. * Do not send invite list back unless asked (when sending no arguments) or when list was modified. * MARS is now gone. * Added manual pages for silcd(8) and silcd.conf(5). * Fixed WATCH command reply handling on normal server which was missing altogether. * Fixed double free in WHOIS query on normal server when forwarding query to router. * Fixed MOTD command reply sending. * Fixed the INVITE command to send the invite list in command reply. * Fixed PING command sending in client library and handling in server. The server ID must be ID Payload, not raw ID data. * Fixed NICK command to not crash if nickname was not sent. * Fixed channel's global_user boolean checking after detaching. Check it after changing the owner of the client not before. * Fixed channel key distribution after resuming detached client. * Fixed memory leaks with SIMs in server. * Fixed bugs in invite list handling in INVITE command. --- chat/silc-server/Makefile | 10 ++--- chat/silc-server/PLIST | 10 +++-- chat/silc-server/distinfo | 10 ++--- chat/silc-server/patches/patch-aa | 77 ++++++++++++++++++++------------------- chat/silc-server/patches/patch-ac | 24 ++++-------- 5 files changed, 63 insertions(+), 68 deletions(-) (limited to 'chat') diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index c8b3b3975fc..4776a51bf7b 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2002/11/21 15:42:45 salo Exp $ +# $NetBSD: Makefile,v 1.17 2002/12/04 17:31:55 salo Exp $ -DISTNAME= silc-server-0.9.8 +DISTNAME= silc-server-0.9.9.1 CATEGORIES= chat security MASTER_SITES= http://www.silcnet.org/download/server/sources/ \ ftp://ftp.silcnet.org/silc/server/sources/ \ @@ -74,12 +74,12 @@ CONFIGURE_ARGS+= --disable-asm # Temporary hack which prevents installation of static libraries # post-build: - for file in \ + for f in \ ${WRKSRC}/lib/libsilc.la \ ${WRKSRC}/lib/.libs/libsilc.la ; \ do \ - ${CP} $$file $$file.orig ; \ - ${SED} "s|^old_library|#&|" $$file.orig > $$file ; \ + ${CP} $$f $$f.orig ; \ + ${SED} "s|^old_library|#&|" $$f.orig > $$f ; \ done post-install: diff --git a/chat/silc-server/PLIST b/chat/silc-server/PLIST index b70b614b442..0f1f82fa1c1 100644 --- a/chat/silc-server/PLIST +++ b/chat/silc-server/PLIST @@ -1,13 +1,13 @@ -@comment $NetBSD: PLIST,v 1.7 2002/11/21 15:42:45 salo Exp $ +@comment $NetBSD: PLIST,v 1.8 2002/12/04 17:31:56 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.la lib/silcd/libsilc.so -lib/silcd/libsilc.so.0 -lib/silcd/libsilc.so.0.0 lib/silcd/modules/aes.sim.so lib/silcd/modules/blowfish.sim.so lib/silcd/modules/cast.sim.so -lib/silcd/modules/mars.sim.so lib/silcd/modules/md5.sim.so lib/silcd/modules/none.sim.so lib/silcd/modules/rc5.sim.so @@ -15,6 +15,8 @@ lib/silcd/modules/rc6.sim.so lib/silcd/modules/rsa.sim.so lib/silcd/modules/sha1.sim.so lib/silcd/modules/twofish.sim.so +man/man5/silcd.conf.5 +man/man8/silcd.8 sbin/silcd share/doc/silcd/CHANGES share/doc/silcd/COPYING diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo index e0add5a9a16..47b73f9b987 100644 --- a/chat/silc-server/distinfo +++ b/chat/silc-server/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.14 2002/11/21 15:42:45 salo Exp $ +$NetBSD: distinfo,v 1.15 2002/12/04 17:31:56 salo Exp $ -SHA1 (silc-server-0.9.8.tar.bz2) = e552e8205954acd3dcc85a76785a555679ea26b1 -Size (silc-server-0.9.8.tar.bz2) = 1110670 bytes -SHA1 (patch-aa) = 2bea3a68a7f7999709f851c3d97ab5249c7c2dba +SHA1 (silc-server-0.9.9.1.tar.bz2) = 8cfe9346708510933bb46d16bf5ca421b751e1da +Size (silc-server-0.9.9.1.tar.bz2) = 1007282 bytes +SHA1 (patch-aa) = 5e36211392b9e24debfd40cb6da83c4558742798 SHA1 (patch-ab) = 17500e9fdf04e0691e4398c9aaf5e0d9274e87a7 -SHA1 (patch-ac) = 1dd4137e639b5e2b4ba99e6ae65c5e583257a9ef +SHA1 (patch-ac) = 657bfdbbe71bc7104aaeef06ba8ace393be62d61 diff --git a/chat/silc-server/patches/patch-aa b/chat/silc-server/patches/patch-aa index f113342ab5c..36416433b1b 100644 --- a/chat/silc-server/patches/patch-aa +++ b/chat/silc-server/patches/patch-aa @@ -1,51 +1,52 @@ -$NetBSD: patch-aa,v 1.6 2002/09/14 02:59:26 hubertf Exp $ +$NetBSD: patch-aa,v 1.7 2002/12/04 17:31:56 salo Exp $ ---- Makefile.in.orig Tue Sep 10 21:32:01 2002 -+++ Makefile.in Thu Sep 12 23:20:46 2002 -@@ -530,11 +530,9 @@ - -rm -rf $(distdir) +--- Makefile.in.orig Fri Nov 29 08:58:19 2002 ++++ Makefile.in Wed Dec 4 17:40:13 2002 +@@ -710,14 +710,12 @@ + -mkdir -p $(mandir)/man1 - install-dirs: -- -mkdir -p $(etcdir) - -mkdir -p $(modulesdir) -- -mkdir -p $(helpdir) - -mkdir -p $(docdir) + install-dirs-server: install-dirs - -mkdir -p $(logsdir) -+ -mkdir -p $(examplesdir) + -mkdir -p $(mandir)/man5 + -mkdir -p $(mandir)/man8 - generate-server-key: - -@if test '!' -f $(etcdir)/silcd.pub ; then \ -@@ -547,8 +545,8 @@ doc-install: - $(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/ - $(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/ -- $(INSTALL_DATA) $(srcdir)/doc/example_* $(docdir)/ -- $(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/ -+ $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(examplesdir)/silcd.conf.default -+ $(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf $(examplesdir)/silcalgs.conf.default - $(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/ - $(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/ - $(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/ -@@ -562,10 +560,9 @@ - -$(INSTALL_DATA) $(srcdir)/lib/doc/*.gif $(docdir)/toolkit + -$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/ + -$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/ +- -$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/ + -$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/ + -$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/ + -$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/ +@@ -732,7 +730,6 @@ + fi + + doc-install-server: doc-install +- -$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/ + -@if test -f $(srcdir)/doc/silcd.8 ; then \ + $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \ + fi +@@ -767,9 +764,12 @@ + -cp -R $(srcdir)/tutorial $(prefix) examples-install: - -mkdir -p $(docdir)/examples/ -- $(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/ -- $(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/ -- $(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/ -+ $(INSTALL_DATA) $(srcdir)/doc/examples/README $(examplesdir) -+ $(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(examplesdir) -+ $(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(examplesdir) +- -$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/ +- -$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/ ++ -mkdir -p $(examplesdir) ++ -$(INSTALL_DATA) $(srcdir)/doc/examples/README $(examplesdir) ++ -$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(examplesdir) ++ -$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(examplesdir) ++ -$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(examplesdir)/silcd.conf.default ++ -$(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf $(examplesdir)/silcalgs.conf.default - etc-install: - -@if test '!' -f $(etcdir)/silcd.conf ; then \ -@@ -582,7 +579,7 @@ + generate-server-key: + -@if test '!' -f $(etcdir)/silcd.pub ; then \ +@@ -778,7 +778,7 @@ - @SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install - @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs generate-server-key sim-install doc-install toolkit-install examples-install etc-install --@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install -+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs sim-install doc-install examples-install + @SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client + @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server generate-server-key +-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key ++@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/chat/silc-server/patches/patch-ac b/chat/silc-server/patches/patch-ac index 1bdff5cc9f9..40692294c73 100644 --- a/chat/silc-server/patches/patch-ac +++ b/chat/silc-server/patches/patch-ac @@ -1,20 +1,12 @@ -$NetBSD: patch-ac,v 1.4 2002/11/21 15:42:45 salo Exp $ +$NetBSD: patch-ac,v 1.5 2002/12/04 17:31:57 salo Exp $ ---- lib/Makefile.in.orig Thu Nov 21 07:34:37 2002 -+++ lib/Makefile.in Thu Nov 21 07:43:54 2002 -@@ -529,12 +529,9 @@ - -rm -rf libsilc.a - -rm -rf libsilcclient.a - --@SILC_DIST_TOOLKIT_TRUE@install-exec-hook: --@SILC_DIST_TOOLKIT_TRUE@ -mkdir -p $(libdir) --@SILC_DIST_TOOLKIT_TRUE@ -$(LIBTOOL) $(INSTALL) libsilc.la $(libdir)/ --@SILC_DIST_TOOLKIT_TRUE@ -$(LIBTOOL) $(INSTALL) libsilcclient.la $(libdir)/ --@SILC_DIST_TOOLKIT_FALSE@install-exec-hook: --@SILC_DIST_TOOLKIT_FALSE@ -cd -+install-exec-hook: -+ -mkdir -p $(libdir) -+ -$(LIBTOOL) $(INSTALL) libsilc.la $(libdir)/ +--- 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)/ # WIN32 DLL generation @SILC_DIST_WIN32DLL_TRUE@silc.dll: libsilc.a -- cgit v1.2.3