Update mail/courier-imap to 3.0.5 (based on the courier-0.45.6

distribution).  Changes from version 2.2.1 include:

  * Honor ${VARBASE}.
  * courierlogger(1) has been moved to mail/courier-auth.
  * Use the sysconftool from courier-auth to merge config files.
  * The courier* rc.d scripts now check that authdaemond is also set to
    "YES" to ensure that authdaemond is running before the courier-imap
    daemons are started.
  * Support for the ACL IMAP extension (RFC 2086 as well as the 2nd draft
    revision of the ACL specification) via shared maildirs.
  * Bug fixes and improvements to MIME encoding.
  * Fixes buffer overflow vulnerability (PR 25774):
	http://www.securityfocus.com/bid/9845
	http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0224

17 files changed, 194 insertions, 86 deletions

diff --git a/mail/courier-imap/DEINSTALL b/mail/courier-imap/DEINSTALL
index 8a45facdf35..0f07a2aea2b 100644
--- a/mail/courier-imap/DEINSTALL
+++ b/mail/courier-imap/DEINSTALL
@@ -1,14 +1,14 @@
-# $NetBSD: DEINSTALL,v 1.4 2004/02/22 03:13:07 jlam Exp $
+# $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 ${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 the SSL cache file.
-	${RM} -f /var/couriersslcache
+	${RM} -f @VARBASE@/couriersslcache
 	;;
 esac
diff --git a/mail/courier-imap/DESCR b/mail/courier-imap/DESCR
index 36913a71e03..d89b3fd7d32 100644
--- a/mail/courier-imap/DESCR
+++ b/mail/courier-imap/DESCR
@@ -1,13 +1,13 @@
-Courier-IMAP is a server that provides IMAP access to Maildirs. This IMAP
+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.
+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.
+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.
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 36676cf8aa7..0387f7e64fe 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.29 2004/05/12 23:40:12 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2004/07/14 20:07:16 jlam Exp $
 
-DISTNAME=	courier-imap-2.2.1
-PKGREVISON=	1
+DISTNAME=	courier-imap-3.0.5
 
-COMMENT=	IMAP server for access to Maildir-style mailboxes
+COMMENT=	IMAP server for access to maildir-style mailboxes
 HOMEPAGE=	http://www.inter7.com/courierimap/
 
 DEPENDS+=	courier-auth>=${BASE_VERS}:../../mail/courier-auth
-DEPENDS+=	courier-maildirmake>=${BASE_VERS}:../../mail/courier-maildirmake
+DEPENDS+=	courier-maildir>=${BASE_VERS}:../../mail/courier-maildir
 
 USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
-USE_PERL5=		yes
-REPLACE_PERL=		sysconftool
+USE_PERL5=		build
 
 USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
@@ -24,10 +22,8 @@ CONFIGURE_ENV+=		OPENSSL=${SSLBASE}/bin/openssl
 
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 
-SYSCONFTOOL=		${PREFIX}/sbin/imapd.sysconftool
 GEN_FILES=		imapd imapd-ssl pop3d pop3d-ssl
 SSLCNF_FILES=		imapd.cnf pop3d.cnf
-FILES_SUBST+=		SYSCONFTOOL=${SYSCONFTOOL:Q}
 FILES_SUBST+=		SSLCERTS=${SSLCERTS}
 FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
 
@@ -66,10 +62,9 @@ pre-configure:
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
-	${INSTALL_DATA} ${WRKSRC}/imap/BUGS ${DOCDIR}/BUGS.imap
-	${INSTALL_DATA} ${WRKSRC}/imap/README ${DOCDIR}/README.imap
+	${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}
 
diff --git a/mail/courier-imap/PLIST b/mail/courier-imap/PLIST
index a58fd26809d..d93288e5b42 100644
--- a/mail/courier-imap/PLIST
+++ b/mail/courier-imap/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2004/04/23 22:07:54 reed Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/07/14 20:07:16 jlam Exp $
 bin/couriertls
 bin/imapd
 bin/pop3d
