From 6ae4b2bca484ad5d42aceac288c7f9ed8484e4b2 Mon Sep 17 00:00:00 2001 From: salo Date: Mon, 17 Mar 2003 20:12:47 +0000 Subject: Updated to version 0.9.13. Changes: - Fixed EOF handling in SILC Config. - Do not send full INVITE and BAN lists in INVITE and BAN notifys, only the changed information. - Fixed INVITE notify sending in INVITE command, send it only when needed. - Handle the founder key change properly in CMODE_CHANGE notify. Bug #122. - Remove the mark for output (mark it only for input) after purging outgoing queue. Prevents the "Error in select()" floods. - Check server private key file permissions before starting the server. - NULL terminate allocated string in silc_buffer_strformat. - Rewrote the invite/ban list string handling in server to use SilcBuffer instead. - Fixed double free in CMODE command when setting new HMAC for channel. - Added couple of missing memset's to zero sensitive memory. --- chat/silc-server/DEINSTALL | 7 ++----- chat/silc-server/Makefile | 7 ++++--- chat/silc-server/PLIST | 6 +++--- chat/silc-server/distinfo | 10 +++++----- chat/silc-server/patches/patch-aa | 23 ++++++++++++++++------- chat/silc-server/patches/patch-ac | 4 ++-- 6 files changed, 32 insertions(+), 25 deletions(-) (limited to 'chat/silc-server') diff --git a/chat/silc-server/DEINSTALL b/chat/silc-server/DEINSTALL index 35a78bc5842..57b2a1c8ee0 100644 --- a/chat/silc-server/DEINSTALL +++ b/chat/silc-server/DEINSTALL @@ -1,10 +1,7 @@ -# $NetBSD: DEINSTALL,v 1.5 2002/09/14 02:59:25 hubertf Exp $ +# $NetBSD: DEINSTALL,v 1.6 2003/03/17 20:12:47 salo Exp $ +# case ${STAGE} in -DEINSTALL) - ${ECHO} "==> Try to stop silcd if running." - @PREFIX@/etc/rc.d/silcd stop - ;; POST-DEINSTALL) if [ -f @PKG_SYSCONFDIR@/silcd.prv ]; then ${ECHO} =========================================================================== diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 6ae5ab89c0f..f31a2f93827 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2003/01/28 22:03:07 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2003/03/17 20:12:47 salo Exp $ +# -DISTNAME= silc-server-0.9.12 +DISTNAME= silc-server-0.9.13 CATEGORIES= chat security MASTER_SITES= http://www.silcnet.org/download/server/sources/ \ ftp://ftp.silcnet.org/silc/server/sources/ \ @@ -15,7 +16,6 @@ COMMENT= Server for the Secure Internet Live Conferencing (SILC) USE_BUILDLINK2= YES USE_PKGINSTALL= YES - GNU_CONFIGURE= YES USE_GMAKE= YES USE_LIBTOOL= YES @@ -78,4 +78,5 @@ post-install: > ${PREFIX}/share/examples/silcd/motd.txt.default .include "../../devel/glib/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/chat/silc-server/PLIST b/chat/silc-server/PLIST index 6bf29462ca4..3147a8b171e 100644 --- a/chat/silc-server/PLIST +++ b/chat/silc-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2002/12/06 19:52:37 salo Exp $ +@comment $NetBSD: PLIST,v 1.10 2003/03/17 20:12:47 salo Exp $ etc/rc.d/silcd lib/silcd/libsilc-1.0.so lib/silcd/libsilc-1.0.so.1 @@ -36,7 +36,7 @@ share/examples/silcd/silcalgs.conf.default share/examples/silcd/silcd.conf.default share/examples/silcd/silcd.prv share/examples/silcd/silcd.pub +@dirrm share/examples/silcd +@dirrm share/doc/silcd @dirrm lib/silcd/modules @dirrm lib/silcd -@dirrm share/doc/silcd -@dirrm share/examples/silcd diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo index d08570eb0c7..04685e6e39c 100644 --- a/chat/silc-server/distinfo +++ b/chat/silc-server/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.18 2003/01/26 14:10:44 salo Exp $ +$NetBSD: distinfo,v 1.19 2003/03/17 20:12:47 salo Exp $ -SHA1 (silc-server-0.9.12.tar.bz2) = c292c6e99c6b987b3f83c7db1dc0c390a2d44e6c -Size (silc-server-0.9.12.tar.bz2) = 1084501 bytes -SHA1 (patch-aa) = 5e36211392b9e24debfd40cb6da83c4558742798 +SHA1 (silc-server-0.9.13.tar.bz2) = 04740652748363aee461258202fd2ade9c268979 +Size (silc-server-0.9.13.tar.bz2) = 1084978 bytes +SHA1 (patch-aa) = 574f1c4bcbf4ef7d91b6bd53044570c99717d4cc SHA1 (patch-ab) = 55b3f00076c5b8a443465753ae07b9e812236f18 -SHA1 (patch-ac) = f88e5cef60a9e69775f2ffda637bb6a2e6894ede +SHA1 (patch-ac) = cf4ba08135b9d52169e7a9dde29e53f3822d7578 diff --git a/chat/silc-server/patches/patch-aa b/chat/silc-server/patches/patch-aa index 36416433b1b..8acab77e8d3 100644 --- a/chat/silc-server/patches/patch-aa +++ b/chat/silc-server/patches/patch-aa @@ -1,8 +1,17 @@ -$NetBSD: patch-aa,v 1.7 2002/12/04 17:31:56 salo Exp $ +$NetBSD: patch-aa,v 1.8 2003/03/17 20:12:47 salo Exp $ ---- Makefile.in.orig Fri Nov 29 08:58:19 2002 -+++ Makefile.in Wed Dec 4 17:40:13 2002 -@@ -710,14 +710,12 @@ +--- Makefile.in.orig 2003-03-17 18:44:44.000000000 +0100 ++++ Makefile.in 2003-03-17 20:27:59.000000000 +0100 +@@ -216,7 +216,7 @@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ +-mandir = $(DESTDIR)$(mandir) ++mandir = $(DESTDIR)@mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ +@@ -709,14 +709,12 @@ -mkdir -p $(mandir)/man1 install-dirs-server: install-dirs @@ -17,7 +26,7 @@ $NetBSD: patch-aa,v 1.7 2002/12/04 17:31:56 salo Exp $ -$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/ -$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/ -$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/ -@@ -732,7 +730,6 @@ +@@ -731,7 +729,6 @@ fi doc-install-server: doc-install @@ -25,7 +34,7 @@ $NetBSD: patch-aa,v 1.7 2002/12/04 17:31:56 salo Exp $ -@if test -f $(srcdir)/doc/silcd.8 ; then \ $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \ fi -@@ -767,9 +764,12 @@ +@@ -766,9 +763,12 @@ -cp -R $(srcdir)/tutorial $(prefix) examples-install: @@ -41,7 +50,7 @@ $NetBSD: patch-aa,v 1.7 2002/12/04 17:31:56 salo Exp $ generate-server-key: -@if test '!' -f $(etcdir)/silcd.pub ; then \ -@@ -778,7 +778,7 @@ +@@ -777,7 +777,7 @@ @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 diff --git a/chat/silc-server/patches/patch-ac b/chat/silc-server/patches/patch-ac index aa22d90d6e9..61afbd16562 100644 --- a/chat/silc-server/patches/patch-ac +++ b/chat/silc-server/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.7 2003/01/08 23:56:44 salo Exp $ +$NetBSD: patch-ac,v 1.8 2003/03/17 20:12:48 salo Exp $ --- lib/silccrypt/Makefile.in.orig Wed Jan 8 17:25:45 2003 +++ lib/silccrypt/Makefile.in Thu Jan 9 00:15:00 2003 @@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.7 2003/01/08 23:56:44 salo Exp $ .c.obj: $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` -+# Workaround a bug in GCC which causes momory exhaustion ++# Workaround a bug in GCC which causes memory exhaustion +# when compiling sha1 with optimizations on UltraSPARC. +# +ifeq (sparc64, $(host_cpu)) -- cgit v1.2.3