Update mail/courier-imap to 1.4.2. Changes from version 1.4.0 include minor

bug fixes, plus the major change of moving the authentication modules into
a separate package (courier-auth).  The authentication modules are to be
shared with a forthcoming sqwebmail package.

18 files changed, 251 insertions, 406 deletions

diff --git a/mail/courier-imap/DEINSTALL b/mail/courier-imap/DEINSTALL
index 089cb1ad796..06bbbd55323 100644
--- a/mail/courier-imap/DEINSTALL
+++ b/mail/courier-imap/DEINSTALL
@@ -1,20 +1,7 @@
-# $NetBSD: DEINSTALL,v 1.2 2002/01/02 22:19:37 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.3 2002/01/22 22:08:48 jlam Exp $
 
 # Additional files that are may be created for courier-imap.
-ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/userdb"
-ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/userdb.dat"
-ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/userdbshadow.dat"
 ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/imapd.rand"
 ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/pop3d.rand"
 ALL_FILES="${ALL_FILES} /dev/null @SSLCERTS@/imapd.pem"
 ALL_FILES="${ALL_FILES} /dev/null @SSLCERTS@/pop3d.pem"
-
-case ${STAGE} in
-POST-DEINSTALL)
-	#
-	# Unconditionally remove authdaemon state directory as it contains
-	# files and sockets that authdaemond creates every time it is
-	# started.
-	#
-	${RM} -rf /var/authdaemon
-esac
diff --git a/mail/courier-imap/INSTALL b/mail/courier-imap/INSTALL
deleted file mode 100644
index 4dffffc32eb..00000000000
--- a/mail/courier-imap/INSTALL
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2002/01/02 22:19:37 jlam Exp $
-
-EGDIR=${PKG_PREFIX}/share/examples/courier
-GEN_FILES="${GEN_FILES}"
-
-case ${STAGE} in
-POST-INSTALL)
-	eval set -- ${GEN_FILES}
-	for file
-	do
-		# Merge new config files with the old ones.
-		${CP} ${EGDIR}/${file}.dist @PKG_SYSCONFDIR@/${file}.dist
-		${PKG_PREFIX}/sbin/sysconftool @PKG_SYSCONFDIR@/${file}
-		${CHMOD} 0600 ${file}
-		${RM} -f @PKG_SYSCONFDIR@/${file}.dist
-	done
-	;;
-esac
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 9c36904a10e..57b1e02d609 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,24 +1,31 @@
-# $NetBSD: Makefile,v 1.8 2002/01/02 22:24:43 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/01/22 22:08:50 jlam Exp $
 
-PKGNAME=	courier-imap-${BASE_VERS}
-PKGREVISION?=	# empty
+DISTNAME=	courier-imap-1.4.2
 COMMENT=	IMAP server for access to Maildir-style mailboxes
+HOMEPAGE=	http://www.inter7.com/courierimap/
 
-DEPENDS+=	courier-maildirmake>=0.3:../../mail/courier-maildirmake
+DEPENDS+=	courier-auth>=0.37.1:../../mail/courier-auth
+DEPENDS+=	courier-maildirmake>=0.37.1:../../mail/courier-maildirmake
 
 USE_BUILDLINK_ONLY=	yes
 USE_PERL5=		yes
 REPLACE_PERL=		sysconftool
 
-INSTALL_TARGET=		install-strip
+.include "../../mail/courier-auth/Makefile.common"
 
-.include "../../mail/courier-imap/Makefile.common"
+CONFIGURE_ENV+=		OPENSSL=${BUILDLINK_PREFIX.openssl}/bin/openssl
 
-GEN_FILES=	authdaemonrc imapd imapd-ssl pop3d pop3d-ssl
-SSLCNF_FILES=	imapd.cnf pop3d.cnf
-CONF_FILES=	${EGDIR}/quotawarnmsg.example ${PKG_SYSCONFDIR}/quotawarnmsg
-RCD_SCRIPTS=	courierimap courierimaps courierpop courierpops
-OWN_DIRS_PERMS=	/var/authdaemon ${ROOT_USER} ${ROOT_GROUP} 700
+.if !defined(STRIPFLAG) || empty(STRIPFLAG:M-s)
+INSTALL_TARGET=         install-strip
+.else
+INSTALL_TARGET=         install
+.endif
+
+SYSCONFTOOL=		${PREFIX}/sbin/imapd.sysconftool
+GEN_FILES=		imapd imapd-ssl pop3d pop3d-ssl
+SSLCNF_FILES=		imapd.cnf pop3d.cnf
+CONF_FILES=		${EGDIR}/quotawarnmsg.example ${PKG_SYSCONFDIR}/quotawarnmsg
+RCD_SCRIPTS=		courierimap courierimaps courierpop courierpops
 
 CONF_FILES_PERMS=	# empty
 .for FILE in ${GEN_FILES}
@@ -31,7 +38,8 @@ CONF_FILES_PERMS+=	${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}	\
 .endfor
 
 DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+INSTALL_EXTRA_TMPL=	${.CURDIR}/../../mail/courier-auth/INSTALL
+FILES_SUBST+=		SYSCONFTOOL=${SYSCONFTOOL:Q}
 FILES_SUBST+=		SSLCERTS=${SSLCERTS}
 FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
 
@@ -62,19 +70,11 @@ post-install:
 			${PREFIX}/etc/rc.d/$${file};			\
 	done
 	${INSTALL_DATA_DIR} ${EGDIR} ${DOCDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
 	${INSTALL_DATA} ${WRKSRC}/imap/BUGS				\
 		${DOCDIR}/BUGS.imap
 	${INSTALL_DATA} ${WRKSRC}/imap/README				\
 		${DOCDIR}/README.imap
-	${INSTALL_DATA} ${WRKSRC}/maildir/README.maildirquota.txt	\
-		${DOCDIR}/README.maildirquota
-	${INSTALL_DATA} ${WRKSRC}/maildir/README.sharedfolders.txt	\
-		${DOCDIR}/README.sharedfolders
-	for file in authdaemonrc.dist; do				\
-		${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file} ${EGDIR};	\
-		${RM} -f ${PKG_SYSCONFDIR}/$${file};			\
-	done
 	cd ${WRKSRC}; ${INSTALL_DATA} imap/imapd.pam imap/pop3d.pam ${EGDIR}
 
 .include "../../security/openssl/buildlink.mk"
diff --git a/mail/courier-imap/Makefile.common b/mail/courier-imap/Makefile.common
deleted file mode 100644
index 35cd5c139f1..00000000000
--- a/mail/courier-imap/Makefile.common
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2002/01/02 22:24:43 jlam Exp $
-
-DISTNAME=	courier-imap-${DIST_VERS}
-CATEGORIES+=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
-
-MAINTAINER=	jlam@netbsd.org
-HOMEPAGE=	http://www.inter7.com/courierimap/
-
-# Version numbering scheme:
-#
-# DIST_VERS	version number on the distfile
-# BASE_BERS	pkgsrc-manged version number
-#
-DIST_VERS=	1.4.0
-BASE_VERS=	${DIST_VERS}
-
-USE_GMAKE=		yes
-
-PKG_SYSCONFSUBDIR?=	courier
-
-DISTINFO_FILE=		${.CURDIR}/../../mail/courier-imap/distinfo
-PATCHDIR=		${.CURDIR}/../../mail/courier-imap/patches
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/courier
-CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec/courier
-CONFIGURE_ARGS+=	--localstatedir=/var
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-
-CONFIGURE_ARGS+=	--enable-unicode
-CONFIGURE_ARGS+=	--with-authchangepwdir=${PREFIX}/libexec/courier
-CONFIGURE_ARGS+=	--with-db=db
-CONFIGURE_ARGS+=	--with-userdb=${PKG_SYSCONFDIR}/userdb
-CONFIGURE_ARGS+=	--disable-root-check
-
-CONFIGURE_ARGS+=	--with-authdaemon
-CONFIGURE_ARGS+=	--without-authcustom
-CONFIGURE_ARGS+=	--without-authldap
-CONFIGURE_ARGS+=	--without-authmysql
-CONFIGURE_ARGS+=	--without-authpgsql
-
-CONFIGURE_ENV+=		OPENSSL=${BUILDLINK_PREFIX.openssl}/bin/openssl
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-.include "../../databases/db/buildlink.mk"
-CPPFLAGS+=	-I${BUILDLINK_DIR}/include/db2
-.endif
-
-.if defined(USE_PAM)
-.include "../../security/PAM/buildlink.mk"
-.endif
-
-AUTHLIBDIR=	${PREFIX}/libexec/courier/authlib
-DOCDIR=		${PREFIX}/share/doc/courier
-EGDIR=		${PREFIX}/share/examples/courier
diff --git a/mail/courier-imap/PLIST b/mail/courier-imap/PLIST
index 73cf7af3aad..c406562ac78 100644
--- a/mail/courier-imap/PLIST
+++ b/mail/courier-imap/PLIST
@@ -1,66 +1,30 @@
-@comment $NetBSD: PLIST,v 1.3 2002/01/02 22:51:19 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/01/22 22:08:51 jlam Exp $
 bin/couriertls
 bin/imapd
-bin/imapd.maildirmake
 bin/pop3d
 etc/rc.d/courierimap
 etc/rc.d/courierimaps
 etc/rc.d/courierpop
 etc/rc.d/courierpops
-libexec/courier/authlib/authdaemon
-libexec/courier/authlib/authdaemond
-libexec/courier/authlib/authdaemond.plain
 libexec/courier/couriertcpd
-libexec/courier/deliverquota
 libexec/courier/imapd-ssl.rc
 libexec/courier/imapd.rc
 libexec/courier/logger
-libexec/courier/makedatprog
 libexec/courier/pop3d-ssl.rc
 libexec/courier/pop3d.rc
-man/man1/imapd.maildirmake.1
-man/man7/authcram.7
-man/man7/authdaemon.7
-man/man7/authdaemond.7
-man/man7/authldap.7
-man/man7/authlib.7
-man/man7/authmysql.7
-man/man7/authpam.7
-man/man7/authpwd.7
-man/man7/authshadow.7
-man/man7/authuserdb.7
-man/man7/authvchkpw.7
+man/man1/couriertcpd.1
 man/man8/courier-imapd.8
-man/man8/couriertcpd.8
-man/man8/deliverquota.8
-man/man8/makeuserdb.8
 man/man8/mkimapdcert.8
 man/man8/mkpop3dcert.8
-man/man8/pw2userdb.8
-man/man8/userdb.8
-man/man8/userdbpw.8
-man/man8/vchkpw2userdb.8
+sbin/imapd.sysconftool
 sbin/imaplogin
-sbin/makeuserdb
 sbin/mkimapdcert
 sbin/mkpop3dcert
 sbin/pop3login
-sbin/pw2userdb
-sbin/sysconftool
-sbin/userdb
-sbin/userdbpw
-sbin/vchkpw2userdb
-share/courier/makeuserdb
 share/courier/mkimapdcert
 share/courier/mkpop3dcert
-share/courier/pw2userdb
-share/courier/userdb
-share/courier/vchkpw2userdb
 share/doc/courier/BUGS.imap
 share/doc/courier/README.imap
-share/doc/courier/README.maildirquota
-share/doc/courier/README.sharedfolders
-share/examples/courier/authdaemonrc.dist
 share/examples/courier/imapd-ssl.dist
 share/examples/courier/imapd.cnf
 share/examples/courier/imapd.dist
@@ -73,5 +37,4 @@ share/examples/courier/quotawarnmsg.example
 @unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} -p %D/share/doc/courier 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} -p %D/share/courier 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/libexec/courier/authlib 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} -p %D/libexec/courier 2>/dev/null || ${TRUE}
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index 2194220d9ca..40ae355c1da 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.6 2002/01/02 22:51:19 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/01/22 22:08:51 jlam Exp $
 