-libexec/courier/courierlogger
 libexec/courier/couriertcpd
 libexec/courier/imapd-ssl.rc
 libexec/courier/imapd.rc
@@ -12,15 +11,14 @@ man/man1/couriertcpd.1
 man/man8/courier-imapd.8
 man/man8/mkimapdcert.8
 man/man8/mkpop3dcert.8
-sbin/imapd.sysconftool
 sbin/imaplogin
 sbin/mkimapdcert
 sbin/mkpop3dcert
 sbin/pop3login
 share/courier/mkimapdcert
 share/courier/mkpop3dcert
-share/doc/courier/BUGS.imap
-share/doc/courier/README.imap
+share/doc/courier/imap/BUGS
+share/doc/courier/imap/README
 share/examples/courier/imapd-ssl.dist
 share/examples/courier/imapd.authpam
 share/examples/courier/imapd.cnf
@@ -30,6 +28,7 @@ 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}
+@dirrm share/doc/courier/imap
 @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 2>/dev/null || ${TRUE}
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index 6d7fa1d5065..6eb1d7604e7 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.10 2004/02/22 03:13:07 jlam Exp $
+$NetBSD: distinfo,v 1.11 2004/07/14 20:07:16 jlam Exp $
 
-SHA1 (courier-imap-2.2.1.tar.bz2) = c5bf64c07509745730ec002468f5bba76d8a0b7d
-Size (courier-imap-2.2.1.tar.bz2) = 1342879 bytes
-SHA1 (patch-aa) = 811da9525943f64286c6f8f18670b35f7d2ea03f
-SHA1 (patch-ab) = d2aab90ab745e502e588474517d6233b2e94e1bb
+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) = 41f3b00426ea630d1bb6d243cacda842d14a3b3b
-SHA1 (patch-af) = f28470abe1a269e86eb21459b1d9a5de6989fe11
-SHA1 (patch-ag) = 9123600cd875b18523c78786fc62ac1c8dea910b
-SHA1 (patch-ah) = 6615aba99c62cc459fdbcadb230f70f916e7178d
+SHA1 (patch-ae) = 5d240e3d4e239eb146da1a41c3fb560c2ab158e2
+SHA1 (patch-af) = feed1d40f9e5eabb06b5a9937ffaaf38784990b4
+SHA1 (patch-ag) = 053807924b94d05832166449b0f33484be0ad7cf
+SHA1 (patch-ah) = be0636cd9a790bda8b76def53a460913b85ddfd1
+SHA1 (patch-ai) = f8c091fd095d36b665fa5afb5f8e0d8420f5cdcf
+SHA1 (patch-aj) = 92bf04ce239fe0a07745c728d6670e29f3f44c8d
diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
index d45d510d369..a5a6f3c1403 100755
--- a/mail/courier-imap/files/courierimap.sh
+++ b/mail/courier-imap/files/courierimap.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimap.sh,v 1.8 2004/02/24 01:18:52 jlam Exp $
+# $NetBSD: courierimap.sh,v 1.9 2004/07/14 20:07:16 jlam Exp $
 #
 # Courier IMAP services daemon
 #
@@ -17,6 +17,7 @@ command="@PREFIX@/libexec/courier/couriertcpd"
 ctl_command="@PREFIX@/libexec/courier/imapd.rc"
 pidfile="/var/run/imapd.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
+required_vars="authdaemond"
 
 start_cmd="courier_doit start"
 stop_cmd="courier_doit stop"
@@ -26,6 +27,19 @@ courier_doit()
 	action=$1
 	case ${action} in
 	start)
