Update to version 2.1.12.

New in 2.1.12
-------------
* Distribute in Solaris tar (not GNU tar format)
* Fix a number of build/configure related issues.

New in 2.1.11
-------------
* Add the fastbind auth method to the saslauthd LDAP module.
* Fix a potential memory leak in the doors version of saslauthd.
* NTLM now only requires one of LM or NT, not both.
* Fix a variety of Berkeley DB, LDAP, OpenSSL, and other build issues.
* Win32 support compiles, but no documentation as of yet.

9 files changed, 94 insertions, 44 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index b4d48e69d7a..b509c353103 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2003/01/28 22:04:04 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/02/27 13:18:06 seb Exp $
 
-DISTNAME=		cyrus-sasl-2.1.10
+DISTNAME=		cyrus-sasl-2.1.12
 SVR4_PKGNAME=		csasl
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -65,7 +65,6 @@ CONFIGURE_ARGS+=	--disable-gssapi	# --- no GSSAPI
 .endif
 
 PLIST_SRC+=		${PKGDIR}/PLIST.plugins
-PLIST_SRC+=		${PKGDIR}/PLIST.post
 
 .if defined(USE_PAM)
 .  include "../../security/PAM/buildlink2.mk"
diff --git a/security/cyrus-sasl2/PLIST.common b/security/cyrus-sasl2/PLIST.common
index 1dfa444dfba..78ea5a5298b 100644
--- a/security/cyrus-sasl2/PLIST.common
+++ b/security/cyrus-sasl2/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2002/12/23 16:28:44 cjep Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2003/02/27 13:18:06 seb 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.10
+lib/libsasl2.so.2.12
 man/cat8/saslauthd.8
 man/man3/sasl.3
 man/man3/sasl_authorize_t.3
@@ -94,6 +94,7 @@ share/doc/html/cyrus-sasl/rfc3174.txt
 share/doc/html/cyrus-sasl/sysadmin.html
 share/doc/html/cyrus-sasl/testing.txt
 share/doc/html/cyrus-sasl/upgrading.html
+share/doc/html/cyrus-sasl/windows.html
 @dirrm share/doc/html/cyrus-sasl
 @dirrm include/sasl
 @unexec ${RM} -rf ${SASLSOCKETDIR}
diff --git a/security/cyrus-sasl2/PLIST.krb5 b/security/cyrus-sasl2/PLIST.krb5
index 14f48108759..9622b687c63 100644
--- a/security/cyrus-sasl2/PLIST.krb5
+++ b/security/cyrus-sasl2/PLIST.krb5
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST.krb5,v 1.3 2002/12/11 23:48:58 chris Exp $
+@comment $NetBSD: PLIST.krb5,v 1.4 2003/02/27 13:18:06 seb Exp $
 lib/sasl2/libgssapiv2.a
 lib/sasl2/libgssapiv2.la
 lib/sasl2/libgssapiv2.so
 lib/sasl2/libgssapiv2.so.2
-lib/sasl2/libgssapiv2.so.2.10
+lib/sasl2/libgssapiv2.so.2.12
diff --git a/security/cyrus-sasl2/PLIST.plugins b/security/cyrus-sasl2/PLIST.plugins
index 4df3b69cb36..35171172cd0 100644
--- a/security/cyrus-sasl2/PLIST.plugins
+++ b/security/cyrus-sasl2/PLIST.plugins
@@ -1,31 +1,31 @@
-@comment $NetBSD: PLIST.plugins,v 1.2 2002/12/11 23:48:58 chris Exp $
+@comment $NetBSD: PLIST.plugins,v 1.3 2003/02/27 13:18:06 seb Exp $
 lib/sasl2/libanonymous.a
 lib/sasl2/libanonymous.la
 lib/sasl2/libanonymous.so
 lib/sasl2/libanonymous.so.2
-lib/sasl2/libanonymous.so.2.10
+lib/sasl2/libanonymous.so.2.12
 lib/sasl2/libcrammd5.a
 lib/sasl2/libcrammd5.la
 lib/sasl2/libcrammd5.so
 lib/sasl2/libcrammd5.so.2
-lib/sasl2/libcrammd5.so.2.10
+lib/sasl2/libcrammd5.so.2.12
 lib/sasl2/libdigestmd5.a
 lib/sasl2/libdigestmd5.la
 lib/sasl2/libdigestmd5.so
 lib/sasl2/libdigestmd5.so.2
-lib/sasl2/libdigestmd5.so.2.10
+lib/sasl2/libdigestmd5.so.2.12
 lib/sasl2/libotp.a
 lib/sasl2/libotp.la
 lib/sasl2/libotp.so
 lib/sasl2/libotp.so.2
-lib/sasl2/libotp.so.2.10
+lib/sasl2/libotp.so.2.12
 lib/sasl2/libplain.a
 lib/sasl2/libplain.la
 lib/sasl2/libplain.so
 lib/sasl2/libplain.so.2
