From 89ad80702d96da36f49d59c02c1ecf24684f9bc4 Mon Sep 17 00:00:00 2001 From: salo Date: Wed, 8 Jan 2003 23:56:44 +0000 Subject: Update to version 0.9.11 IMPORTANT NOTE: This version does not include backwards support for the old style SILC private key so if you skipped 0.9.10 version you won't be able to run this server without generating new key pair. Changes from 0.9.10 to 0.9.11 ============================= * Workaround GCC bug which causes memory exhaustion when compiling sha1 with optimizations on UltraSPARC. from openbsd * Added some sanity checks in server for correctness of the server configuration. * More log printing during backup router protocol. * Removed backwards support for old private key file format. * Removed backwards support for not-so-strict decryption length check, it's strict now. * Fixed error handling of invalid client entry when calling commands in server. Fixes a crash. * Fixed double free in async host lookup code. * On backup router handle now the SERVER_SIGNOFF from router for local connected servers too, and close the connections. Do not process them as normally signing off servers when they really signoff by sending EOF fe, but always assume that router sends the SERVER_SIGNOFF. * Fixed socket unsetting when closing connections. * Fixed close command to use the port correctly when closing server connections. * Check for NULL outbuf in silc_socket_write. It is possible that it is NULL is some odd case. * Do not call final protocol callback for backup router resuming protocol when closing connection. It is closed by timeout in case of error. * Backup reconnect to router if backup resuming protocol failed. * Fixed double free in SKE library error hadling when signature error occurred. * Fixed double free in invite list adding code when adding invite strings. --- chat/silc-server/Makefile | 15 +++++++-------- chat/silc-server/distinfo | 10 ++++------ chat/silc-server/patches/patch-ac | 29 +++++++++++++++++------------ chat/silc-server/patches/patch-ad | 22 ---------------------- chat/silc-server/patches/patch-ae | 13 ------------- 5 files changed, 28 insertions(+), 61 deletions(-) delete mode 100644 chat/silc-server/patches/patch-ad delete mode 100644 chat/silc-server/patches/patch-ae (limited to 'chat') diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 7150e784427..5890cc98b2f 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.18 2002/12/06 19:52:37 salo Exp $ +# $NetBSD: Makefile,v 1.19 2003/01/08 23:56:44 salo Exp $ -DISTNAME= silc-server-0.9.10 +DISTNAME= silc-server-0.9.11 CATEGORIES= chat security MASTER_SITES= http://www.silcnet.org/download/server/sources/ \ ftp://ftp.silcnet.org/silc/server/sources/ \ http://www.fi.silcnet.org/download/server/sources/ \ ftp://ftp.au.silcnet.org/pub/silcnet/server/sources/ \ - http://www.us.silcnet.org/download/server/sources/ \ - ftp://ftp.no.silcnet.org/pub/silc/server/sources/ \ http://www.at.silcnet.org/download/server/sources/ EXTRACT_SUFX= .tar.bz2 @@ -15,10 +13,10 @@ MAINTAINER= salo@netbsd.org HOMEPAGE= http://www.silcnet.org/ COMMENT= Server for the Secure Internet Live Conferencing (SILC) protocol -GNU_CONFIGURE= # defined -USE_GMAKE= # defined -USE_BUILDLINK2= # defined -USE_LIBTOOL= # defined +GNU_CONFIGURE= YES +USE_GMAKE= YES +USE_BUILDLINK2= YES +USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/lib/silcmath/mpi/libtool .include "../../mk/bsd.prefs.mk" @@ -59,6 +57,7 @@ CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/silcd/modules CONFIGURE_ARGS+= --with-logsdir=/var/log/silcd CONFIGURE_ARGS+= --with-silcd-pid-file=/var/run/silcd.pid CONFIGURE_ARGS+= --without-iconv +CONFIGURE_ARGS+= --without-libtoolfix # List it into IPv6-ready packages. BUILD_DEFS+= USE_INET6 diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo index 92c944315e4..01e7377396a 100644 --- a/chat/silc-server/distinfo +++ b/chat/silc-server/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.16 2002/12/06 19:52:37 salo Exp $ +$NetBSD: distinfo,v 1.17 2003/01/08 23:56:44 salo Exp $ -SHA1 (silc-server-0.9.10.tar.bz2) = a251ba080f774efea50dfc29c6dada272aa4b8c6 -Size (silc-server-0.9.10.tar.bz2) = 1048432 bytes +SHA1 (silc-server-0.9.11.tar.bz2) = 1d981e95cd5d01c753e55da829e893f9af6fe6d9 +Size (silc-server-0.9.11.tar.bz2) = 1050893 bytes SHA1 (patch-aa) = 5e36211392b9e24debfd40cb6da83c4558742798 SHA1 (patch-ab) = 55b3f00076c5b8a443465753ae07b9e812236f18 -SHA1 (patch-ac) = 4703cda5c31aeae07c77600e0051b5344aed3e67 -SHA1 (patch-ad) = d6bde1a93f0804abe5f68db9885fceb83031f691 -SHA1 (patch-ae) = 44ff4256b9c8f40a22e610ff9c20afdfac5546c8 +SHA1 (patch-ac) = f88e5cef60a9e69775f2ffda637bb6a2e6894ede diff --git a/chat/silc-server/patches/patch-ac b/chat/silc-server/patches/patch-ac index 978ff08d884..aa22d90d6e9 100644 --- a/chat/silc-server/patches/patch-ac +++ b/chat/silc-server/patches/patch-ac @@ -1,14 +1,19 @@ -$NetBSD: patch-ac,v 1.6 2002/12/06 19:52:38 salo Exp $ +$NetBSD: patch-ac,v 1.7 2003/01/08 23:56:44 salo Exp $ ---- 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 +--- lib/silccrypt/Makefile.in.orig Wed Jan 8 17:25:45 2003 ++++ lib/silccrypt/Makefile.in Thu Jan 9 00:15:00 2003 +@@ -366,6 +366,14 @@ + .c.obj: + $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` + ++# Workaround a bug in GCC which causes momory exhaustion ++# when compiling sha1 with optimizations on UltraSPARC. ++# ++ifeq (sparc64, $(host_cpu)) ++sha1.lo: ++ $(LTCOMPILE) -O0 -c -o $@ `test -f 'sha1.c' || echo '$(srcdir)/'`sha1.c ++ endif ++ + .c.lo: + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - # 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 deleted file mode 100644 index 769ada64dd1..00000000000 --- a/chat/silc-server/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$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 deleted file mode 100644 index d01e589f142..00000000000 --- a/chat/silc-server/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$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@ -- cgit v1.2.3