+		for _f in $required_vars; do
+			eval _value=\$${_f}
+			case $_value in
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+				;;
+			*)
+				@ECHO@ 1>&2 "$0: WARNING: \$${_f} is not set"
+				if [ -z $rc_force ]; then
+					return 1
+				fi
+				;;
+			esac
+		done
 		for f in $required_files; do
 			if [ ! -r "$f" ]; then
 				@ECHO@ "$0: WARNING: $f is not readable"
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
index 4a15b0c4d57..d24883ce014 100755
--- a/mail/courier-imap/files/courierimaps.sh
+++ b/mail/courier-imap/files/courierimaps.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimaps.sh,v 1.8 2004/02/24 01:18:52 jlam Exp $
+# $NetBSD: courierimaps.sh,v 1.9 2004/07/14 20:07:16 jlam Exp $
 #
 # Courier IMAP/SSL services daemon
 #
@@ -18,6 +18,7 @@ ctl_command="@PREFIX@/libexec/courier/imapd-ssl.rc"
 pidfile="/var/run/imapd-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 required_files="${required_files} @SSLCERTS@/imapd.pem"
+required_vars="authdaemond"
 
 start_cmd="courier_doit start"
 stop_cmd="courier_doit stop"
@@ -27,6 +28,19 @@ courier_doit()
 	action=$1
 	case ${action} in
 	start)
+		for _f in $required_vars; do
+			eval _value=\$${_f}
+			case $_value in
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+				;;
+			*)
+				@ECHO@ 1>&2 "$0: WARNING: \$${_f} is not set"
+				if [ -z $rc_force ]; then
+					return 1
+				fi
+				;;
+			esac
+		done
 		for f in $required_files; do
 			if [ ! -r "$f" ]; then
 				@ECHO@ "$0: WARNING: $f is not readable"
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
index 0965e3b5e50..20d67f63229 100755
--- a/mail/courier-imap/files/courierpop.sh
+++ b/mail/courier-imap/files/courierpop.sh
@@ -1,8 +1,8 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpop.sh,v 1.8 2004/02/24 01:18:52 jlam Exp $
+# $NetBSD: courierpop.sh,v 1.9 2004/07/14 20:07:16 jlam Exp $
 #
-# Courier POP services daemon
+# Courier POP3 services daemon
 #
 # PROVIDE: courierpop
 # REQUIRE: authdaemond
@@ -17,6 +17,7 @@ command="@PREFIX@/libexec/courier/couriertcpd"
 ctl_command="@PREFIX@/libexec/courier/pop3d.rc"
 pidfile="/var/run/pop3d.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
+required_vars="authdaemond"
 
 start_cmd="courier_doit start"
 stop_cmd="courier_doit stop"
@@ -26,6 +27,19 @@ courier_doit()
 	action=$1
 	case ${action} in
 	start)
+		for _f in $required_vars; do
+			eval _value=\$${_f}
+			case $_value in
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+				;;
+			*)
+				@ECHO@ 1>&2 "$0: WARNING: \$${_f} is not set"
+				if [ -z $rc_force ]; then
+					return 1
+				fi
+				;;
+			esac
+		done
 		for f in $required_files; do
 			if [ ! -r "$f" ]; then
 				@ECHO@ "$0: WARNING: $f is not readable"
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
index 50419c85fda..2939c9f5286 100755
--- a/mail/courier-imap/files/courierpops.sh
+++ b/mail/courier-imap/files/courierpops.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpops.sh,v 1.8 2004/02/24 01:18:52 jlam Exp $
+# $NetBSD: courierpops.sh,v 1.9 2004/07/14 20:07:16 jlam Exp $
 #
 # Courier POP3/SSL services daemon
 #
@@ -18,6 +18,7 @@ ctl_command="@PREFIX@/libexec/courier/pop3d-ssl.rc"
 pidfile="/var/run/pop3d-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 required_files="${required_files} @SSLCERTS@/pop3d.pem"
+required_vars="authdaemond"
 
 start_cmd="courier_doit start"
 stop_cmd="courier_doit stop"
@@ -27,6 +28,19 @@ courier_doit()
 	action=$1
 	case ${action} in
 	start)
+		for _f in $required_vars; do
+			eval _value=\$${_f}
+			case $_value in
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+				;;
+			*)
+				@ECHO@ 1>&2 "$0: WARNING: \$${_f} is not set"
+				if [ -z $rc_force ]; then
+					return 1
+				fi
+				;;
+			esac
+		done
 		for f in $required_files; do
 			if [ ! -r "$f" ]; then
 				@ECHO@ "$0: WARNING: $f is not readable"
diff --git a/mail/courier-imap/patches/patch-aa b/mail/courier-imap/patches/patch-aa
index 2d0a9e45b8f..38f6f3c064d 100644
--- a/mail/courier-imap/patches/patch-aa
+++ b/mail/courier-imap/patches/patch-aa
@@ -1,36 +1,40 @@
-$NetBSD: patch-aa,v 1.8 2004/02/22 03:13:07 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2004/07/14 20:07:16 jlam Exp $
 
---- Makefile.in.orig	Thu Nov 27 15:51:57 2003
-+++ Makefile.in
-@@ -137,9 +137,9 @@ SUBDIRS = numlib @DBSUBDIR@ soxwrap unic
- CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA)
+--- Makefile.in.orig	Fri Jun 11 21:38:19 2004
++++ Makefile.in	Tue Jul 13 20:33:19 2004
+@@ -140,12 +140,12 @@
+ 
+ 
+-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
  
--binPROGRAMS = imapd pop3d maildirmake deliverquota maildirkw
--sbinPROGRAMS = imaplogin pop3login userdbpw
--libexecPROGRAMS = makedatprog couriertcpd courierlogger
+-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
+-sbinPROGRAMS = authenumerate imaplogin pop3login userdbpw courierlogger
+-libexecPROGRAMS = makedatprog couriertcpd
 +binPROGRAMS = imapd pop3d
 +sbinPROGRAMS = imaplogin pop3login
-+libexecPROGRAMS = couriertcpd courierlogger
++libexecPROGRAMS = couriertcpd
  
  bin_PROGRAMS = @binPROGRAMS_exec@
-@@ -149,5 +149,5 @@ libexec_PROGRAMS = @libexecPROGRAMS_exec
+@@ -155,5 +155,5 @@
  EXTRA_PROGRAMS = 
  
--man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.1 deliverquota.8 maildirmake.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
+-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
  
  
-@@ -161,5 +161,5 @@ EXTRA_DIST = 00README.NOW.OR.SUFFER READ
+@@ -169,5 +169,5 @@
  
  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
-@@ -927,6 +927,6 @@ maildirkw.1: maildir/maildirkw.1
+@@ -980,6 +980,6 @@
  	cp $(srcdir)/maildir/maildirkw.1 .
  
 -imapd.8: imap/imapd.8
@@ -39,7 +43,7 @@ $NetBSD: patch-aa,v 1.8 2004/02/22 03:13:07 jlam Exp $
 +	cp imap/imapd.8 ./$@
  
  mkimapdcert: imap/mkimapdcert
-@@ -954,20 +954,9 @@ quotawarnmsg.example: maildir/quotawarnm
+@@ -1007,20 +1007,9 @@
  
  install-exec-local:
 -	$(mkinstalldirs) $(DESTDIR)$(libexecdir)/authlib
