Update cyrus sasl to 2.1.10. As noted in pkg/19335.

Fixes a buffer overflow:
http://online.securityfocus.com/archive/1/302603

and other misc bugs.

(note .sig file checked and verified)

7 files changed, 37 insertions, 32 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 3e495ed67b1..2e91254a548 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2002/11/23 14:44:53 chris Exp $
+# $NetBSD: Makefile,v 1.7 2002/12/11 23:48:58 chris Exp $
 
-DISTNAME=		cyrus-sasl-2.1.9
-PKGREVISION=		2
+DISTNAME=		cyrus-sasl-2.1.10
 SVR4_PKGNAME=		csasl
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/security/cyrus-sasl2/PLIST.common b/security/cyrus-sasl2/PLIST.common
index 8a6016007eb..dc0b9bf82f2 100644
--- a/security/cyrus-sasl2/PLIST.common
+++ b/security/cyrus-sasl2/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2002/11/14 22:21:13 seb Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2002/12/11 23:48:58 chris Exp $
 etc/rc.d/saslauthd
 include/sasl/hmac-md5.h
 include/sasl/md5.h
@@ -11,7 +11,7 @@ lib/libsasl2.a
 lib/libsasl2.la
 lib/libsasl2.so
 lib/libsasl2.so.2
-lib/libsasl2.so.2.9
+lib/libsasl2.so.2.10
 man/cat8/saslauthd.8
 man/man3/sasl.3
 man/man3/sasl_authorize_t.3
diff --git a/security/cyrus-sasl2/PLIST.krb5 b/security/cyrus-sasl2/PLIST.krb5
index f907fb37044..14f48108759 100644
--- a/security/cyrus-sasl2/PLIST.krb5
+++ b/security/cyrus-sasl2/PLIST.krb5
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST.krb5,v 1.2 2002/11/13 10:39:12 chris Exp $
+@comment $NetBSD: PLIST.krb5,v 1.3 2002/12/11 23:48:58 chris Exp $
 lib/sasl2/libgssapiv2.a
 lib/sasl2/libgssapiv2.la
 lib/sasl2/libgssapiv2.so
 lib/sasl2/libgssapiv2.so.2
-lib/sasl2/libgssapiv2.so.2.9
+lib/sasl2/libgssapiv2.so.2.10
diff --git a/security/cyrus-sasl2/PLIST.plugins b/security/cyrus-sasl2/PLIST.plugins
index 00310a3376d..4df3b69cb36 100644
--- a/security/cyrus-sasl2/PLIST.plugins
+++ b/security/cyrus-sasl2/PLIST.plugins
@@ -1,31 +1,31 @@
-@comment $NetBSD: PLIST.plugins,v 1.1.1.1 2002/10/27 15:08:59 chris Exp $
+@comment $NetBSD: PLIST.plugins,v 1.2 2002/12/11 23:48:58 chris Exp $
 lib/sasl2/libanonymous.a
 lib/sasl2/libanonymous.la
 lib/sasl2/libanonymous.so
 lib/sasl2/libanonymous.so.2
-lib/sasl2/libanonymous.so.2.9
+lib/sasl2/libanonymous.so.2.10
 lib/sasl2/libcrammd5.a
 lib/sasl2/libcrammd5.la
 lib/sasl2/libcrammd5.so
 lib/sasl2/libcrammd5.so.2
-lib/sasl2/libcrammd5.so.2.9
+lib/sasl2/libcrammd5.so.2.10
 lib/sasl2/libdigestmd5.a
 lib/sasl2/libdigestmd5.la
 lib/sasl2/libdigestmd5.so
 lib/sasl2/libdigestmd5.so.2
-lib/sasl2/libdigestmd5.so.2.9
+lib/sasl2/libdigestmd5.so.2.10
 lib/sasl2/libotp.a
 lib/sasl2/libotp.la
 lib/sasl2/libotp.so
 lib/sasl2/libotp.so.2
-lib/sasl2/libotp.so.2.9
+lib/sasl2/libotp.so.2.10
 lib/sasl2/libplain.a
 lib/sasl2/libplain.la
 lib/sasl2/libplain.so
 lib/sasl2/libplain.so.2
