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

8 files changed, 103 insertions, 47 deletions

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