-lib/sasl2/libplain.so.2.10
+lib/sasl2/libplain.so.2.12
 lib/sasl2/libsasldb.a
 lib/sasl2/libsasldb.la
 lib/sasl2/libsasldb.so
 lib/sasl2/libsasldb.so.2
-lib/sasl2/libsasldb.so.2.10
+lib/sasl2/libsasldb.so.2.12
diff --git a/security/cyrus-sasl2/PLIST.post b/security/cyrus-sasl2/PLIST.post
deleted file mode 100644
index 0d160c3c9f4..00000000000
--- a/security/cyrus-sasl2/PLIST.post
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.post,v 1.1 2002/11/14 22:21:13 seb Exp $
-@dirrm lib/sasl2
diff --git a/security/cyrus-sasl2/buildlink2.mk b/security/cyrus-sasl2/buildlink2.mk
index 2099a4bb8d7..a6edac930a1 100644
--- a/security/cyrus-sasl2/buildlink2.mk
+++ b/security/cyrus-sasl2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/12 09:13:52 chris Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/02/27 13:18:07 seb Exp $
 
 .if !defined(CYRUS_SASL_BUILDLINK2_MK)
 CYRUS_SASL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			cyrus-sasl
-BUILDLINK_DEPENDS.cyrus-sasl?=		cyrus-sasl>=2.1.10
+BUILDLINK_DEPENDS.cyrus-sasl?=		cyrus-sasl>=2.1.12
 BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.cyrus-sasl=cyrus-sasl
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index a799e7d3e7b..1d24bc18e8d 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.4 2002/12/11 23:48:58 chris Exp $
+$NetBSD: distinfo,v 1.5 2003/02/27 13:18:07 seb Exp $
 
-SHA1 (cyrus-sasl-2.1.10.tar.gz) = a8c0d27239801943d1e9ed43caf99791aba784fa
-Size (cyrus-sasl-2.1.10.tar.gz) = 1325286 bytes
+SHA1 (cyrus-sasl-2.1.12.tar.gz) = 6a1bdf999c2917dbe4a7bd74321f363b4cd216f3
+Size (cyrus-sasl-2.1.12.tar.gz) = 1343963 bytes
 SHA1 (patch-aa) = 6efdfcc69da11db097584a0a6295bda0131e302e
 SHA1 (patch-ac) = 828b3129769ee3224af31dd44fe8c9d6205c4bfa
 SHA1 (patch-ad) = 1811fd87ccee6de8a151e8e684344e6f3a7a8830
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
 SHA1 (patch-af) = 3af5330d1b3e242345ce9a7483ce6c73ed55d629
 SHA1 (patch-ah) = 50ff4e8ec0f4232bd8c2121b105d4818b978b950
-SHA1 (patch-ai) = dc4a9ed58b4970f23070aeb478ce857627612f94
-SHA1 (patch-aj) = d5f1ad8e889568591b9ddb10a7e731cde8d4a539
+SHA1 (patch-ai) = f152d5e43bf7fe4d2d6a10cec857827381e8b4da
+SHA1 (patch-aj) = e841641a92dacd0f38fc0f86391b54b394e5a54c
diff --git a/security/cyrus-sasl2/patches/patch-ai b/security/cyrus-sasl2/patches/patch-ai
index 372b355add9..3ad167994cc 100644
--- a/security/cyrus-sasl2/patches/patch-ai
+++ b/security/cyrus-sasl2/patches/patch-ai
@@ -1,8 +1,60 @@
-$NetBSD: patch-ai,v 1.1 2002/11/14 22:21:15 seb Exp $
+$NetBSD: patch-ai,v 1.2 2003/02/27 13:18:07 seb Exp $
 
---- configure.orig	Wed Nov 13 12:57:20 2002
+--- configure.orig	Mon Feb  3 18:50:30 2003
 +++ configure
-@@ -1949,6 +1949,13 @@ fi
+@@ -673,6 +673,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
+ echo "$ac_t""$host" 1>&6
+ 
+ 
++am__api_version="1.4"
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
+@@ -840,16 +841,16 @@ EOF
+ 
+ 
+ missing_dir=`cd $ac_aux_dir && pwd`
+-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+-echo "configure:845: checking for working aclocal" >&5
++echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
++echo "configure:846: checking for working aclocal-${am__api_version}" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+-   ACLOCAL=aclocal
++if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
++   ACLOCAL=aclocal-${am__api_version}
+    echo "$ac_t""found" 1>&6
+ else
+-   ACLOCAL="$missing_dir/missing aclocal"
++   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+    echo "$ac_t""missing" 1>&6
+ fi
+ 
+@@ -866,16 +867,16 @@ else
+    echo "$ac_t""missing" 1>&6
+ fi
+ 
+-echo $ac_n "checking for working automake""... $ac_c" 1>&6
+-echo "configure:871: checking for working automake" >&5
++echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
++echo "configure:872: checking for working automake-${am__api_version}" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (automake --version) < /dev/null > /dev/null 2>&1; then
+-   AUTOMAKE=automake
++if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
++   AUTOMAKE=automake-${am__api_version}
+    echo "$ac_t""found" 1>&6
+ else
+-   AUTOMAKE="$missing_dir/missing automake"
++   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+    echo "$ac_t""missing" 1>&6
+ fi
+ 
+@@ -1949,6 +1950,13 @@ fi
  
  target=$save_target
  
