update to version 0.9.8

Changes between 0.9.5.1 and 0.9.8
=================================

* Added STATS command.
* Added Requested Attributes support.
* Added -details option to WHOIS command to support the requested
  attributes. By default it requests all attributes.
* Added implementation of VCard (RFC 2426) which can be used as
  part of Requested Attributes in WHOIS command.
* Added ATTR command which is used to manage user's Requested
  Attributes sending and values for WHOIS command.
* Added support for saving the requested attributes in WHOIS to
  directory.
* Added support for auto-passphrase authentication from the config
  file during connecting which was not implemented yet.
* Added shared library complation support.
* Added support for encrypted private key files. Now passphrase
  must be provided when new key pair is created and prompted when
  loading the private key.
* Added -P option which can be used to change the passphrase of
  the private key.
* UTF-8 decode the topic in TOPIC command reply and LIST command
  reply.
* Added manpage for silc(1).

* Fixed string formatting crashbug in lib/silccore/silcattrs.c
* Fixed double free in RSA public key set function.
* Fixed a bug in authentication protocol failure handling which
  was processing wrong callback context.
* Merged DISCONNECT fix, and autoconn port fix from Irssi CVS.
* Merged c0ffee's /set heartbeat patch and fixed the heartbeat
  sending.
* Fixed connection closing in client library to not crash.
* Fixed the INVITE command to not crash client when given without
  nickname argument.

4 files changed, 57 insertions, 26 deletions

diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 748b02847f5..3ece12c81f6 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2002/09/12 23:05:37 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2002/11/21 15:40:14 salo Exp $
 
-DISTNAME=		silc-client-0.9.5.1
+DISTNAME=		silc-client-0.9.8
 CATEGORIES=		chat security
 MASTER_SITES=		http://www.silcnet.org/download/client/sources/ \
 			ftp://ftp.silcnet.org/silc/client/sources/ \
@@ -11,7 +11,7 @@ MASTER_SITES=		http://www.silcnet.org/download/client/sources/ \
 			http://www.at.silcnet.org/download/client/sources/
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		salo@silcnet.org
+MAINTAINER=		salo@netbsd.org
 HOMEPAGE=		http://www.silcnet.org/
 COMMENT=                Client for the Secure Internet Live Conferencing (SILC) protocol
 
@@ -25,6 +25,7 @@ USE_LIBTOOL=		# defined
 
 PKG_SYSCONFSUBDIR?=	silc
 
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/silc
 CONFIGURE_ARGS+=	--with-helpdir=${PREFIX}/share/silc/help
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/silc
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
@@ -71,6 +72,19 @@ CONFIGURE_ARGS+=	--disable-asm
 
 PLIST_SRC+=		${PKGDIR}/PLIST
 
+# Temporary hack which prevents installation of static libraries
+#
+post-build:
+	for file in \
+	${WRKSRC}/lib/libsilc.la \
+	${WRKSRC}/lib/libsilcclient.la \
+	${WRKSRC}/lib/.libs/libsilc.la \
+	${WRKSRC}/lib/.libs/libsilcclient.la ; \
+	do \
+		${CP} $$file $$file.orig ; \
+		${SED} "s|^old_library|#&|" $$file.orig > $$file ; \
+	done
+
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/glib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/silc-client/PLIST b/chat/silc-client/PLIST
index 2d9c7a99cd4..dfa4c406ca5 100644
--- a/chat/silc-client/PLIST
+++ b/chat/silc-client/PLIST
@@ -1,6 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2002/09/12 23:05:37 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.8 2002/11/21 15:40:14 salo Exp $
 bin/silc
 etc/silc/silc.conf
+lib/silc/libsilc.la
+lib/silc/libsilc.so
+lib/silc/libsilc.so.0
+lib/silc/libsilc.so.0.0
+lib/silc/libsilcclient.la
+lib/silc/libsilcclient.so
+lib/silc/libsilcclient.so.0
+lib/silc/libsilcclient.so.0.0
 lib/silc/modules/aes.sim.so
 lib/silc/modules/blowfish.sim.so
 lib/silc/modules/cast.sim.so
@@ -12,6 +20,7 @@ lib/silc/modules/rc6.sim.so
 lib/silc/modules/rsa.sim.so
 lib/silc/modules/sha1.sim.so
 lib/silc/modules/twofish.sim.so
+man/man1/silc.1
 share/doc/silc/CHANGES
 share/doc/silc/COPYING
 share/doc/silc/CREDITS
@@ -28,6 +37,7 @@ share/doc/silc/startup-HOWTO.html
 share/silc/help/action
 share/silc/help/admin
 share/silc/help/alias
+share/silc/help/attr
 share/silc/help/away
 share/silc/help/ban
 share/silc/help/beep
@@ -94,6 +104,7 @@ share/silc/help/server
 share/silc/help/set
 share/silc/help/shutdown
 share/silc/help/silcoper
+share/silc/help/stats
 share/silc/help/statusbar
 share/silc/help/toggle
 share/silc/help/topic
diff --git a/chat/silc-client/distinfo b/chat/silc-client/distinfo
index 1b9308662d1..9cccef4f74c 100644
--- a/chat/silc-client/distinfo
+++ b/chat/silc-client/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2002/09/12 23:05:38 hubertf Exp $
+$NetBSD: distinfo,v 1.14 2002/11/21 15:40:14 salo Exp $
 
-SHA1 (silc-client-0.9.5.1.tar.bz2) = 774d3f3ebf8a71ea2dab9be7f4b7bc1a8a31aa7f
-Size (silc-client-0.9.5.1.tar.bz2) = 1401244 bytes
-SHA1 (patch-aa) = 70dbd7ae4e0cf465f39086e0490781c61d48d7e1
+SHA1 (silc-client-0.9.8.tar.bz2) = 4b3029436226d4826e82ab6ca897e043e3588dda
+Size (silc-client-0.9.8.tar.bz2) = 1566456 bytes
+SHA1 (patch-aa) = 5c7233288521af164cc2588e84127774cddb359e
diff --git a/chat/silc-client/patches/patch-aa b/chat/silc-client/patches/patch-aa
index 358c924d35a..b3fc5272db3 100644
--- a/chat/silc-client/patches/patch-aa
+++ b/chat/silc-client/patches/patch-aa
@@ -1,27 +1,33 @@
-$NetBSD: patch-aa,v 1.7 2002/05/03 21:51:57 hubertf Exp $
+$NetBSD: patch-aa,v 1.8 2002/11/21 15:40:15 salo Exp $
 
---- Makefile.in.orig	Tue Apr 16 18:30:05 2002
-+++ Makefile.in	Wed May  1 15:18:56 2002
-@@ -531,7 +531,6 @@
+--- Makefile.in.orig	Wed Nov  6 16:40:28 2002
++++ Makefile.in	Wed Nov 13 01:14:19 2002
+@@ -697,10 +697,7 @@
  	-mkdir -p $(modulesdir)
  	-mkdir -p $(helpdir)
  	-mkdir -p $(docdir)
 -	-mkdir -p $(logsdir)
+ 	-mkdir -p $(manualdir)/man1
+-	-mkdir -p $(manualdir)/man5
+-	-mkdir -p $(manualdir)/man8
  
  generate-server-key:
  	-@if test '!' -f $(etcdir)/silcd.pub ; then \
-@@ -544,8 +543,7 @@
+@@ -713,11 +710,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)/irssi/silc.conf $(docdir)/silc.conf.default
- 	$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
- 	$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
- 	$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-@@ -565,13 +563,6 @@
- 	$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/
+ 	-$(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)/irssi/silc.conf $(docdir)/silc.conf.default
+ 	-$(INSTALL_DATA) $(srcdir)/doc/silc.1 $(manualdir)/man1
+-	-$(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(manualdir)/man8;
+-	-$(INSTALL_DATA) $(srcdir)/doc/silcd.conf.5 $(manualdir)/man5;
+ 	-$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
+ 	-$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
+ 	-$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
+@@ -737,13 +731,6 @@
+ 	-$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
  
  etc-install:
 -	-@if test '!' -f $(etcdir)/silcd.conf ; then \
@@ -31,6 +37,6 @@ $NetBSD: patch-aa,v 1.7 2002/05/03 21:51:57 hubertf Exp $
 -		$(etcdir)/silcalgs.conf; \
 -          chmod go= $(etcdir)/silcd.conf; \
 -	fi
- 	-@if test '!' -f $(etcdir)/silc.conf ; then \
- 	  $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
- 	  $(etcdir)/silc.conf; \
+ 	-@if test '!' -d $(srcdir)/irssi ; then \
+ 	  if test '!' -f $(etcdir)/silc.conf ; then \
+ 	    $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \