Update cyrus-sasl2 to 2.1.15nb2. Changes from version 2.1.15nb1 are

splitting out the saslauthd daemon into a separate package,
security/cyrus-saslauthd.  This allows the saslauthd daemon to
support additional database backends for plaintext authentication
without adding unrelated dependencies to the cyrus-sasl2 package.

9 files changed, 40 insertions, 84 deletions

diff --git a/security/cyrus-sasl2/DEINSTALL b/security/cyrus-sasl2/DEINSTALL
index 1e5bf3b8fd9..965f46f65e4 100644
--- a/security/cyrus-sasl2/DEINSTALL
+++ b/security/cyrus-sasl2/DEINSTALL
@@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.2 2002/11/14 22:21:13 seb Exp $
+# $NetBSD: DEINSTALL,v 1.3 2004/01/09 19:37:48 jlam Exp $
 
 SASLDB=@PKG_SYSCONFDIR@/sasldb.db
-SASLSOCKETDIR=@SASLSOCKETDIR@
 
 case ${STAGE} in
 POST-DEINSTALL)
-	${RM} -rf ${SASLSOCKETDIR}
 	if [ -e ${SASLDB} ]
 	then
 		${CAT} << EOF
diff --git a/security/cyrus-sasl2/MESSAGE b/security/cyrus-sasl2/MESSAGE
new file mode 100644
index 00000000000..8030a84cfa2
--- /dev/null
+++ b/security/cyrus-sasl2/MESSAGE
@@ -0,0 +1,16 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/01/09 19:37:48 jlam Exp $
+
+${PKGNAME} will use the following directory as the default
+path to its plugin modules:
+
+	${_PLUGINDIR}
+
+The search path for plugin modules can be customized by setting the
+SASL_PATH variable to a colon-delimted list of directories in the shell
+environment.
+
+To allow plaintext authentication without using the sasldb mechanism, the
+security/cyrus-saslauthd package should be installed.
+
+===========================================================================
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 6ab58502fe5..be33b166960 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/01/08 22:13:14 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/09 19:37:48 jlam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	1
+PKGREVISION=	2
 SVR4_PKGNAME=	csasl
 COMMENT=	Simple Authentication and Security Layer
 
@@ -19,25 +19,19 @@ CONFIGURE_ARGS+=	--with-rc4
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 .include "../../security/openssl/buildlink3.mk"
 
-BUILD_DEFS+=		USE_PAM SASL_USE_GSSAPI
+BUILD_DEFS+=		SASL_USE_GSSAPI
 
 .if exists(/dev/urandom)
 CONFIGURE_ARGS+=	--with-devrandom=/dev/urandom
 .endif
 
-# saslauthd needs to find libraries for different authentication mechanisms.
-.if defined(USE_PAM)
-.  include "../../security/PAM/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
-.endif
-
 .if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])
 CONFIGURE_ARGS+=	--enable-gssapi=/usr	# GSSAPI
 PLIST_SRC+=		${PKGDIR}/PLIST.krb5
 .  if exists(/usr/include/krb5/krb5.h)
 CPPFLAGS+=		-I/usr/include/krb5
 .  endif
-LIBS+=-lcrypto
+LIBS+=			-lcrypto
 .endif
 
 PLIST_SRC+=		${PKGDIR}/PLIST.plugins
@@ -50,6 +44,8 @@ PKG_USERS=		${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
 RCD_SCRIPTS=		saslauthd
 OWN_DIRS=		${PLUGINDIR}
 
+MESSAGE_SUBST+=		_PLUGINDIR=${_PLUGINDIR}
+
 post-install:
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index 47ece94cfcd..fe03c9d2bab 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2004/01/08 22:13:14 jlam Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/01/09 19:37:48 jlam Exp $
 #
 # This Makefile fragment should be included _below_ any SASL_PLUGIN
 # definition and _above_ any CONFIGURE_ARGS definitions.
@@ -47,8 +47,6 @@ _PLUGINDIR=		${VIEWBASE}/lib/sasl2
 HTMLDIR=		${PREFIX}/share/doc/html/cyrus-sasl
 # /var/run/saslauthd matches the default value in configure.
 SASLSOCKETDIR=		/var/run/saslauthd
-FILES_SUBST+=		SASLSOCKETDIR=${SASLSOCKETDIR}
-PLIST_SUBST+=		SASLSOCKETDIR=${SASLSOCKETDIR}
 
 BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
 
diff --git a/security/cyrus-sasl2/PLIST.common b/security/cyrus-sasl2/PLIST.common
index 43e7a2d9750..23a4fff4bce 100644
--- a/security/cyrus-sasl2/PLIST.common
+++ b/security/cyrus-sasl2/PLIST.common
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.10 2003/11/21 13:41:58 jlam Exp $
-etc/rc.d/saslauthd
+@comment $NetBSD: PLIST.common,v 1.11 2004/01/09 19:37:48 jlam Exp $
 include/sasl/hmac-md5.h
 include/sasl/md5.h
 include/sasl/md5global.h
@@ -12,7 +11,6 @@ lib/libsasl2.la
 lib/libsasl2.so
 lib/libsasl2.so.2
 lib/libsasl2.so.2.15
-man/cat8/saslauthd.0
 man/man3/sasl.3
 man/man3/sasl_authorize_t.3
 man/man3/sasl_auxprop.3
@@ -57,7 +55,6 @@ man/man3/sasl_user_exists.3
 man/man3/sasl_verifyfile_t.3
 man/man8/sasldblistusers2.8
 man/man8/saslpasswd2.8
-sbin/saslauthd
 sbin/sasldblistusers2
 sbin/saslpasswd2
 share/doc/html/cyrus-sasl/advanced.html
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index 3efb7f7c75a..8c9e229b6ae 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/01/05 12:10:29 markd Exp $
+$NetBSD: distinfo,v 1.12 2004/01/09 19:37:48 jlam Exp $
 
 SHA1 (cyrus-sasl-2.1.15.tar.gz) = 747101ffec482ca566f00a9d34124ec8e79f6589
 Size (cyrus-sasl-2.1.15.tar.gz) = 1390131 bytes
@@ -7,9 +7,8 @@ SHA1 (patch-ab) = 711dd3d73da611bb5679bc8415e96517bf239778
 SHA1 (patch-ad) = 808255d61cb9340fc500a12f74a91d9c8dceda4c
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
 SHA1 (patch-af) = eed25b6db859720bb35f4ef5623b85a3a95e359e
-SHA1 (patch-ag) = 24455c9641078b36a270b50f844cfb4a89ea7925
 SHA1 (patch-ah) = 50ff4e8ec0f4232bd8c2121b105d4818b978b950
 SHA1 (patch-ai) = 743dddbd54ac19266fd66ef0c5a3e87ba7437ee9
 SHA1 (patch-aj) = e841641a92dacd0f38fc0f86391b54b394e5a54c
-SHA1 (patch-ak) = 20c163758267d90d93f6d1ec0fce78fa4a12f670
+SHA1 (patch-al) = 286b1c6c9980525f5ad8e1507dc3fe9708e755ca
 SHA1 (patch-as) = c8d35da93afe8be5e535b88681b23b169e813c02
diff --git a/security/cyrus-sasl2/patches/patch-ag b/security/cyrus-sasl2/patches/patch-ag
deleted file mode 100644
index 56b7dd6dc76..00000000000
--- a/security/cyrus-sasl2/patches/patch-ag
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2003/11/21 13:41:58 jlam Exp $
-
---- saslauthd/Makefile.am.orig	Fri Mar 28 11:59:23 2003
-+++ saslauthd/Makefile.am	Fri Nov 21 05:32:39 2003
-@@ -24,17 +24,17 @@
- saslcache_DEPENDENCIES = @COMPAT_OBJ@
- saslcache_LDADD = @COMPAT_OBJ@
- 
--EXTRA_DIST	= saslauthd.8 saslauthd.mdoc config include \
-+EXTRA_DIST	= saslauthd.0 saslauthd.mdoc config include \
- 		  getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
- INCLUDES	= -I$(top_srcdir)/include -I../include
- DEFS            = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
- 
- 
--dist-hook: saslauthd.8
-+dist-hook: saslauthd.0
- 
--saslauthd.8: saslauthd.mdoc
--	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8
-+saslauthd.0: saslauthd.mdoc
-+	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.0
- 
--install-data-local: saslauthd.8
-+install-data-local: saslauthd.0
- 	$(mkinstalldirs) $(DESTDIR)$(mandir)/cat8
--	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8
-+	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.0
diff --git a/security/cyrus-sasl2/patches/patch-ak b/security/cyrus-sasl2/patches/patch-ak
deleted file mode 100644
index 848cb8b56de..00000000000
--- a/security/cyrus-sasl2/patches/patch-ak
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2003/11/21 13:41:58 jlam Exp $
-
---- saslauthd/Makefile.in.orig	Fri Nov 21 05:24:06 2003
-+++ saslauthd/Makefile.in	Fri Nov 21 05:33:09 2003
-@@ -126,7 +126,7 @@
- saslcache_DEPENDENCIES = @COMPAT_OBJ@
- saslcache_LDADD = @COMPAT_OBJ@
- 
--EXTRA_DIST = saslauthd.8 saslauthd.mdoc config include 		  getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
-+EXTRA_DIST = saslauthd.0 saslauthd.mdoc config include 		  getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
- 
- INCLUDES = -I$(top_srcdir)/include -I../include
- DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
-@@ -423,14 +423,14 @@
- maintainer-clean
- 
- 
--dist-hook: saslauthd.8
-+dist-hook: saslauthd.0
- 
--saslauthd.8: saslauthd.mdoc
--	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8
-+saslauthd.0: saslauthd.mdoc
-+	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.0
- 
--install-data-local: saslauthd.8
-+install-data-local: saslauthd.0
- 	$(mkinstalldirs) $(DESTDIR)$(mandir)/cat8
--	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8
-+	$(INSTALL_DATA) $(srcdir)/saslauthd.0 $(DESTDIR)$(mandir)/cat8/saslauthd.0
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/security/cyrus-sasl2/patches/patch-al b/security/cyrus-sasl2/patches/patch-al
new file mode 100644
index 00000000000..1988f112f10
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2004/01/09 19:37:48 jlam Exp $
+
+--- Makefile.in.orig	Tue Jul 15 11:42:28 2003
++++ Makefile.in
+@@ -199,7 +199,7 @@ plugindir = @plugindir@
+ @MACOSX_TRUE@INSTALLOSX = install-exec-local-osx
+ @MACOSX_FALSE@INSTALLOSX = 
+ 
+-SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
++SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV)
+ EXTRA_DIST = config cmulocal win32 mac dlcompat-20010505
+ 
+ framedir = /Library/Frameworks/SASL2.framework