-lib/sasl2/libplain.so.2.9
+lib/sasl2/libplain.so.2.10
 lib/sasl2/libsasldb.a
 lib/sasl2/libsasldb.la
 lib/sasl2/libsasldb.so
 lib/sasl2/libsasldb.so.2
-lib/sasl2/libsasldb.so.2.9
+lib/sasl2/libsasldb.so.2.10
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index 613ca24a801..a799e7d3e7b 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.3 2002/11/14 22:21:13 seb Exp $
+$NetBSD: distinfo,v 1.4 2002/12/11 23:48:58 chris Exp $
 
-SHA1 (cyrus-sasl-2.1.9.tar.gz) = 6e920454702796c8e6c8482b74ee19f8280bc80b
-Size (cyrus-sasl-2.1.9.tar.gz) = 1274451 bytes
+SHA1 (cyrus-sasl-2.1.10.tar.gz) = a8c0d27239801943d1e9ed43caf99791aba784fa
+Size (cyrus-sasl-2.1.10.tar.gz) = 1325286 bytes
 SHA1 (patch-aa) = 6efdfcc69da11db097584a0a6295bda0131e302e
 SHA1 (patch-ac) = 828b3129769ee3224af31dd44fe8c9d6205c4bfa
 SHA1 (patch-ad) = 1811fd87ccee6de8a151e8e684344e6f3a7a8830
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
 SHA1 (patch-af) = 3af5330d1b3e242345ce9a7483ce6c73ed55d629
-SHA1 (patch-ah) = 9f9121b63e28f9b07dfd9da4f7a786ff15097b58
+SHA1 (patch-ah) = 50ff4e8ec0f4232bd8c2121b105d4818b978b950
 SHA1 (patch-ai) = dc4a9ed58b4970f23070aeb478ce857627612f94
-SHA1 (patch-aj) = a04ab11063422ab5db651759cb38b62220ebad71
+SHA1 (patch-aj) = d5f1ad8e889568591b9ddb10a7e731cde8d4a539
diff --git a/security/cyrus-sasl2/patches/patch-ah b/security/cyrus-sasl2/patches/patch-ah
index 1dbe0d48e89..5e1ef2f6d5c 100644
--- a/security/cyrus-sasl2/patches/patch-ah
+++ b/security/cyrus-sasl2/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+$NetBSD: patch-ah,v 1.2 2002/12/11 23:48:59 chris Exp $
 
---- lib/Makefile.am.orig	Fri Oct 11 22:19:04 2002
-+++ lib/Makefile.am	Sun Oct 27 14:32:57 2002
+--- lib/Makefile.am.orig	Wed Dec 11 23:29:42 2002
++++ lib/Makefile.am	Wed Dec 11 23:30:35 2002
 @@ -51,10 +51,7 @@
  libsasl2_a_SOURCES=
  
@@ -14,16 +14,19 @@ $NetBSD: patch-ah,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
  
  lib_LTLIBRARIES = libsasl2.la
  
-@@ -63,11 +60,8 @@
+@@ -63,13 +60,9 @@
  libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
  libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET)
  
 -plugin_common.lo: plugin_common.o
+-	rm -f plugin_common.lo
 -	ln -s $(top_builddir)/plugins/plugin_common.lo plugin_common.lo
 -
 -plugin_common.o:
+-	rm -f plugin_common.o
 -	ln -s $(top_builddir)/plugins/plugin_common.o plugin_common.o
 +plugin_common.c:
++	rm -f plugin_common.c
 +	ln -s $(top_builddir)/plugins/plugin_common.c plugin_common.c
  
  if MACOSX
diff --git a/security/cyrus-sasl2/patches/patch-aj b/security/cyrus-sasl2/patches/patch-aj
index 2c5a1c6e6f1..68fee71549c 100644
--- a/security/cyrus-sasl2/patches/patch-aj
+++ b/security/cyrus-sasl2/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 2002/11/14 22:21:15 seb Exp $
+$NetBSD: patch-aj,v 1.2 2002/12/11 23:48:59 chris Exp $
 