-SHA1 (courier-imap-1.4.0.tar.gz) = 3a1d5eec1db132b03bb295738aa615eaed4f0b84
-Size (courier-imap-1.4.0.tar.gz) = 1168483 bytes
-SHA1 (patch-aa) = 3ee927c83424d037e9997f3ef97ba51789a21d2b
-SHA1 (patch-ab) = e9da6801d310f792a205ccf7e4b6bce958b9a8ee
-SHA1 (patch-ac) = c5c3d03a06fa6c3818dad633fa89464a60a4f4f9
-SHA1 (patch-ad) = 3941221a4dd780a2b73c95028cb59774e4755089
-SHA1 (patch-ae) = f735159979ed63fdf19e0940ba7e8b39ac5134bf
-SHA1 (patch-af) = f85ae9f2f56c1885180ae86b156ff508aa2491c4
-SHA1 (patch-ag) = 9611ac1fddef554ce12f7e3a64213dc129702e68
+SHA1 (courier-imap-1.4.2.tar.gz) = 7c869f6b7d9b43bbf3435cddfadcbae777acdccc
+Size (courier-imap-1.4.2.tar.gz) = 1189909 bytes
+SHA1 (patch-aa) = db1fc4cc633793fe077f2720db00f2cb3093fb08
+SHA1 (patch-ab) = 9f6afb8f2e046c5d7d5d94e659d8dc9b544816a3
+SHA1 (patch-ac) = f85ae9f2f56c1885180ae86b156ff508aa2491c4
+SHA1 (patch-ad) = d4c91ca56a85896f4f7fef72003f4f8c3be1b315
+SHA1 (patch-ae) = e1bef05319322d67507ce11ece350e86743ea0a2
+SHA1 (patch-af) = f71566831301ed9add898abd18807d6b33a6d697
+SHA1 (patch-ag) = bf74ac57cf67b0c6b76b120f23109a35ab4f0475
+SHA1 (patch-ah) = a85ad2baa7600611b5d1d94e17d074728135198a
diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
index 146f0731687..4b5670edc9b 100755
--- a/mail/courier-imap/files/courierimap.sh
+++ b/mail/courier-imap/files/courierimap.sh
@@ -1,11 +1,11 @@
 #! /bin/sh
 #
-# $NetBSD: courierimap.sh,v 1.3 2002/01/02 22:19:39 jlam Exp $
+# $NetBSD: courierimap.sh,v 1.4 2002/01/22 22:08:52 jlam Exp $
 #
 # Courier IMAP services daemon
 #
 # PROVIDE: courierimap
-# REQUIRE: DAEMON
+# REQUIRE: authdaemond
 
 if [ -e /etc/rc.subr ]
 then
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
index 16ae7fc63d4..2645cc22bcd 100755
--- a/mail/courier-imap/files/courierimaps.sh
+++ b/mail/courier-imap/files/courierimaps.sh
@@ -1,11 +1,11 @@
 #! /bin/sh
 #