@@ -61,10 +65,14 @@ $NetBSD: patch-aa,v 1.8 2004/02/22 03:13:07 jlam Exp $
 +	for f in mkimapdcert mkpop3dcert ; \
  		do rm -f $(DESTDIR)$(sbindir)/$$f ; \
  		$(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
-@@ -975,28 +964,8 @@ install-exec-local:
+@@ -1028,34 +1017,8 @@
  
  install-exec-hook:
 -	chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
+-	mkdir -p $(DESTDIR)$(sysconfdir)/shared
+-	chmod 755 $(DESTDIR)$(sysconfdir)/shared
+-	mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
+-	chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
  
  # If authlib built authpam, install the PAM configuration file
  
@@ -73,9 +81,11 @@ $NetBSD: patch-aa,v 1.8 2004/02/22 03:13:07 jlam Exp $
 -		test "$$f" = "authpam" || continue ; \
 -		test -d $(DESTDIR)/etc/pam.d || continue ; \
 -		test -w $(DESTDIR)/etc/pam.d || continue ; \
--		$(INSTALL_DATA) $(srcdir)/imap/imapd.pam \
+-		test -f $(DESTDIR)/etc/pam.d/imap || \
+-			$(INSTALL_DATA) $(srcdir)/imap/imapd.pam \
 -			$(DESTDIR)/etc/pam.d/imap || exit 1 ;\
--		$(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
+-		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
diff --git a/mail/courier-imap/patches/patch-ab b/mail/courier-imap/patches/patch-ab
index 49c66352be5..bc2399f70db 100644
--- a/mail/courier-imap/patches/patch-ab
+++ b/mail/courier-imap/patches/patch-ab
@@ -1,13 +1,11 @@
-$NetBSD: patch-ab,v 1.4 2004/02/22 03:13:07 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2004/07/14 20:07:16 jlam Exp $
 
---- authlib/Makefile.in.orig	Sat Nov 15 10:58:55 2003
-+++ authlib/Makefile.in
-@@ -1279,7 +1279,7 @@ info: info-am
- 
+--- 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-ae b/mail/courier-imap/patches/patch-ae
index ff639dca9d4..f0398d9b354 100644
--- a/mail/courier-imap/patches/patch-ae
+++ b/mail/courier-imap/patches/patch-ae
@@ -1,14 +1,14 @@
-$NetBSD: patch-ae,v 1.4 2004/02/22 03:13:07 jlam Exp $
+$NetBSD: patch-ae,v 1.5 2004/07/14 20:07:17 jlam Exp $
 
---- imapd-ssl.rc.in.orig	Thu Nov 27 13:07:33 2003
-+++ imapd-ssl.rc.in
-@@ -34,18 +34,13 @@ start)
+--- 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
  
 -	if test -x ${libexecdir}/authlib/authdaemond
 -	then
--		@SETENV@ - ${libexecdir}/authlib/authdaemond start
+-		@SETENV@ - DEBUG_LOGIN="$DEBUG_LOGIN" ${libexecdir}/authlib/authdaemond start
 -	fi
 -
  	if test "$TLS_CACHEFILE" != ""
@@ -22,7 +22,7 @@ $NetBSD: patch-ae,v 1.4 2004/02/22 03:13:07 jlam Exp $
  		prefix=@prefix@ ;
  		exec_prefix=@exec_prefix@ ;
  		bindir=@bindir@ ;
-@@ -64,10 +59,6 @@ start)
+@@ -64,10 +59,6 @@
  	;;
  stop)
  	@libexecdir@/couriertcpd -pid=$SSLPIDFILE -stop
diff --git a/mail/courier-imap/patches/patch-af b/mail/courier-imap/patches/patch-af
index b4cab00767a..9955d352927 100644
--- a/mail/courier-imap/patches/patch-af
+++ b/mail/courier-imap/patches/patch-af
@@ -1,14 +1,14 @@
-$NetBSD: patch-af,v 1.4 2004/02/22 03:13:07 jlam Exp $
+$NetBSD: patch-af,v 1.5 2004/07/14 20:07:17 jlam Exp $
 
---- imapd.rc.in.orig	Thu Nov 27 13:07:34 2003
-+++ imapd.rc.in
-@@ -34,18 +34,13 @@ start)
+--- 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
  
 -	if test -x ${libexecdir}/authlib/authdaemond
 -	then
--		@SETENV@ - ${libexecdir}/authlib/authdaemond start
+-		@SETENV@ - DEBUG_LOGIN="$DEBUG_LOGIN" ${libexecdir}/authlib/authdaemond start
 -	fi
 -
  	if test "$TLS_CACHEFILE" != ""
@@ -22,7 +22,7 @@ $NetBSD: patch-af,v 1.4 2004/02/22 03:13:07 jlam Exp $
  			prefix=@prefix@ ;
  			exec_prefix=@exec_prefix@ ;
  			bindir=@bindir@ ;
