Update to 1.5.27. Changes are mostly bugfixes including a fix for the

format string vulnerability described in

        http://www.securityfocus.com/bid/3498

Closes pkg/15149 from <naoki@fukaumi.org>

5 files changed, 21 insertions, 22 deletions

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 6576ef5e120..284c13fb7ae 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2001/12/10 12:43:21 martti Exp $
+# $NetBSD: Makefile,v 1.26 2002/01/13 14:23:37 skrll Exp $
 
-DISTNAME=		cyrus-sasl-1.5.24
-PKGREVISION=		4
+DISTNAME=		cyrus-sasl-1.5.27
 SVR4_PKGNAME=		csasl
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/security/cyrus-sasl/PLIST.common b/security/cyrus-sasl/PLIST.common
index 0965cb353ad..131a177f21a 100644
--- a/security/cyrus-sasl/PLIST.common
+++ b/security/cyrus-sasl/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2001/11/01 01:22:01 zuntum Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2002/01/13 14:23:38 skrll Exp $
 bin/sasl-config
 etc/rc.d/sasl_pwcheck
 include/hmac-md5.h
@@ -9,7 +9,7 @@ lib/libsasl.a
 lib/libsasl.la
 lib/libsasl.so
 lib/libsasl.so.8
-lib/libsasl.so.8.8
+lib/libsasl.so.8.10
 man/man3/sasl.3
 man/man3/sasl_authorize_t.3
 man/man3/sasl_done.3
@@ -40,7 +40,6 @@ man/man8/saslpasswd.8
 sbin/pwcheck
 sbin/sasldblistusers
 sbin/saslpasswd
-share/doc/html/cyrus-sasl/draft-leach-digest-sasl-05.txt
 share/doc/html/cyrus-sasl/draft-newman-auth-scram-03.txt
 share/doc/html/cyrus-sasl/gssapi.html
 share/doc/html/cyrus-sasl/index.html
@@ -50,5 +49,6 @@ share/doc/html/cyrus-sasl/rfc2095.txt
 share/doc/html/cyrus-sasl/rfc2104.txt
 share/doc/html/cyrus-sasl/rfc2222.txt
 share/doc/html/cyrus-sasl/rfc2245.txt
+share/doc/html/cyrus-sasl/rfc2831.txt
 share/doc/html/cyrus-sasl/sysadmin.html
 @dirrm share/doc/html/cyrus-sasl
diff --git a/security/cyrus-sasl/PLIST.plugins b/security/cyrus-sasl/PLIST.plugins
index 6560d366412..fd330f69896 100644
--- a/security/cyrus-sasl/PLIST.plugins
+++ b/security/cyrus-sasl/PLIST.plugins
@@ -1,22 +1,22 @@
-@comment $NetBSD: PLIST.plugins,v 1.2 2001/11/21 22:22:10 jlam Exp $
+@comment $NetBSD: PLIST.plugins,v 1.3 2002/01/13 14:23:38 skrll Exp $
 lib/sasl/libanonymous.a
 lib/sasl/libanonymous.la
 lib/sasl/libanonymous.so
 lib/sasl/libanonymous.so.1
-lib/sasl/libanonymous.so.1.15
+lib/sasl/libanonymous.so.1.16
 lib/sasl/libcrammd5.a
 lib/sasl/libcrammd5.la
 lib/sasl/libcrammd5.so
 lib/sasl/libcrammd5.so.1
-lib/sasl/libcrammd5.so.1.15
+lib/sasl/libcrammd5.so.1.17
 lib/sasl/libdigestmd5.a
 lib/sasl/libdigestmd5.la
 lib/sasl/libdigestmd5.so
 lib/sasl/libdigestmd5.so.0
-lib/sasl/libdigestmd5.so.0.17
+lib/sasl/libdigestmd5.so.0.19
 lib/sasl/libplain.a
 lib/sasl/libplain.la
 lib/sasl/libplain.so
 lib/sasl/libplain.so.1
-lib/sasl/libplain.so.1.14
+lib/sasl/libplain.so.1.15
 @unexec ${RMDIR} -p %D/lib/sasl 2>/dev/null || ${TRUE}
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index 08fbda57da9..4d0f69e20a4 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/12/10 12:43:21 martti Exp $
+$NetBSD: distinfo,v 1.4 2002/01/13 14:23:38 skrll Exp $
 
-SHA1 (cyrus-sasl-1.5.24.tar.gz) = 6e8cbc8f1ee5269c4f3aad1f501b422be7117168
-Size (cyrus-sasl-1.5.24.tar.gz) = 494457 bytes
+SHA1 (cyrus-sasl-1.5.27.tar.gz) = eedaec8355219b61e64236e3a5d9845d3af5a13d
+Size (cyrus-sasl-1.5.27.tar.gz) = 528252 bytes
 SHA1 (patch-aa) = 0cd3f7a221a601008ed42f8edbf6f2724479be02
 SHA1 (patch-ab) = 82359390958c020348e7e7ebc39315da552d34c7
 SHA1 (patch-ac) = b5f99dd4789c19e36c29bbc3fbf47c556e32876e
@@ -9,5 +9,5 @@ SHA1 (patch-ad) = faa888873c16c3c322e110a6f90380748b138942
 SHA1 (patch-ae) = b9f4295f80a64defe0381bce7def7b462bf5d196
 SHA1 (patch-af) = 3910389c08f72aaea6c964dbb846843fc57889df
 SHA1 (patch-ag) = acfc55182396a96d3fccdb93ba3c6207eb7c154f
-SHA1 (patch-ah) = 66ce42b201558c959be0a584e7d4121a283ae3db
+SHA1 (patch-ah) = b6cc6e850c97ace7a81869611a0534b2aaa012d1
 SHA1 (patch-ai) = 55ade1200d2c5b8f20b4c1775d6c3b7d3b8ef278
diff --git a/security/cyrus-sasl/patches/patch-ah b/security/cyrus-sasl/patches/patch-ah
index c68dd0bda66..1501bab6c9b 100644
--- a/security/cyrus-sasl/patches/patch-ah
+++ b/security/cyrus-sasl/patches/patch-ah
@@ -1,16 +1,16 @@
-$NetBSD: patch-ah,v 1.1 2000/12/10 09:43:38 jlam Exp $
+$NetBSD: patch-ah,v 1.2 2002/01/13 14:23:38 skrll Exp $
 
---- plugins/gssapi.c.orig	Thu Jul 20 22:06:52 2000
+--- plugins/gssapi.c.orig	Sat Mar 10 05:56:46 2001
 +++ plugins/gssapi.c
-@@ -50,6 +50,11 @@
+@@ -49,6 +49,11 @@
+ #else
  #include <gssapi/gssapi.h>
  #endif
- 
++  
 +/* Heimdal has this, but MIT Kerberos doesn't */
 +#ifndef GSS_C_NO_NAME
 +#define GSS_C_NO_NAME  ((gss_name_t) 0)
 +#endif
-+
+ 
  #ifdef WIN32
- #include <winsock.h>
- #else
+ #  include <winsock.h>