@@ -16,14 +68,14 @@ $NetBSD: patch-ai,v 1.1 2002/11/14 22:21:15 seb Exp $
  if test "$ac_cv_can_build_shared" = no; then
  	enable_shared=no
  	enable_static=yes
-@@ -6676,8 +6683,37 @@ LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/
+@@ -6822,8 +6830,37 @@ LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/
  
  
  
 +
 +ac_safe=`echo "/dev/urandom" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for /dev/urandom""... $ac_c" 1>&6
-+echo "configure:6690: checking for /dev/urandom" >&5
++echo "configure:6837: checking for /dev/urandom" >&5
 +if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
@@ -50,8 +102,8 @@ $NetBSD: patch-ai,v 1.1 2002/11/14 22:21:15 seb Exp $
 +
 +
  echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:6681: checking for working const" >&5
-+echo "configure:6717: checking for working const" >&5
+-echo "configure:6827: checking for working const" >&5
++echo "configure:6864: checking for working const" >&5
  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
diff --git a/security/cyrus-sasl2/patches/patch-aj b/security/cyrus-sasl2/patches/patch-aj
index 68fee71549c..7aa1f2292d1 100644
--- a/security/cyrus-sasl2/patches/patch-aj
+++ b/security/cyrus-sasl2/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.2 2002/12/11 23:48:59 chris Exp $
+$NetBSD: patch-aj,v 1.3 2003/02/27 13:18:07 seb Exp $
 
---- lib/Makefile.in.orig	Wed Dec 11 23:31:59 2002
-+++ lib/Makefile.in	Wed Dec 11 23:32:12 2002
+--- lib/Makefile.in.orig	Mon Feb  3 18:50:31 2003
++++ lib/Makefile.in
 @@ -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,15 +11,15 @@ $NetBSD: patch-aj,v 1.2 2002/12/11 23:48:59 chris 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 @@
- JAVAH = @JAVAH@
- JAVAROOT = @JAVAROOT@
+@@ -137,6 +137,7 @@ JAVAROOT = @JAVAROOT@
  JAVA_INCLUDES = @JAVA_INCLUDES@
+ KRB_INC_FLAGS = @KRB_INC_FLAGS@
+ KRB_LIB_FLAGS = @KRB_LIB_FLAGS@
 +LIBOBJS = @LIBOBJS@
- LIBTOOL = @LIBTOOL@
- LIB_CRYPT = @LIB_CRYPT@
- LIB_DES = @LIB_DES@
-@@ -133,6 +134,7 @@
+ LIBSSL_INC_DIR = @LIBSSL_INC_DIR@
+ LIBSSL_INC_FLAGS = @LIBSSL_INC_FLAGS@
+ LIBSSL_LIB_DIR = @LIBSSL_LIB_DIR@
+@@ -152,6 +153,7 @@ LIB_SOCKET = @LIB_SOCKET@
  LN_S = @LN_S@
  LTGETADDRINFOOBJS = @LTGETADDRINFOOBJS@
  LTGETNAMEINFOOBJS = @LTGETNAMEINFOOBJS@
@@ -27,7 +27,7 @@ $NetBSD: patch-aj,v 1.2 2002/12/11 23:48:59 chris Exp $
  LTSNPRINTFOBJS = @LTSNPRINTFOBJS@
  MAKEINFO = @MAKEINFO@
  NM = @NM@
-@@ -177,10 +179,7 @@
+@@ -197,10 +199,7 @@ noinst_LIBRARIES = @SASL_STATIC_LIBS@
  libsasl2_a_SOURCES = 
  
  common_headers = saslint.h
@@ -39,7 +39,7 @@ $NetBSD: patch-aj,v 1.2 2002/12/11 23:48:59 chris Exp $
  
  lib_LTLIBRARIES = libsasl2.la
  
-@@ -207,7 +206,7 @@
+@@ -227,7 +226,7 @@ LTLIBRARIES =  $(lib_LTLIBRARIES)
  
  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.2 2002/12/11 23:48:59 chris 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 @@
+@@ -239,7 +238,7 @@ getsubopt.c snprintf.c
  
  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
@@ -57,7 +57,7 @@ $NetBSD: patch-aj,v 1.2 2002/12/11 23:48:59 chris Exp $
  GZIP_ENV = --best
  SOURCES = $(libsasl2_a_SOURCES) $(libsasl2_la_SOURCES)
  OBJECTS = $(libsasl2_a_OBJECTS) $(libsasl2_la_OBJECTS)
-@@ -436,13 +435,9 @@
+@@ -456,13 +455,9 @@ distclean-generic clean-generic maintain
  mostlyclean distclean maintainer-clean