---- lib/Makefile.in.orig	Wed Nov 13 12:56:52 2002
-+++ lib/Makefile.in
+--- lib/Makefile.in.orig	Wed Dec 11 23:31:59 2002
++++ lib/Makefile.in	Wed Dec 11 23:32:12 2002
 @@ -1,6 +1,6 @@
 -# Makefile.in generated automatically by automake 1.4 from Makefile.am
 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
@@ -11,7 +11,7 @@ $NetBSD: patch-aj,v 1.1 2002/11/14 22:21:15 seb Exp $
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -122,6 +122,7 @@ JAVADOC = @JAVADOC@
+@@ -122,6 +122,7 @@
  JAVAH = @JAVAH@
  JAVAROOT = @JAVAROOT@
  JAVA_INCLUDES = @JAVA_INCLUDES@
@@ -19,7 +19,7 @@ $NetBSD: patch-aj,v 1.1 2002/11/14 22:21:15 seb Exp $
  LIBTOOL = @LIBTOOL@
  LIB_CRYPT = @LIB_CRYPT@
  LIB_DES = @LIB_DES@
-@@ -133,6 +134,7 @@ LIB_SOCKET = @LIB_SOCKET@
+@@ -133,6 +134,7 @@
  LN_S = @LN_S@
  LTGETADDRINFOOBJS = @LTGETADDRINFOOBJS@
  LTGETNAMEINFOOBJS = @LTGETNAMEINFOOBJS@
@@ -27,7 +27,7 @@ $NetBSD: patch-aj,v 1.1 2002/11/14 22:21:15 seb Exp $
  LTSNPRINTFOBJS = @LTSNPRINTFOBJS@
  MAKEINFO = @MAKEINFO@
  NM = @NM@
-@@ -177,10 +179,7 @@ noinst_LIBRARIES = @SASL_STATIC_LIBS@
+@@ -177,10 +179,7 @@
  libsasl2_a_SOURCES = 
  
  common_headers = saslint.h
@@ -39,7 +39,7 @@ $NetBSD: patch-aj,v 1.1 2002/11/14 22:21:15 seb Exp $
  
  lib_LTLIBRARIES = libsasl2.la
  
-@@ -207,7 +206,7 @@ LTLIBRARIES =  $(lib_LTLIBRARIES)
+@@ -207,7 +206,7 @@
  
  libsasl2_la_OBJECTS =  auxprop.lo canonusr.lo checkpw.lo client.lo \
  common.lo config.lo external.lo md5.lo saslutil.lo server.lo \
@@ -48,7 +48,7 @@ $NetBSD: patch-aj,v 1.1 2002/11/14 22:21:15 seb Exp $
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -219,7 +218,7 @@ getsubopt.c snprintf.c
+@@ -219,7 +218,7 @@
  
  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
@@ -57,16 +57,19 @@ $NetBSD: patch-aj,v 1.1 2002/11/14 22:21:15 seb Exp $
  GZIP_ENV = --best
  SOURCES = $(libsasl2_a_SOURCES) $(libsasl2_la_SOURCES)
  OBJECTS = $(libsasl2_a_OBJECTS) $(libsasl2_la_OBJECTS)
-@@ -436,11 +435,8 @@ distclean-generic clean-generic maintain
+@@ -436,13 +435,9 @@
  mostlyclean distclean maintainer-clean
  
  
 -plugin_common.lo: plugin_common.o
+-	rm -f plugin_common.lo
 -	ln -s $(top_builddir)/plugins/plugin_common.lo plugin_common.lo
 -
 -plugin_common.o:
+-	rm -f plugin_common.o
 -	ln -s $(top_builddir)/plugins/plugin_common.o plugin_common.o
 +plugin_common.c:
++	rm -f plugin_common.c
 +	ln -s $(top_builddir)/plugins/plugin_common.c plugin_common.c
  @MACOSX_TRUE@install-exec-hook:
  @MACOSX_TRUE@	$(mkinstalldirs) $(framedir)/Versions/A