Update mail/courier-imap to courier-imap-4.0.1. Changes from version

3.0.5 include:

    * Implemented IMAP and POP3 proxy aggregator.  With a proxy
      aggregator, the mail accounts are split between multiple,
      independent servers, with an IMAP/POP3 server running on each
      individual server.  A separate, proxy server sits in front and
      accepts ordinary IMAP and POP3 connections.  It reads the login
      ID, determines which server the account is located on, connects
      to the server, and logs in.  Then, for the lifetime on the login
      session the front-end server takes itself out of the loop, and
      forwards all session traffic between the IMAP/POP3 client, and
      the back-end server.

    * Use courier-authlib for user authentication.

    * IPv6 support.

    * Minor bug fixes.

Please note when updating that the locations of the userdb files has
changed to be within the courier-authlib config directory, e.g.
/usr/pkg/etc/authlib/userdb*.

18 files changed, 278 insertions, 365 deletions

diff --git a/mail/courier-imap/DEINSTALL b/mail/courier-imap/DEINSTALL
index 0f07a2aea2b..3cc31ac4528 100644
--- a/mail/courier-imap/DEINSTALL
+++ b/mail/courier-imap/DEINSTALL
@@ -1,14 +1,30 @@
-# $NetBSD: DEINSTALL,v 1.5 2004/07/14 20:07:16 jlam Exp $
-
-# Additional files that are may be created for courier-imap.
-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"
+# $NetBSD: DEINSTALL,v 1.6 2005/02/18 22:12:46 jlam Exp $
 
 case ${STAGE} in
+DEINSTALL)
+	#
+	# Note some additional files that may be created by the sysadmin
+	# that can probably be removed.
+	#
+	if ${TEST} -x ./+FILES; then
+		for file in						\
+			${PKG_SYSCONFDIR}/imapd.rand			\
+			${PKG_SYSCONFDIR}/pop3d.rand			\
+			@SSLCERTS@/imapd.pem				\
+			@SSLCERTS@/pop3d.pem
+		do
+			${ECHO} "# FILE: $file . /dev/null" >> ./+FILES
+		done
+	fi
+	;;
+
 POST-DEINSTALL)
-	# Unconditionally remove the SSL cache file.
-	${RM} -f @VARBASE@/couriersslcache
+	couriersslcache="@VARBASE@/couriersslcache"
+	if ${TEST} -f "$couriersslcache"; then
+		# Unconditionally remove the SSL cache file.
+		${ECHO} "Removing Courier SSL cache file:"
+		${ECHO} "	$couriersslcache"
+		${RM} -f $couriersslcache
+	fi
 	;;
 esac
diff --git a/mail/courier-imap/DESCR b/mail/courier-imap/DESCR
index d89b3fd7d32..e79e619dd80 100644
--- a/mail/courier-imap/DESCR
+++ b/mail/courier-imap/DESCR
@@ -1,13 +1,18 @@
-Courier-IMAP is a server that provides IMAP access to maildirs. This IMAP
-server does NOT handle traditional mailbox files (/var/spool/mail, and
-derivatives), it was written for the specific purpose of providing IMAP
-access to maildirs.
+Courier-IMAP is a server that provides IMAP access to maildirs. This
+IMAP server does NOT handle traditional mailbox files (/var/spool/mail,
+and derivatives), it was written for the specific purpose of providing
+IMAP access to maildirs.
 
 "Maildir" is a directory-based mail storage format originally introduced
 in the Qmail mail server, and adopted as an alternative mail storage
-format by both Exim and Postfix. Courier-IMAP is popular on
-Qmail/Exim/Postfix sites that are configured to use maildirs. The primary
-advantage of maildirs is that multiple applications can access the same
-maildir simultaneously without requiring any kind of locking whatsoever.
-It is a faster and more efficient way to store mail. It works particularly
-well over NFS, which has a long history of locking-related woes.
+format by both Exim and Postfix.  Courier-IMAP is popular on
+Qmail/Exim/Postfix sites that are configured to use maildirs.  The
+primary advantage of maildirs is that multiple applications can access
+the same maildir simultaneously without requiring any kind of locking
+whatsoever.  It is a faster and more efficient way to store mail.  It
+works particularly well over NFS, which has a long history of
+locking-related woes.
+
+This package differs from a vanilla Courier-IMAP installation in that
+the files are installed at locations that more closely correspond to
+a Courier installation.
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 042d1f37875..53e5a76fd42 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,24 +1,31 @@
-# $NetBSD: Makefile,v 1.32 2004/12/28 02:47:44 reed Exp $
+# $NetBSD: Makefile,v 1.33 2005/02/18 22:12:46 jlam Exp $
 