-# $NetBSD: courierimaps.sh,v 1.3 2002/01/02 22:19:39 jlam Exp $
+# $NetBSD: courierimaps.sh,v 1.4 2002/01/22 22:08:52 jlam Exp $
 #
 # Courier IMAP/SSL services daemon
 #
 # PROVIDE: courierimaps
-# REQUIRE: DAEMON
+# REQUIRE: authdaemond
 
 if [ -e /etc/rc.subr ]
 then
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
index c1008a2676d..fa12e202f1e 100755
--- a/mail/courier-imap/files/courierpop.sh
+++ b/mail/courier-imap/files/courierpop.sh
@@ -1,11 +1,11 @@
 #! /bin/sh
 #
-# $NetBSD: courierpop.sh,v 1.3 2002/01/02 22:19:39 jlam Exp $
+# $NetBSD: courierpop.sh,v 1.4 2002/01/22 22:08:53 jlam Exp $
 #
 # Courier POP services daemon
 #
 # PROVIDE: courierpop
-# REQUIRE: DAEMON
+# REQUIRE: authdaemond
 
 if [ -e /etc/rc.subr ]
 then
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
index b59a6b23b9a..9477bef2fff 100755
--- a/mail/courier-imap/files/courierpops.sh
+++ b/mail/courier-imap/files/courierpops.sh
@@ -1,11 +1,11 @@
 #! /bin/sh
 #
-# $NetBSD: courierpops.sh,v 1.3 2002/01/02 22:19:39 jlam Exp $
+# $NetBSD: courierpops.sh,v 1.4 2002/01/22 22:08:53 jlam Exp $
 #
 # Courier POP3/SSL services daemon
 #
 # PROVIDE: courierpops
-# REQUIRE: DAEMON
+# REQUIRE: authdaemond
 
 if [ -e /etc/rc.subr ]
 then
diff --git a/mail/courier-imap/patches/patch-aa b/mail/courier-imap/patches/patch-aa
index 1f12a5fd84e..0887afb16bf 100644
--- a/mail/courier-imap/patches/patch-aa
+++ b/mail/courier-imap/patches/patch-aa
@@ -1,40 +1,56 @@
-$NetBSD: patch-aa,v 1.5 2002/01/02 22:51:20 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2002/01/22 22:08:53 jlam Exp $
 
---- Makefile.in.orig	Wed Dec  5 08:26:31 2001
+--- Makefile.in.orig	Fri Jan 18 22:19:33 2002
 +++ Makefile.in
 @@ -30,3 +30,3 @@
  datadir = @datadir@
 -sysconfdir = @sysconfdir@
 +sysconfdir = ${prefix}/share/examples/courier
  sharedstatedir = @sharedstatedir@
-@@ -95,5 +95,5 @@
+@@ -93,7 +93,7 @@
+ databindir = $(datadir)
+-databin_SCRIPTS = mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb
++databin_SCRIPTS = mkimapdcert mkpop3dcert
  
 -bin_PROGRAMS = imapd pop3d maildirmake
-+bin_PROGRAMS = imapd pop3d imapd.maildirmake
- sbin_PROGRAMS = imaplogin pop3login userdbpw
--man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.8 deliverquota.8 maildirmake.1 imapd.8 mkimapdcert.8 mkpop3dcert.8
-+man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.8 deliverquota.8 imapd.maildirmake.1 courier-imapd.8 mkimapdcert.8 mkpop3dcert.8
+-sbin_PROGRAMS = imaplogin pop3login userdbpw
+-man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.1 deliverquota.8 maildirmake.1 imapd.8 mkimapdcert.8 mkpop3dcert.8
++bin_PROGRAMS = imapd pop3d
++sbin_PROGRAMS = imaplogin pop3login
++man_MANS = couriertcpd.1 courier-imapd.8 mkimapdcert.8 mkpop3dcert.8
  
-@@ -758,4 +758,4 @@
+@@ -112,3 +112,3 @@
+ libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
+-libexec_PROGRAMS = makedatprog couriertcpd deliverquota logger
++libexec_PROGRAMS = couriertcpd logger
  
--maildirmake: maildir/maildirmake
--	cp maildir/maildirmake .
-+imapd.maildirmake: maildir/maildirmake
-+	cp maildir/maildirmake ./imapd.maildirmake
- 
-@@ -789,7 +789,7 @@
- 
--maildirmake.1: maildir/maildirmake.1
--	cp maildir/maildirmake.1 .
-+imapd.maildirmake.1: maildir/maildirmake.1
-+	cp maildir/maildirmake.1 ./imapd.maildirmake.1
+@@ -791,4 +791,4 @@
  
 -imapd.8: imap/imapd.8
 -	cp imap/imapd.8 .
 +courier-imapd.8: imap/imapd.8
-+	cp imap/imapd.8 ./courier-imapd.8
++	cp imap/imapd.8 $@
  
-@@ -843,11 +843,2 @@
+@@ -818,13 +818,2 @@
+ install-exec-local:
+-	$(mkinstalldirs) $(DESTDIR)$(libexecdir)/authlib
+-	for f in `cat authlib/installlist` dummy ; do \
+-		test "$$f" = "dummy" && continue ; \
+-		$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) authlib/$$f \
+-			$(DESTDIR)$(libexecdir)/authlib/$$f ; done
+-	for f in `cat authlib/installlist.sh` dummy ; do \
+-		test "$$f" = "dummy" && continue ; \
+-		$(INSTALL_SCRIPT) authlib/$$f \
+-			$(DESTDIR)$(libexecdir)/authlib/$$f ; done
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+-	$(INSTALL_SCRIPT) userdb/userdb.pl $(DESTDIR)$(datadir)/userdb
+ 	test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
+@@ -832,3 +821,3 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+-	for f in mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb userdb ; \
++	for f in mkimapdcert mkpop3dcert ; \
+ 		do rm -f $(DESTDIR)$(sbindir)/$$f ; \
+@@ -842,30 +831,6 @@
  install-data-local: install-man
 -	for f in `cat authlib/modulelist ; . authlib/authdaemonrc ; echo $$authmodulelist ` ; do \
 -		test "$$f" = "authpam" || continue ; \
@@ -45,4 +61,24 @@ $NetBSD: patch-aa,v 1.5 2002/01/02 22:51:20 jlam Exp $
 -		$(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
 -			$(DESTDIR)/etc/pam.d/pop3 || exit 1 ;\
 -	done
- 	rm -f $(DESTDIR)$(man8dir)/pw2userdb.8
+-	rm -f $(DESTDIR)$(man8dir)/pw2userdb.8
+-	rm -f $(DESTDIR)$(man8dir)/vchkpw2userdb.8
+-	$(LN_S) makeuserdb.8 $(DESTDIR)$(man8dir)/pw2userdb.8
+-	$(LN_S) makeuserdb.8 $(DESTDIR)$(man8dir)/vchkpw2userdb.8
+-	. authlib/authdaemonrc ; test "$$authdaemonvar" = "" && exit 0; \
+-		$(mkinstalldirs) $(DESTDIR)$$authdaemonvar ; \
+-		chmod 700 $(DESTDIR)$$authdaemonvar
+-	for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done
+-	@cat authlib/authdaemon.msg
+-	@echo "Do not forget to run make install-configure"
+ 
+ uninstall-local:
+-	rm -f $(DESTDIR)$(man8dir)/pw2userdb.8
+-	rm -f $(DESTDIR)$(man8dir)/vchkpw2userdb.8
+-	rm -f $(DESTDIR)$(datadir)/userdb
+-	for f in userdb mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb ; \
++	for f in mkimapdcert mkpop3dcert ; \
+ 		do rm -f $(DESTDIR)$(sbindir)/$$f ; done
+-	for f in `cat authlib/installlist authlib/installlist.sh` ; do \
+-			rm -f $(DESTDIR)$(libexecdir)/authlib/$$f ; done
+ 	rm -f $(DESTDIR)$(bindir)/couriertls
diff --git a/mail/courier-imap/patches/patch-ab b/mail/courier-imap/patches/patch-ab
index 9089d67c2d7..9a32829e6cc 100644
--- a/mail/courier-imap/patches/patch-ab
+++ b/mail/courier-imap/patches/patch-ab
@@ -1,12 +1,30 @@
-$NetBSD: patch-ab,v 1.2 2002/01/02 22:19:40 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2002/01/22 22:08:54 jlam Exp $
 
---- authlib/Makefile.in.orig	Wed Dec  5 08:26:53 2001
+--- authlib/Makefile.in.orig	Fri Jan 18 22:19:41 2002
 +++ authlib/Makefile.in
-@@ -2067,7 +2067,6 @@
- 		for f in $(man_LINKS) "" ; do \
- 			test "$$f" = "" && continue ; \
- 			rm -f $$f; $(LN_S) authlib.7 $$f ; \
+@@ -2057,23 +2057,9 @@
+ 
+ # automake still a bit stupid...
+ 
+-install-data-local: install-authldaprc install-authdaemonrc install-authmysqlrc install-authpgsqlrc
+-	test "$(man_LINKS)" = "" && exit 0; \
+-	$(mkinstalldirs) $(DESTDIR)$(man7dir) ; \
+-	for f in $(man_MANS) "" ; do \
+-		test "$$f" = "" && continue ; \
+-		$(INSTALL_DATA) $$f $(DESTDIR)$(man7dir) ; done ; \
+-	cd $(DESTDIR)$(man7dir) || exit 1 ; \
+-		for f in $(man_LINKS) "" ; do \
+-			test "$$f" = "" && continue ; \
+-			rm -f $$f; $(LN_S) authlib.7 $$f ; \
 -			test -w /etc && chown bin $$f && chgrp bin $$f ; \
- 			done ; exit 0
+-			done ; exit 0
++install-data-local:
+ 
+-uninstall-local: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
+-	cd $(DESTDIR)$(man7dir) 2>/dev/null || exit 0 ; \
+-		test "$(man_LINKS)" = "" && exit 0; \
+-		rm -f $(man_LINKS) $(man_MANS)
++uninstall-local:
  
- uninstall-local: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
+ authlib.html: authlib.html.in
+ 	CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/mail/courier-imap/patches/patch-ac b/mail/courier-imap/patches/patch-ac
index e02ba0cfdba..1132cb9fb7c 100644
--- a/mail/courier-imap/patches/patch-ac
+++ b/mail/courier-imap/patches/patch-ac
@@ -1,166 +1,12 @@
-$NetBSD: patch-ac,v 1.3 2002/01/02 22:19:40 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2002/01/22 22:08:54 jlam Exp $
 
---- authlib/authldaplib.c.orig	Wed Nov 28 22:52:51 2001
-+++ authlib/authldaplib.c
-@@ -26,6 +26,17 @@
-  */
- 
- /*
-+ * Modified 28/11/2001 Iustin Pop <iusty@intensit.de>
-+ * There was a bug regarding the LDAP_TLS option: if both LDAP_TLS
-+ * and was LDAP_AUTHBIND were enabled, the ldap_start_tls function
-+ * was called only for the first connection, resulting in the fact
-+ * that the bind for checking the password was done without TLS,
-+ * sending the password in clear text over the network. Detected 
-+ * when using OpenLDAP with "security ssf=128" (which disalows any 
-+ * clear-text communication).
-+*/
-+
-+/*
-    Modified 01/21/2000 James Golovich <james@wwnet.net>
- 
- 1. If LDAP_AUTHBIND is set in the config file, then the ldap server will
-@@ -467,6 +478,53 @@
- 	return (rc);
- }
- 
-+/* This function takes a ldap connection and 
-+ * tries to enable TLS on it.
-+*/
-+static int enable_tls_on(LDAP *conn) {
-+#if HAVE_LDAP_TLS
-+	int version;
-+	int ldrc;
-+
-+	if (ldaperror(ldrc=ldap_get_option (conn,
-+				    LDAP_OPT_PROTOCOL_VERSION,
-+				    &version))
-+	    != LDAP_SUCCESS)
-+	{
-+		const char *s=ldap_err2string(ldrc);
-+
-+#if	HAVE_SYSLOG_H
-+		syslog(LOG_DAEMON|LOG_CRIT,
-+		       "ldap_get_option failed: %s", s);
-+#endif
-+		return (-1);
-+	}
-+
-+	if (version < LDAP_VERSION3)
-+	{
-+		version = LDAP_VERSION3;
-+		(void)ldap_set_option (conn,
-+				       LDAP_OPT_PROTOCOL_VERSION,
-+				       &version);
-+	}
-+
-+	if (ldaperror(ldrc=ldap_start_tls_s(conn, NULL, NULL))
-+	    != LDAP_SUCCESS)
-+	{
-+		const char *s=ldap_err2string(ldrc);
-+
-+#if	HAVE_SYSLOG_H
-+		syslog(LOG_DAEMON|LOG_CRIT,
-+		       "ldap_start_tls_s failed: %s", s);
-+#endif
-+		return (-1);
-+	}
-+	return 0;
-+#else
-+	return (-1);
-+#endif
-+}
-+
- static LDAP *ldapconnect()
- {
- LDAP	*p;
-@@ -518,47 +576,11 @@
- 	}
- 
- #if HAVE_LDAP_TLS
--	if (my_ldap.tls)
-+	if (my_ldap.tls && enable_tls_on(my_ldap_fp))
- 	{
--		int version;
--
--		if (ldaperror(ldrc=ldap_get_option (my_ldap_fp,
--						    LDAP_OPT_PROTOCOL_VERSION,
--						    &version))
--		    != LDAP_SUCCESS)
--		{
--			const char *s=ldap_err2string(ldrc);
--
--#if	HAVE_SYSLOG_H
--			syslog(LOG_DAEMON|LOG_CRIT,
--			       "ldap_get_option failed: %s", s);
--#endif
--			authldapclose();
--			ldapconnfailure();
--			return (-1);
--		}
--
--		if (version < LDAP_VERSION3)
--		{
--			version = LDAP_VERSION3;
--			(void)ldap_set_option (my_ldap_fp,
--					       LDAP_OPT_PROTOCOL_VERSION,
--					       &version);
--		}
--
--		if (ldaperror(ldrc=ldap_start_tls_s(my_ldap_fp, NULL, NULL))
--		    != LDAP_SUCCESS)
--		{
--			const char *s=ldap_err2string(ldrc);
--
--#if	HAVE_SYSLOG_H
--			syslog(LOG_DAEMON|LOG_CRIT,
--			       "ldap_start_tls_s failed: %s", s);
--#endif
--			authldapclose();
--			ldapconnfailure();
--			return (-1);
--		}
-+		authldapclose();
-+		ldapconnfailure();
-+		return (-1);
- 	}
+--- authlib/cryptpassword.c.orig	Wed Jun 20 21:44:04 2001
++++ authlib/cryptpassword.c
+@@ -6,6 +6,7 @@
+ #if	HAVE_CONFIG_H
+ #include	"config.h"
  #endif
- 
-@@ -828,17 +850,28 @@
- 				rc=1;
- 			else
- 			{
--				switch (ldap_simple_bind_s(bindp, dn, (char *)pass))
--				{
--				case LDAP_SUCCESS:
--					break;
--				case LDAP_INVALID_CREDENTIALS:
--					rc = -1;
--					break;
--				default:
-+#if HAVE_LDAP_TLS
-+				if(my_ldap.tls && enable_tls_on(bindp)) {
-+#if HAVE_SYSLOG_H
-+					syslog(LOG_DAEMON|LOG_CRIT, "authlib: LDAP_TLS enabled but I'm unable to start tls, check your config\n");
-+#endif
- 					rc = 1;
--					break;
-+				} else {
-+#endif
-+					switch (ldap_simple_bind_s(bindp, dn, (char *)pass))
-+					{
-+					case LDAP_SUCCESS:
-+						break;
-+					case LDAP_INVALID_CREDENTIALS:
-+						rc = -1;
-+						break;
-+					default:
-+						rc = 1;
-+						break;
-+					}
-+#if HAVE_LDAP_TLS
- 				}
-+#endif
- 				ldap_unbind(bindp);
- 			}
- 			if (rc == 0 && newpass)
++#include	<stdlib.h>
+ #include	<string.h>
+ #if	HAVE_UNISTD_H
+ #include	<unistd.h>
diff --git a/mail/courier-imap/patches/patch-ad b/mail/courier-imap/patches/patch-ad
index 1a5c0aacffb..1bd6b85598d 100644
--- a/mail/courier-imap/patches/patch-ad
+++ b/mail/courier-imap/patches/patch-ad
@@ -1,13 +1,14 @@
-$NetBSD: patch-ad,v 1.1 2002/01/02 22:19:41 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2002/01/22 22:08:54 jlam Exp $
 
---- authlib/configure.in.orig	Sat Nov 24 14:39:03 2001
-+++ authlib/configure.in
-@@ -411,8 +411,6 @@
- 	STATIC_LIST="authldap_info $STATIC_LIST"
- 	LIBAUTH="$LIBAUTH libauth-authldap.a"
- 	echo authldaprc.dist >>authconfiglist
--else
--	authldaprc=""
+--- configure.orig	Tue Jan 22 14:53:01 2002
++++ configure
+@@ -1719,9 +1719,6 @@
  fi
- AC_SUBST(LDAPLIBS)
  
+ 
+-INSTALL_DATA='${INSTALL} -m 0600'
+-INSTALL_SCRIPT='${INSTALL}'
+-
+ #
+ # autoconf bug
+ #
diff --git a/mail/courier-imap/patches/patch-ae b/mail/courier-imap/patches/patch-ae
index aa946f2cfea..250ff0d431e 100644
--- a/mail/courier-imap/patches/patch-ae
+++ b/mail/courier-imap/patches/patch-ae
@@ -1,13 +1,27 @@
-$NetBSD: patch-ae,v 1.1 2002/01/02 22:19:41 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2002/01/22 22:08:54 jlam Exp $
 
---- authlib/configure.orig	Sat Nov 24 14:39:36 2001
-+++ authlib/configure
-@@ -2689,8 +2689,6 @@
- 	STATIC_LIST="authldap_info $STATIC_LIST"
- 	LIBAUTH="$LIBAUTH libauth-authldap.a"
- 	echo authldaprc.dist >>authconfiglist
--else
--	authldaprc=""
- fi
- 
+--- imapd-ssl.rc.in.orig	Thu Mar 15 22:36:47 2001
++++ imapd-ssl.rc.in
+@@ -21,11 +21,6 @@
+ 		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
+ 	done
  
+-	if test -x ${libexecdir}/authlib/authdaemond
+-	then
+-		@SETENV@ - ${libexecdir}/authlib/authdaemond start
+-	fi
+-
+ 	ulimit -d $IMAP_ULIMITD
+ 	@SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd ; \
+ 		. @sysconfdir@/imapd-ssl ; \
+@@ -45,10 +40,6 @@
+ 	;;
+ stop)
+ 	@libexecdir@/couriertcpd -pid=$SSLPIDFILE -stop
+-	if test -x ${libexecdir}/authlib/authdaemond
+-	then
+-		${libexecdir}/authlib/authdaemond stop
+-	fi
+ 	;;
+ esac
+ exit 0
diff --git a/mail/courier-imap/patches/patch-af b/mail/courier-imap/patches/patch-af
index 52f0ba5217e..cef07ec990f 100644
--- a/mail/courier-imap/patches/patch-af
+++ b/mail/courier-imap/patches/patch-af
@@ -1,12 +1,27 @@
-$NetBSD: patch-af,v 1.1 2002/01/02 22:19:41 jlam Exp $
+$NetBSD: patch-af,v 1.2 2002/01/22 22:08:54 jlam Exp $
 
---- authlib/cryptpassword.c.orig	Wed Jun 20 21:44:04 2001
-+++ authlib/cryptpassword.c
-@@ -6,6 +6,7 @@
- #if	HAVE_CONFIG_H
- #include	"config.h"
- #endif
-+#include	<stdlib.h>
- #include	<string.h>
- #if	HAVE_UNISTD_H
- #include	<unistd.h>
+--- imapd.rc.in.orig	Sun Jul 29 20:02:32 2001
++++ imapd.rc.in
+@@ -21,11 +21,6 @@
+ 		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
+ 	done
+ 
+-	if test -x ${libexecdir}/authlib/authdaemond
+-	then
+-		@SETENV@ - ${libexecdir}/authlib/authdaemond start
+-	fi
+-
+ 	ulimit -d $IMAP_ULIMITD
+ 	@SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd ; \
+ 				. @sysconfdir@/imapd-ssl ; \
+@@ -45,10 +40,6 @@
+ 	;;
+ stop)
+ 	@libexecdir@/couriertcpd -pid=$PIDFILE -stop
+-	if test -x ${libexecdir}/authlib/authdaemond
+-	then
+-		${libexecdir}/authlib/authdaemond stop
+-	fi
+ 	;;
+ esac
+ exit 0
diff --git a/mail/courier-imap/patches/patch-ag b/mail/courier-imap/patches/patch-ag
index b9b473708dd..f51c4e66cf7 100644
--- a/mail/courier-imap/patches/patch-ag
+++ b/mail/courier-imap/patches/patch-ag
@@ -1,14 +1,27 @@
-$NetBSD: patch-ag,v 1.1 2002/01/02 22:19:42 jlam Exp $
+$NetBSD: patch-ag,v 1.2 2002/01/22 22:08:55 jlam Exp $
 
---- configure.in.orig	Wed Dec  5 08:16:41 2001
-+++ configure.in
-@@ -162,9 +162,6 @@
- AC_ARG_WITH(authchangepwdir, [], ,
- 	ac_configure_args="$ac_configure_args --with-authchangepwdir=/var/tmp/dev/null")
+--- pop3d-ssl.rc.in.orig	Sun Jan 28 13:52:49 2001
++++ pop3d-ssl.rc.in
+@@ -21,11 +21,6 @@
+ 		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
+ 	done
  
--INSTALL_DATA='${INSTALL} -m 0600'
--INSTALL_SCRIPT='${INSTALL}'
+-	if test -x ${libexecdir}/authlib/authdaemond
+-	then
+-		@SETENV@ - ${libexecdir}/authlib/authdaemond start
+-	fi
 -
- #
- # autoconf bug
- #
+ 	@SETENV@ - @SHELL@ -c " . @sysconfdir@/pop3d ; \
+ 		. @sysconfdir@/pop3d-ssl ; \
+ 		POP3_TLS=1; export POP3_TLS; \
+@@ -44,10 +39,6 @@
+ 	;;
+ stop)
+ 	@libexecdir@/couriertcpd -pid=$SSLPIDFILE -stop
+-	if test -x ${libexecdir}/authlib/authdaemond
+-	then
+-		${libexecdir}/authlib/authdaemond stop
+-	fi
+ 	;;
+ esac
+ exit 0
diff --git a/mail/courier-imap/patches/patch-ah b/mail/courier-imap/patches/patch-ah
new file mode 100644
index 00000000000..5f4b342c810
--- /dev/null
+++ b/mail/courier-imap/patches/patch-ah
@@ -0,0 +1,27 @@
+$NetBSD: patch-ah,v 1.1 2002/01/22 22:08:55 jlam Exp $
+
+--- pop3d.rc.in.orig	Sun Jul 29 20:02:32 2001
++++ pop3d.rc.in
+@@ -21,11 +21,6 @@
+ 		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
+ 	done
+ 
+-	if test -x ${libexecdir}/authlib/authdaemond
+-	then
+-		@SETENV@ - ${libexecdir}/authlib/authdaemond start
+-	fi
+-
+ 	@SETENV@ - @SHELL@ -c " . @sysconfdir@/pop3d ; \
+ 				. @sysconfdir@/pop3d-ssl ; \
+ 		POP3_STARTTLS=$POP3DSTARTTLS ; export POP3_STARTTLS ; \
+@@ -44,10 +39,6 @@
+ 	;;
+ stop)
+ 	@libexecdir@/couriertcpd -pid=$PIDFILE -stop
+-	if test -x ${libexecdir}/authlib/authdaemond
+-	then
+-		${libexecdir}/authlib/authdaemond stop
+-	fi
+ 	;;
+ esac
+ exit 0