-@@ -64,10 +59,6 @@ start)
+@@ -64,10 +59,6 @@
  	;;
  stop)
  	@libexecdir@/couriertcpd -pid=$PIDFILE -stop
diff --git a/mail/courier-imap/patches/patch-ag b/mail/courier-imap/patches/patch-ag
index 093495ddb46..0be4c917752 100644
--- a/mail/courier-imap/patches/patch-ag
+++ b/mail/courier-imap/patches/patch-ag
@@ -1,14 +1,14 @@
-$NetBSD: patch-ag,v 1.4 2004/02/22 03:13:07 jlam Exp $
+$NetBSD: patch-ag,v 1.5 2004/07/14 20:07:17 jlam Exp $
 
---- pop3d-ssl.rc.in.orig	Thu Nov 27 13:07:35 2003
-+++ pop3d-ssl.rc.in
-@@ -34,12 +34,7 @@ start)
+--- 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
  
 -	if test -x ${libexecdir}/authlib/authdaemond
 -	then
--		@SETENV@ - ${libexecdir}/authlib/authdaemond start
+-		@SETENV@ - DEBUG_LOGIN="$DEBUG_LOGIN" ${libexecdir}/authlib/authdaemond start
 -	fi
 -
 -	@SETENV@ - @SHELL@ -c " set -a ;
@@ -16,7 +16,7 @@ $NetBSD: patch-ag,v 1.4 2004/02/22 03:13:07 jlam Exp $
  		prefix=@prefix@ ;
  		exec_prefix=@exec_prefix@ ;
  		bindir=@bindir@ ;
-@@ -60,10 +55,6 @@ start)
+@@ -60,10 +55,6 @@
  	;;
  stop)
  	@libexecdir@/couriertcpd -pid=$SSLPIDFILE -stop
diff --git a/mail/courier-imap/patches/patch-ah b/mail/courier-imap/patches/patch-ah
index 728db9061f2..012a50a5cf7 100644
--- a/mail/courier-imap/patches/patch-ah
+++ b/mail/courier-imap/patches/patch-ah
@@ -1,14 +1,14 @@
-$NetBSD: patch-ah,v 1.3 2004/02/22 03:13:07 jlam Exp $
+$NetBSD: patch-ah,v 1.4 2004/07/14 20:07:17 jlam Exp $
 
---- pop3d.rc.in.orig	Thu Nov 27 13:07:35 2003
-+++ pop3d.rc.in
-@@ -33,12 +33,7 @@ start)
+--- 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
  
 -	if test -x ${libexecdir}/authlib/authdaemond
 -	then
--		@SETENV@ - ${libexecdir}/authlib/authdaemond start
+-		@SETENV@ - DEBUG_LOGIN="$DEBUG_LOGIN" ${libexecdir}/authlib/authdaemond start
 -	fi
 -
 -	@SETENV@ - @SHELL@ -c " set -a ;
@@ -16,7 +16,7 @@ $NetBSD: patch-ah,v 1.3 2004/02/22 03:13:07 jlam Exp $
  		prefix=@prefix@ ;
  		exec_prefix=@exec_prefix@ ;
  		bindir=@bindir@ ;
-@@ -57,10 +52,6 @@ start)
+@@ -57,10 +52,6 @@
  	;;
  stop)
  	@libexecdir@/couriertcpd -pid=$PIDFILE -stop
diff --git a/mail/courier-imap/patches/patch-ai b/mail/courier-imap/patches/patch-ai
new file mode 100644
index 00000000000..38624258e9f
--- /dev/null
+++ b/mail/courier-imap/patches/patch-ai
@@ -0,0 +1,24 @@
+$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
new file mode 100644
index 00000000000..b8d5262afa6
--- /dev/null
+++ b/mail/courier-imap/patches/patch-aj
@@ -0,0 +1,24 @@
+$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