-DISTNAME=	courier-imap-3.0.5
-PKGREVISION=	2
+DISTNAME=	courier-imap-4.0.1
+PKGBASE=	${DISTNAME:C/-[^-]*$//}
+CATEGORIES=	mail
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
+EXTRACT_SUFX=	.tar.bz2
 
+MAINTAINER=	jlam@NetBSD.org
 COMMENT=	IMAP server for access to maildir-style mailboxes
-HOMEPAGE=	http://www.inter7.com/courierimap/
+HOMEPAGE=	http://www.courier-mta.org/imap/
 
-DEPENDS+=	courier-auth>=${BASE_VERS}:../../mail/courier-auth
-DEPENDS+=	courier-maildir>=${BASE_VERS}:../../mail/courier-maildir
+DEPENDS+=	courier-maildir>=0.48.2:../../mail/courier-maildir
 
-USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
 USE_PERL5=		build
 
-USE_PKGINSTALL=		yes
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL=	${.CURDIR}/../courier-auth/INSTALL
+.include "../../mail/courier-maildir/Makefile.common"
 
-.include "../courier-auth/Makefile.common"
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/courier
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec/courier
 
+CONFIGURE_ARGS+=	--with-mailuser=${ROOT_USER}
+CONFIGURE_ARGS+=	--with-piddir=${VARBASE}/run
+CONFIGURE_ARGS+=	--program-transform-name='s/\.rc$$//'
 CONFIGURE_ENV+=		OPENSSL=${SSLBASE}/bin/openssl
 
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
@@ -28,10 +35,12 @@ SSLCNF_FILES=		imapd.cnf pop3d.cnf
 FILES_SUBST+=		SSLCERTS=${SSLCERTS}
 FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
 
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+MAKE_DIRS=		${VARBASE}/run
 CONF_FILES_PERMS=	# empty
 .for FILE in ${GEN_FILES}
-CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
-			${ROOT_USER} ${ROOT_GROUP} 0600
+CONF_FILES+=		${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}
 .endfor
 .for FILE in ${SSLCNF_FILES}
 CONF_FILES_PERMS+=	${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}	\
@@ -39,17 +48,16 @@ CONF_FILES_PERMS+=	${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}	\
 .endfor
 RCD_SCRIPTS=		courierimap courierimaps courierpop courierpops
 
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
-
-pre-configure:
-	cd ${WRKSRC}; for file in					\
-		imap/imapd.dist.in imap/imapd-ssl.dist.in		\
-		imap/pop3d.dist.in imap/pop3d-ssl.dist.in		\
-		imap/imapd.cnf.in imap/pop3d.cnf.in			\
-		imap/mkimapdcert.in imap/mkpop3dcert.in;		\
-	do								\
-		${SED}	-e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g"		\
+SUBST_CLASSES+=		courier
+SUBST_MESSAGE.courier=	"Convert to match courier-mta expectations."
+SUBST_FILES.courier=	imap/imapd.dist.in imap/imapd-ssl.dist.in	\
+			imap/pop3d.dist.in imap/pop3d-ssl.dist.in	\
+			imap/imapd.cnf.in imap/pop3d.cnf.in		\
+			imap/mkimapdcert.in imap/mkpop3dcert.in		\
+			imap/imapd.8.in imap/courierpop3d.8.in		\
+			imapd-ssl.rc.in imapd.rc.in			\
+			pop3d-ssl.rc.in pop3d.rc.in
+SUBST_SED.courier=	-e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g"		\
 			-e "s|^IMAPDSSLSTART=.*|IMAPDSSLSTART=YES|g"	\
 			-e "s|^POP3DSTART=.*|POP3DSTART=YES|g"		\
 			-e "s|^POP3DSSLSTART=.*|POP3DSSLSTART=YES|g"	\
@@ -57,16 +65,22 @@ pre-configure:
 			-e "s|@datadir@/imapd.rand|@sysconfdir@/imapd.rand|g" \
 			-e "s|@datadir@/pop3d.pem|${SSLCERTS}/pop3d.pem|g" \
 			-e "s|@datadir@/pop3d.rand|@sysconfdir@/pop3d.rand|g" \
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
+			-e "s|@libexecdir@/couriertcpd|@sbindir@/couriertcpd|g" \
+			-e "s|@sbindir@/imaplogin|@libexecdir@/imaplogin|g" \
+			-e "s|@sbindir@/pop3login|@libexecdir@/courierpop3login|g" \
+			-e "s|@bindir@/pop3d|@libexecdir@/courierpop3d|g"
+SUBST_STAGE.courier=	pre-configure
+
+.include "../../security/courier-authlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${DOCDIR}/imap
-	${INSTALL_DATA} ${WRKSRC}/imap/BUGS ${DOCDIR}/imap
-	${INSTALL_DATA} ${WRKSRC}/imap/README ${DOCDIR}/imap
-	${INSTALL_DATA} ${WRKSRC}/imap/imapd.authpam ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/imap/pop3d.authpam ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/imap/BUGS.html ${DOCDIR}/imap
+	${INSTALL_DATA} ${WRKSRC}/imap/README.html ${DOCDIR}/imap
+	${INSTALL_DATA} ${WRKSRC}/imap/README.proxy.html ${DOCDIR}/imap
+	${INSTALL_DATA} ${WRKSRC}/imap/imapd.pam ${EGDIR}/imap.pam
+	${INSTALL_DATA} ${WRKSRC}/imap/pop3d.pam ${EGDIR}/pop3.pam
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-imap/PLIST b/mail/courier-imap/PLIST
index d93288e5b42..f64c1c22fea 100644
--- a/mail/courier-imap/PLIST
+++ b/mail/courier-imap/PLIST
@@ -1,30 +1,36 @@
-@comment $NetBSD: PLIST,v 1.10 2004/07/14 20:07:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/02/18 22:12:46 jlam Exp $
 bin/couriertls
 bin/imapd
-bin/pop3d
-libexec/courier/couriertcpd
-libexec/courier/imapd-ssl.rc
-libexec/courier/imapd.rc
-libexec/courier/pop3d-ssl.rc
-libexec/courier/pop3d.rc
+libexec/courier/courierpop3d
+libexec/courier/courierpop3login
+libexec/courier/imaplogin
 man/man1/couriertcpd.1
-man/man8/courier-imapd.8
+man/man8/courierimapd.8
+man/man8/courierpop3d.8
 man/man8/mkimapdcert.8
 man/man8/mkpop3dcert.8
-sbin/imaplogin
+sbin/couriertcpd
+sbin/imapd
+sbin/imapd-ssl
 sbin/mkimapdcert
 sbin/mkpop3dcert
-sbin/pop3login
+sbin/pop3d
+sbin/pop3d-ssl
+share/courier/imapd
+share/courier/imapd-ssl
 share/courier/mkimapdcert
 share/courier/mkpop3dcert
-share/doc/courier/imap/BUGS
-share/doc/courier/imap/README
+share/courier/pop3d
+share/courier/pop3d-ssl
+share/doc/courier/imap/BUGS.html
+share/doc/courier/imap/README.html
+share/doc/courier/imap/README.proxy.html
+share/examples/courier/imap.pam
 share/examples/courier/imapd-ssl.dist
-share/examples/courier/imapd.authpam
 share/examples/courier/imapd.cnf
 share/examples/courier/imapd.dist
+share/examples/courier/pop3.pam
 share/examples/courier/pop3d-ssl.dist
-share/examples/courier/pop3d.authpam
 share/examples/courier/pop3d.cnf
 share/examples/courier/pop3d.dist
 @unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index 6eb1d7604e7..1bf775c0e47 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.11 2004/07/14 20:07:16 jlam Exp $
+$NetBSD: distinfo,v 1.12 2005/02/18 22:12:46 jlam Exp $
 
-SHA1 (courier-imap-3.0.5.tar.bz2) = aea9068594cadc2210922d822e2d52795ba47cb1
-Size (courier-imap-3.0.5.tar.bz2) = 1648873 bytes
-SHA1 (patch-aa) = 0deead26ed61b42b7b8e564fc932ee9818e9c6ac
-SHA1 (patch-ab) = f8186acc61f3c54510b89dda8841bfbf44526718
-SHA1 (patch-ad) = 50fb9666cab86de650e1a09e6d4a8ba7062be017
-SHA1 (patch-ae) = 5d240e3d4e239eb146da1a41c3fb560c2ab158e2
-SHA1 (patch-af) = feed1d40f9e5eabb06b5a9937ffaaf38784990b4
-SHA1 (patch-ag) = 053807924b94d05832166449b0f33484be0ad7cf
-SHA1 (patch-ah) = be0636cd9a790bda8b76def53a460913b85ddfd1
-SHA1 (patch-ai) = f8c091fd095d36b665fa5afb5f8e0d8420f5cdcf
-SHA1 (patch-aj) = 92bf04ce239fe0a07745c728d6670e29f3f44c8d
+SHA1 (courier-imap-4.0.1.tar.bz2) = 747c122c7b7f033ff9f9ab5ba3e4b689aa5d4189
+Size (courier-imap-4.0.1.tar.bz2) = 3032350 bytes
+SHA1 (patch-aa) = f44c4c1ef778bc958ded32d3d83aeb51743b58ea
+SHA1 (patch-ad) = fda6348009340f39490e79e122e421aa21ac3763
+SHA1 (patch-ae) = eff5f9cd4a75e159610732104f2936683c672ec1
+SHA1 (patch-af) = 7e3ba78627ed46994f9bdf18ddcb201512c55c27
+SHA1 (patch-ag) = 889ca671aff35c16c3c6c19f2e06acf8493dfb31
+SHA1 (patch-ah) = f951b61fe4f56bd9e115479827b94c5c71032973
diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
index b947553e701..911fcb9c8d4 100755
--- a/mail/courier-imap/files/courierimap.sh
+++ b/mail/courier-imap/files/courierimap.sh
@@ -1,21 +1,20 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimap.sh,v 1.10 2004/07/15 08:29:05 jlam Exp $
+# $NetBSD: courierimap.sh,v 1.11 2005/02/18 22:12:46 jlam Exp $
 #
 # Courier IMAP services daemon
 #
 # PROVIDE: courierimap
 # REQUIRE: authdaemond
+# KEYWORD: shutdown
 
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="courierimap"
 rcvar=${name}
-command="@PREFIX@/libexec/courier/couriertcpd"
-ctl_command="@PREFIX@/libexec/courier/imapd.rc"
-pidfile="/var/run/imapd.pid"
+command="@PREFIX@/sbin/couriertcpd"
+ctl_command="@PREFIX@/sbin/imapd"
+pidfile="@VARBASE@/run/imapd.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 required_vars="authdaemond"
 
@@ -58,10 +57,5 @@ courier_doit()
 	${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	${start_cmd}
-fi
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
index 455901c6ca9..b235adc9317 100755
--- a/mail/courier-imap/files/courierimaps.sh
+++ b/mail/courier-imap/files/courierimaps.sh
@@ -1,21 +1,20 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimaps.sh,v 1.10 2004/07/15 08:29:05 jlam Exp $
+# $NetBSD: courierimaps.sh,v 1.11 2005/02/18 22:12:46 jlam Exp $
 #
 # Courier IMAP/SSL services daemon
 #
 # PROVIDE: courierimaps
 # REQUIRE: authdaemond
+# KEYWORD: shutdown
 
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="courierimaps"
 rcvar=${name}
-command="@PREFIX@/libexec/courier/couriertcpd"
-ctl_command="@PREFIX@/libexec/courier/imapd-ssl.rc"
-pidfile="/var/run/imapd-ssl.pid"
+command="@PREFIX@/sbin/couriertcpd"
+ctl_command="@PREFIX@/sbin/imapd-ssl"
+pidfile="@VARBASE@/run/imapd-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 required_files="${required_files} @SSLCERTS@/imapd.pem"
 required_vars="authdaemond"
@@ -59,10 +58,5 @@ courier_doit()
 	${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	${start_cmd}
-fi
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
index e983fbce7a7..ecfde58c271 100755
--- a/mail/courier-imap/files/courierpop.sh
+++ b/mail/courier-imap/files/courierpop.sh
@@ -1,21 +1,20 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpop.sh,v 1.10 2004/07/15 08:29:05 jlam Exp $
+# $NetBSD: courierpop.sh,v 1.11 2005/02/18 22:12:46 jlam Exp $
 #
 # Courier POP3 services daemon
 #
 # PROVIDE: courierpop
 # REQUIRE: authdaemond
+# KEYWORD: shutdown
 
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="courierpop"
 rcvar=${name}
-command="@PREFIX@/libexec/courier/couriertcpd"
-ctl_command="@PREFIX@/libexec/courier/pop3d.rc"
-pidfile="/var/run/pop3d.pid"
+command="@PREFIX@/sbin/couriertcpd"
+ctl_command="@PREFIX@/sbin/pop3d"
+pidfile="@VARBASE@/run/pop3d.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 required_vars="authdaemond"
 
@@ -58,10 +57,5 @@ courier_doit()
 	${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	${start_cmd}
-fi
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
index 237aecc0fc9..a2af59c18cb 100755
--- a/mail/courier-imap/files/courierpops.sh
+++ b/mail/courier-imap/files/courierpops.sh
@@ -1,21 +1,20 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpops.sh,v 1.10 2004/07/15 08:29:05 jlam Exp $
+# $NetBSD: courierpops.sh,v 1.11 2005/02/18 22:12:46 jlam Exp $
 #
 # Courier POP3/SSL services daemon
 #
 # PROVIDE: courierpops
 # REQUIRE: authdaemond
+# KEYWORD: shutdown
 
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="courierpops"
 rcvar=${name}
-command="@PREFIX@/libexec/courier/couriertcpd"
-ctl_command="@PREFIX@/libexec/courier/pop3d-ssl.rc"
-pidfile="/var/run/pop3d-ssl.pid"
+command="@PREFIX@/sbin/couriertcpd"
+ctl_command="@PREFIX@/sbin/pop3d-ssl"
+pidfile="@VARBASE@/run/pop3d-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 required_files="${required_files} @SSLCERTS@/pop3d.pem"
 required_vars="authdaemond"
@@ -59,10 +58,5 @@ courier_doit()
 	${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	exec ${ctl_command} start
-fi
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/courier-imap/patches/patch-aa b/mail/courier-imap/patches/patch-aa
index 38f6f3c064d..ea5282a5264 100644
--- a/mail/courier-imap/patches/patch-aa
+++ b/mail/courier-imap/patches/patch-aa
@@ -1,72 +1,61 @@
-$NetBSD: patch-aa,v 1.9 2004/07/14 20:07:16 jlam Exp $
+$NetBSD: patch-aa,v 1.10 2005/02/18 22:12:46 jlam Exp $
 
---- Makefile.in.orig	Fri Jun 11 21:38:19 2004
-+++ Makefile.in	Tue Jul 13 20:33:19 2004
-@@ -140,12 +140,12 @@
- 
+--- Makefile.in.orig	2005-01-04 19:57:19.000000000 -0500
++++ Makefile.in
+@@ -231,10 +231,11 @@ DIST_SUBDIRS = numlib md5 sha1 bdbobj gd
  
 -sbin_SCRIPTS = sharedindexinstall sharedindexsplit
 +sbin_SCRIPTS = 
  CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
  databindir = $(datadir)
--databin_SCRIPTS = mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb
-+databin_SCRIPTS = mkimapdcert mkpop3dcert
- 
+-databin_SCRIPTS = mkimapdcert mkpop3dcert
 -binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
--sbinPROGRAMS = authenumerate imaplogin pop3login userdbpw courierlogger
+-sbinPROGRAMS = imaplogin pop3login
 -libexecPROGRAMS = makedatprog couriertcpd
-+binPROGRAMS = imapd pop3d
-+sbinPROGRAMS = imaplogin pop3login
-+libexecPROGRAMS = couriertcpd
- 
- bin_PROGRAMS = @binPROGRAMS_exec@
-@@ -155,5 +155,5 @@
- EXTRA_PROGRAMS = 
- 
--man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.1 courierlogger.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
-+man_MANS = couriertcpd.1 courier-imapd.8 mkimapdcert.8 mkpop3dcert.8
- 
- 
-@@ -169,5 +169,5 @@
- 
+-man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
++databin_SCRIPTS = mkimapdcert mkpop3dcert \
++	imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
++binPROGRAMS = imapd
++sbinPROGRAMS = couriertcpd
++libexecPROGRAMS = imaplogin courierpop3login courierpop3d
++man_MANS = couriertcpd.1 courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8
+ 
+@@ -250,5 +251,5 @@ sysconftool
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -	imapd.cnf pop3d.cnf quotawarnmsg.example
 +	imapd.cnf pop3d.cnf
  
- libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
-@@ -980,6 +980,6 @@
- 	cp $(srcdir)/maildir/maildirkw.1 .
+-libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
++libexec_SCRIPTS = 
+ HTML2TXT = `which lynx 2>/dev/null && echo "lynx -dump -nolist" && exit; echo "links -dump"`
+@@ -996,7 +997,7 @@ sharedindexsplit: maildir/sharedindexspl
+ 
+-pop3login$(EXEEXT): imap/pop3login$(EXEEXT)
+-	cp imap/pop3login$(EXEEXT) .
++courierpop3login$(EXEEXT): imap/pop3login$(EXEEXT)
++	cp imap/pop3login$(EXEEXT) ./$@
+ 
+-pop3d$(EXEEXT): imap/pop3d$(EXEEXT)
+-	cp imap/pop3d$(EXEEXT) .
++courierpop3d$(EXEEXT): imap/pop3d$(EXEEXT)
++	cp imap/pop3d$(EXEEXT) ./$@
+ 
+@@ -1044,4 +1045,7 @@ maildirkw.1: maildir/maildirkw.1
  
 -imapd.8: imap/imapd.8
 -	cp imap/imapd.8 .
-+courier-imapd.8: imap/imapd.8
++courierimapd.8: imap/imapd.8
 +	cp imap/imapd.8 ./$@
++
++courierpop3d.8: imap/courierpop3d.8
++	cp imap/courierpop3d.8 .
  
- mkimapdcert: imap/mkimapdcert
-@@ -1007,20 +1007,9 @@
- 
- 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)$(databindir)
--	$(INSTALL_SCRIPT) userdb/userdb.pl $(DESTDIR)$(databindir)/userdb
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
- 	test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
- 		tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
+@@ -1074,3 +1078,3 @@ install-exec-local:
  	$(mkinstalldirs) $(DESTDIR)$(sbindir)
--	for f in mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb userdb ; \
-+	for f in mkimapdcert mkpop3dcert ; \
+-	for f in mkimapdcert mkpop3dcert ; \
++	for f in imapd-ssl imapd mkimapdcert mkpop3dcert pop3d pop3d-ssl ; \
  		do rm -f $(DESTDIR)$(sbindir)/$$f ; \
- 		$(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
-@@ -1028,34 +1017,8 @@
- 
+@@ -1080,17 +1084,4 @@ install-exec-local:
  install-exec-hook:
 -	chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
 -	mkdir -p $(DESTDIR)$(sysconfdir)/shared
@@ -74,29 +63,13 @@ $NetBSD: patch-aa,v 1.9 2004/07/14 20:07:16 jlam Exp $
 -	mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
 -	chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
  
- # If authlib built authpam, install the PAM configuration file
- 
  install-data-local: install-man
--	for f in `cat authlib/modulelist ; . authlib/authdaemonrc ; echo $$authmodulelist ` ; do \
--		test "$$f" = "authpam" || continue ; \
--		test -d $(DESTDIR)/etc/pam.d || continue ; \
--		test -w $(DESTDIR)/etc/pam.d || continue ; \
--		test -f $(DESTDIR)/etc/pam.d/imap || \
--			$(INSTALL_DATA) $(srcdir)/imap/imapd.pam \
--			$(DESTDIR)/etc/pam.d/imap || exit 1 ;\
--		test -f $(DESTDIR)/etc/pam.d/pop3 || \
--			$(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
--			$(DESTDIR)/etc/pam.d/pop3 || exit 1 ;\
--	done
--	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:
+-	test -d $(DESTDIR)/etc/pam.d || exit 0 ; \
+-	test -w $(DESTDIR)/etc/pam.d || exit 0 ; \
+-	test -f $(DESTDIR)/etc/pam.d/imap || \
+-		$(INSTALL_DATA) $(srcdir)/imap/imapd.pam \
+-		$(DESTDIR)/etc/pam.d/imap || exit 1 ;\
+-	test -f $(DESTDIR)/etc/pam.d/pop3 || \
+-		$(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
+-		$(DESTDIR)/etc/pam.d/pop3 || exit 1
+ 	for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done
diff --git a/mail/courier-imap/patches/patch-ab b/mail/courier-imap/patches/patch-ab
deleted file mode 100644
index bc2399f70db..00000000000
--- a/mail/courier-imap/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2004/07/14 20:07:16 jlam Exp $
-
---- authlib/Makefile.in.orig	Tue Jul 13 03:32:28 2004
-+++ authlib/Makefile.in	Tue Jul 13 03:32:54 2004
-@@ -1312,5 +1312,5 @@
- info-am:
- 
--install-data-am: install-data-local
-+install-data-am:
- 
- install-exec-am:
diff --git a/mail/courier-imap/patches/patch-ad b/mail/courier-imap/patches/patch-ad
index 53e480e6812..f3a8c2b30ab 100644
--- a/mail/courier-imap/patches/patch-ad
+++ b/mail/courier-imap/patches/patch-ad
@@ -1,8 +1,17 @@
-$NetBSD: patch-ad,v 1.3 2004/02/22 03:13:07 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2005/02/18 22:12:46 jlam Exp $
 
---- configure.orig	Thu Nov 27 15:51:08 2003
+--- configure.orig	2005-01-04 19:57:18.000000000 -0500
 +++ configure
-@@ -3607,9 +3607,6 @@ else
+@@ -19568,7 +19568,7 @@ echo "$as_me: error: courierauthconfig n
+ fi
+ $COURIERAUTHCONFIG --configfiles >conftest || exit 1
+ sed 's/^/auth/' <conftest >conftest2
+-. conftest2
++. ./conftest2
+ if test ! -x $authsbindir/courierlogger$EXEEXT
+ then
+ 	{ { echo "$as_me:$LINENO: error: authlib configuration error - $authsbindir/courierlogger$EXEEXT not found" >&5
+@@ -20376,9 +20376,6 @@ else
    ac_configure_args="$ac_configure_args --with-authchangepwdir=/var/tmp/dev/null"
  fi;
  
diff --git a/mail/courier-imap/patches/patch-ae b/mail/courier-imap/patches/patch-ae
index f0398d9b354..331740cda32 100644
--- a/mail/courier-imap/patches/patch-ae
+++ b/mail/courier-imap/patches/patch-ae
@@ -1,35 +1,26 @@
-$NetBSD: patch-ae,v 1.5 2004/07/14 20:07:17 jlam Exp $
+$NetBSD: patch-ae,v 1.6 2005/02/18 22:12:46 jlam Exp $
 
---- imapd-ssl.rc.in.orig	Tue Jul 13 03:37:29 2004
-+++ imapd-ssl.rc.in	Tue Jul 13 03:39:05 2004
-@@ -34,18 +34,13 @@
- 		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
- 	done
+--- imapd-ssl.rc.in.orig	2004-11-24 23:57:04.000000000 -0500
++++ imapd-ssl.rc.in
+@@ -9,6 +9,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ libexecdir=@libexecdir@
++sbindir=@sbindir@
  
--	if test -x ${libexecdir}/authlib/authdaemond
--	then
--		@SETENV@ - DEBUG_LOGIN="$DEBUG_LOGIN" ${libexecdir}/authlib/authdaemond start
--	fi
--
- 	if test "$TLS_CACHEFILE" != ""
- 	then
- 		rm -f $TLS_CACHEFILE
- 	fi
+ if test ! -f @sysconfdir@/imapd
+ then
+@@ -35,11 +36,12 @@ start)
  
+ 	umask $IMAP_UMASK
  	@ULIMIT@ $IMAP_ULIMITD
 -	@SETENV@ - @SHELL@ -c " set -a ;
 +	@SETENV@ -i @SHELL@ -c " set -a ;
  		prefix=@prefix@ ;
  		exec_prefix=@exec_prefix@ ;
  		bindir=@bindir@ ;
-@@ -64,10 +59,6 @@
- 	;;
- stop)
- 	@libexecdir@/couriertcpd -pid=$SSLPIDFILE -stop
--	if test -x ${libexecdir}/authlib/authdaemond
--	then
--		${libexecdir}/authlib/authdaemond stop
--	fi
- 	;;
- esac
- exit 0
+ 		libexecdir=@libexecdir@ ;
++		sbindir=@sbindir@ ;
+ 		. @sysconfdir@/imapd ; \
+ 		. @sysconfdir@/imapd-ssl ; \
+ 		IMAP_TLS=1; export IMAP_TLS; \
diff --git a/mail/courier-imap/patches/patch-af b/mail/courier-imap/patches/patch-af
index 9955d352927..f12a0e4a1fc 100644
--- a/mail/courier-imap/patches/patch-af
+++ b/mail/courier-imap/patches/patch-af
@@ -1,35 +1,26 @@
-$NetBSD: patch-af,v 1.5 2004/07/14 20:07:17 jlam Exp $
+$NetBSD: patch-af,v 1.6 2005/02/18 22:12:46 jlam Exp $
 
---- imapd.rc.in.orig	Tue Jul 13 03:39:46 2004
-+++ imapd.rc.in	Tue Jul 13 03:40:04 2004
-@@ -34,18 +34,13 @@
- 		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
- 	done
+--- imapd.rc.in.orig	2004-11-24 23:57:04.000000000 -0500
++++ imapd.rc.in
+@@ -9,6 +9,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ libexecdir=@libexecdir@
++sbindir=@sbindir@
  
--	if test -x ${libexecdir}/authlib/authdaemond
--	then
--		@SETENV@ - DEBUG_LOGIN="$DEBUG_LOGIN" ${libexecdir}/authlib/authdaemond start
--	fi
--
- 	if test "$TLS_CACHEFILE" != ""
- 	then
- 		rm -f $TLS_CACHEFILE
- 	fi
+ if test ! -f @sysconfdir@/imapd
+ then
+@@ -35,11 +36,12 @@ start)
  
+ 	umask $IMAP_UMASK
  	@ULIMIT@ $IMAP_ULIMITD
 -	@SETENV@ - @SHELL@ -c " set -a ;
 +	@SETENV@ -i @SHELL@ -c " set -a ;
  			prefix=@prefix@ ;
  			exec_prefix=@exec_prefix@ ;
  			bindir=@bindir@ ;
-@@ -64,10 +59,6 @@
- 	;;
- stop)
- 	@libexecdir@/couriertcpd -pid=$PIDFILE -stop
--	if test -x ${libexecdir}/authlib/authdaemond
--	then
--		${libexecdir}/authlib/authdaemond stop
--	fi
- 	;;
- esac
- exit 0
+ 			libexecdir=@libexecdir@ ;
++			sbindir=@sbindir@ ;
+ 				. @sysconfdir@/imapd ; \
+ 				. @sysconfdir@/imapd-ssl ; \
+ 		IMAP_STARTTLS=$IMAPDSTARTTLS ; export IMAP_STARTTLS ; \
diff --git a/mail/courier-imap/patches/patch-ag b/mail/courier-imap/patches/patch-ag
index 0be4c917752..cb9d7cbdef7 100644
--- a/mail/courier-imap/patches/patch-ag
+++ b/mail/courier-imap/patches/patch-ag
@@ -1,29 +1,26 @@
-$NetBSD: patch-ag,v 1.5 2004/07/14 20:07:17 jlam Exp $
+$NetBSD: patch-ag,v 1.6 2005/02/18 22:12:46 jlam Exp $
 
---- pop3d-ssl.rc.in.orig	Tue Jul 13 03:40:29 2004
-+++ pop3d-ssl.rc.in	Tue Jul 13 03:40:51 2004
-@@ -34,12 +34,7 @@
- 		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
- 	done
+--- pop3d-ssl.rc.in.orig	2004-10-20 20:45:45.000000000 -0400
++++ pop3d-ssl.rc.in
+@@ -9,6 +9,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ libexecdir=@libexecdir@
++sbindir=@sbindir@
  
--	if test -x ${libexecdir}/authlib/authdaemond
--	then
--		@SETENV@ - DEBUG_LOGIN="$DEBUG_LOGIN" ${libexecdir}/authlib/authdaemond start
--	fi
--
+ if test ! -f @sysconfdir@/pop3d
+ then
+@@ -28,11 +29,12 @@ fi
+ 
+ case $1 in
+ start)
 -	@SETENV@ - @SHELL@ -c " set -a ;
 +	@SETENV@ -i @SHELL@ -c " set -a ;
  		prefix=@prefix@ ;
  		exec_prefix=@exec_prefix@ ;
  		bindir=@bindir@ ;
-@@ -60,10 +55,6 @@
- 	;;
- stop)
- 	@libexecdir@/couriertcpd -pid=$SSLPIDFILE -stop
--	if test -x ${libexecdir}/authlib/authdaemond
--	then
--		${libexecdir}/authlib/authdaemond stop
--	fi
- 	;;
- esac
- exit 0
+ 		libexecdir=@libexecdir@ ;
++		sbindir=@sbindir@ ;
+ 		. @sysconfdir@/pop3d ; \
+ 		. @sysconfdir@/pop3d-ssl ; \
+ 		POP3_TLS=1; export POP3_TLS; \
diff --git a/mail/courier-imap/patches/patch-ah b/mail/courier-imap/patches/patch-ah
index 012a50a5cf7..2cf54bc3c1b 100644
--- a/mail/courier-imap/patches/patch-ah
+++ b/mail/courier-imap/patches/patch-ah
@@ -1,29 +1,26 @@
-$NetBSD: patch-ah,v 1.4 2004/07/14 20:07:17 jlam Exp $
+$NetBSD: patch-ah,v 1.5 2005/02/18 22:12:46 jlam Exp $
 
---- pop3d.rc.in.orig	Tue Jul 13 03:41:28 2004
-+++ pop3d.rc.in	Tue Jul 13 03:41:41 2004
-@@ -33,12 +33,7 @@
- 		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
- 	done
+--- pop3d.rc.in.orig	2004-10-20 20:45:46.000000000 -0400
++++ pop3d.rc.in
+@@ -9,6 +9,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ libexecdir=@libexecdir@
++sbindir=@sbindir@
  
--	if test -x ${libexecdir}/authlib/authdaemond
--	then
--		@SETENV@ - DEBUG_LOGIN="$DEBUG_LOGIN" ${libexecdir}/authlib/authdaemond start
--	fi
--
+ if test ! -f @sysconfdir@/pop3d
+ then
+@@ -27,11 +28,12 @@ fi
+ 
+ case $1 in
+ start)
 -	@SETENV@ - @SHELL@ -c " set -a ;
 +	@SETENV@ -i @SHELL@ -c " set -a ;
  		prefix=@prefix@ ;
  		exec_prefix=@exec_prefix@ ;
  		bindir=@bindir@ ;
-@@ -57,10 +52,6 @@
- 	;;
- stop)
- 	@libexecdir@/couriertcpd -pid=$PIDFILE -stop
--	if test -x ${libexecdir}/authlib/authdaemond
--	then
--		${libexecdir}/authlib/authdaemond stop
--	fi
- 	;;
- esac
- exit 0
+ 		libexecdir=@libexecdir@ ;
++		sbindir=@sbindir@ ;
+ 		. @sysconfdir@/pop3d ; \
+ 				. @sysconfdir@/pop3d-ssl ; \
+ 		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
diff --git a/mail/courier-imap/patches/patch-ai b/mail/courier-imap/patches/patch-ai
deleted file mode 100644
index 38624258e9f..00000000000
--- a/mail/courier-imap/patches/patch-ai
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/07/14 20:07:17 jlam Exp $
-
---- imap/imapd.dist.in.orig	Tue Jul 13 04:01:49 2004
-+++ imap/imapd.dist.in	Tue Jul 13 04:01:58 2004
-@@ -92,19 +92,6 @@
- 
- AUTHMODULES_ORIG="@AUTHMODULES@"
- 
--##NAME: DEBUG_LOGIN:0
--#
--# Dump additional login diagnostics to syslog
--#
--# DEBUG_LOGIN=0   - turn off login debugging
--# DEBUG_LOGIN=1   - turn on login debugging
--# DEBUG_LOGIN=2   - turn on login debugging + log passwords too
--#
--# Note that most information is sent to syslog at level 'debug', so
--# you may need to modify your /etc/syslog.conf to be able to see it.
--
--DEBUG_LOGIN=0
--
- ##NAME: IMAP_CAPABILITY:1
- #
- # IMAP_CAPABILITY specifies what most of the response should be to the
diff --git a/mail/courier-imap/patches/patch-aj b/mail/courier-imap/patches/patch-aj
deleted file mode 100644
index b8d5262afa6..00000000000
--- a/mail/courier-imap/patches/patch-aj
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2004/07/14 20:07:17 jlam Exp $
-
---- imap/pop3d.dist.in.orig	Tue Jul 13 04:02:36 2004
-+++ imap/pop3d.dist.in	Tue Jul 13 04:02:51 2004
-@@ -54,19 +54,6 @@
- 
- AUTHMODULES_ORIG="@AUTHMODULES@"
- 
--##NAME: DEBUG_LOGIN:0
--#
--# Dump additional login diagnostics to syslog
--#
--# DEBUG_LOGIN=0   - turn off login debugging
--# DEBUG_LOGIN=1   - turn on login debugging
--# DEBUG_LOGIN=2   - turn on login debugging + log passwords too
--#
--# Note that most information is sent to syslog at level 'debug', so
--# you may need to modify your /etc/syslog.conf to be able to see it.
--
--DEBUG_LOGIN=0
--
- ##NAME: POP3AUTH:1
- #
- # To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH