Update silc-client to version 1.1.8 to fix a security problem.

Changes:
 - Portability: Check threads support in OpenBSD.
 - Security: Fixed string format vulnerability in client entry handling.
 - Autoconf upgrade.
 - PacketEngine: Don't free underlaying stream in packet stream create error
 - If packet stream creation failed it freed the stream given as argument.

   This is wrong.  It is the caller's responsibility to free it if the
   packet stream creation failed.
 - SKE: When failure is received mark SKE always failed

   Mark the SKE failed even if we don't receive error from remote.  Fixes
   crash where the callback is called back to application without valid
   key material and without error status.

5 files changed, 18 insertions, 19 deletions

diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index a23757daeef..9eb33f1c53a 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2009/06/14 22:57:58 joerg Exp $
+# $NetBSD: Makefile,v 1.55 2009/08/02 19:18:40 tonnerre Exp $
 #
 
 DISTNAME=		${SILC_CLIENT_DISTNAME}
-PKGREVISION=		1
 CATEGORIES=		chat security
 MASTER_SITES=		http://www.silcnet.org/download/client/sources/ \
 			ftp://ftp.silcnet.org/silc/client/sources/ \
diff --git a/chat/silc-client/Makefile.common b/chat/silc-client/Makefile.common
index 8994cbe0157..9a3dfcdf771 100644
--- a/chat/silc-client/Makefile.common
+++ b/chat/silc-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.12 2009/01/12 06:46:43 tonnerre Exp $
+# $NetBSD: Makefile.common,v 1.13 2009/08/02 19:18:40 tonnerre Exp $
 #
 
 # Distribution specific information.
 #
-SILC_CLIENT_VERSION=		1.1.7
+SILC_CLIENT_VERSION=		1.1.8
 SILC_CLIENT_DISTNAME=		silc-client-${SILC_CLIENT_VERSION}
 SILC_CLIENT_EXTRACT_SUFX=	.tar.bz2
 SILC_CLIENT_DISTFILE=		${SILC_CLIENT_DISTNAME}${SILC_CLIENT_EXTRACT_SUFX}
diff --git a/chat/silc-client/distinfo b/chat/silc-client/distinfo
index 03d211d8cb8..aeda8f48395 100644
--- a/chat/silc-client/distinfo
+++ b/chat/silc-client/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.34 2009/01/12 07:15:50 tonnerre Exp $
+$NetBSD: distinfo,v 1.35 2009/08/02 19:18:40 tonnerre Exp $
 
-SHA1 (silc-client-1.1.7.tar.bz2) = 3d6ebdeaea98a728cd225114c972116c8746fb72
-RMD160 (silc-client-1.1.7.tar.bz2) = 06bb20b4ee795b814fc0fb73c07b3ae19b9b4e71
-Size (silc-client-1.1.7.tar.bz2) = 1528679 bytes
-SHA1 (patch-aa) = 59bfbaf78235e919b4e09f194d88d029630a4160
+SHA1 (silc-client-1.1.8.tar.bz2) = 5936ab682e746ae413f938ce9c9b72215d6524c0
+RMD160 (silc-client-1.1.8.tar.bz2) = a010384b5e498a62cc6cd69e97602f3118b64d2f
+Size (silc-client-1.1.8.tar.bz2) = 1532816 bytes
+SHA1 (patch-aa) = 52cc285982176c1680f74059de47d1bde456a871
 SHA1 (patch-ab) = 873c65a78da7195b8baddb33d1c71300fce704f1
 SHA1 (patch-ac) = 576299d98ea63f6c42cc341bf31ad7ec903f93c8
 SHA1 (patch-ad) = 490e3b2a99e14683b9a0005494d29b5a91186755
-SHA1 (patch-ae) = b437cb3433093592573802e70b600c7556ee5834
+SHA1 (patch-ae) = c5b21eb9d65cb0bbc685f5e771849f1ccf07681b
 SHA1 (patch-af) = 29738fac989989fdd2a8865f9f5e2b3ea2ed7198
diff --git a/chat/silc-client/patches/patch-aa b/chat/silc-client/patches/patch-aa
index f7f81ef9079..8ec3e00e831 100644
--- a/chat/silc-client/patches/patch-aa
+++ b/chat/silc-client/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.13 2008/07/13 12:04:11 tonnerre Exp $
+$NetBSD: patch-aa,v 1.14 2009/08/02 19:18:40 tonnerre Exp $
 
---- apps/irssi/docs/help/Makefile.in.orig	2007-12-07 18:10:34.000000000 +0100
-+++ apps/irssi/docs/help/Makefile.in	2007-12-07 18:10:48.000000000 +0100
-@@ -211,7 +211,7 @@
- target_alias = @target_alias@
+--- apps/irssi/docs/help/Makefile.in.orig	2009-08-01 08:53:41.000000000 +0200
++++ apps/irssi/docs/help/Makefile.in
+@@ -215,7 +215,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -@SILCPLUGIN_FALSE@helpdir = $(datadir)/silc/help
diff --git a/chat/silc-client/patches/patch-ae b/chat/silc-client/patches/patch-ae
index 22d8260b261..72a531f1e8a 100644
--- a/chat/silc-client/patches/patch-ae
+++ b/chat/silc-client/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.3 2008/07/13 12:04:11 tonnerre Exp $
+$NetBSD: patch-ae,v 1.4 2009/08/02 19:18:40 tonnerre Exp $
 
---- apps/irssi/scripts/examples/Makefile.in.orig	2008-03-20 06:47:18.000000000 +0000
+--- apps/irssi/scripts/examples/Makefile.in.orig	2009-08-01 08:53:41.000000000 +0200
 +++ apps/irssi/scripts/examples/Makefile.in
-@@ -197,7 +197,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -201,7 +201,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -@SILCPLUGIN_FALSE@scriptdir = $(datadir)/silc/scripts