Update to dovecot-1.0rc23. From the release announcement mail:

Documentation is probably the only important thing left before v1.0.

	* deliver doesn't ever exit with Dovecot's internal exit codes anymore.
	  All its internal exit codes are changed to EX_TEMPFAIL.
	* mbox: X-Delivery-ID header is now dropped when saving mails.
	* mbox: If pop3_uidl_format=%m, we generate a unique X-Delivery-ID
	  header when saving mails to make sure the UIDL is unique.

	+ PAM: blocking=yes in args uses an alternative way to do PAM checks.
	  Try it if you're having problems with PAM.
	+ userdb passwd: blocking=yes in args makes the userdb lookups be done
	  in auth worker processes. Set it if you're doing remote NSS lookups
	  (eg. nss_ldap problems are fixed by this).
	+ If PAM child process hasn't responded in two minutes, send KILL
	  signal to it (only with blocking=no)
	- IMAP: APPEND ate all CPU while waiting for more data from the client
	  (broken in rc22)
	- mbox: Broken X-UID headers assert-crashed sometimes
	- mbox: When saving a message to an empty mbox file it got an UID
	  which immediately got incremented.
	- mbox: Fixed some wrong "uid-last unexpectedly lost" errors.
	- auth cache: In some situations we crashed if passdb had extra_fields.
	- auth cache: Special extra_fields weren't saved to auth cache.
	  For example allow_nets restrictions were ignored for cached entries.
	- A lot of initial login processes could cause auth socket errors
	  in log file at startup, if dovecot-auth started slowly. Now the
	  login processes are started only after dovecot-auth has finished
	  initializing itself.
	- imap/pop3 proxy: Don't crash if the remote server disconnects before
	  we're logged in.
	- deliver: Don't bother trying to save the mail twice into the default
	  mailbox (eg. if it's over quota).
	- mmap_disable=yes + non-Linux was really slow with large
	  dovecot.index.cache files
	- MySQL couldn't be used as a masterdb
	- Trash plugin was more or less broken
	- imap/pop3 couldn't load plugins if they chrooted
	- imap/pop3-login process could crash in some conditions
	- checkpassword-reply crashed if USER/HOME wasn't set

4 files changed, 26 insertions, 29 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 48316a4ac50..241c0795f89 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2007/02/07 08:42:50 ghen Exp $
+# $NetBSD: Makefile,v 1.85 2007/02/21 09:53:05 ghen Exp $
 
-DISTNAME=		dovecot-1.0.rc22
+DISTNAME=		dovecot-1.0.rc23
 PKGNAME=		${DISTNAME:S/.rc/rc/}
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/
diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST
index 7ff18124f69..946f00e25a3 100644
--- a/mail/dovecot/PLIST
+++ b/mail/dovecot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/01/22 17:58:50 ghen Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/02/21 09:53:05 ghen Exp $
 lib/dovecot/imap/lib01_acl_plugin.so
 lib/dovecot/imap/lib02_lazy_expunge_plugin.so
 lib/dovecot/imap/lib10_quota_plugin.so
@@ -37,13 +37,6 @@ sbin/dovecot
 sbin/dovecotpw
 share/doc/dovecot/USE-WIKI-INSTEAD
 share/doc/dovecot/auth-protocol.txt
-share/doc/dovecot/auth.txt
-share/doc/dovecot/configuration.txt
-share/doc/dovecot/design.txt
-share/doc/dovecot/index.txt
-share/doc/dovecot/mail-storages.txt
-share/doc/dovecot/multiaccess.txt
-share/doc/dovecot/nfs.txt
 share/doc/dovecot/securecoding.txt
 share/doc/dovecot/variables.txt
 share/examples/dovecot/dovecot-ldap.conf
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index f5243e1b5bf..df73c576763 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.56 2007/02/07 08:42:50 ghen Exp $
+$NetBSD: distinfo,v 1.57 2007/02/21 09:53:05 ghen Exp $
 
-SHA1 (dovecot-1.0.rc22.tar.gz) = 966d5f1e251f63f21633666e6a65402e4129fc22
-RMD160 (dovecot-1.0.rc22.tar.gz) = e0fdb65d668f5fdaedd10d4359bd2bf3e42728d2
-Size (dovecot-1.0.rc22.tar.gz) = 1501122 bytes
+SHA1 (dovecot-1.0.rc23.tar.gz) = 206a275cc109ab5528cfe3761409b539e762b7e4
+RMD160 (dovecot-1.0.rc23.tar.gz) = 67c8622f957698bd017828c54bd59341c4a30cc9
+Size (dovecot-1.0.rc23.tar.gz) = 1496678 bytes
 SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
-SHA1 (patch-ab) = 7a6441459bcf6d291d9fef7d99f46e825283f673
+SHA1 (patch-ab) = d67be516e7b5071550b6e762841b235dda1fa324
 SHA1 (patch-ag) = bd180441a0983ceccc898024370a3bdefdc11b1f
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index dfe615fea2a..0888b88a433 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.18 2006/11/08 14:40:20 ghen Exp $
+$NetBSD: patch-ab,v 1.19 2007/02/21 09:53:05 ghen Exp $
 
---- dovecot-example.conf.orig	2006-11-05 18:14:37.000000000 +0100
+--- dovecot-example.conf.orig	2007-02-19 21:17:46.000000000 +0100
 +++ dovecot-example.conf
 @@ -7,17 +7,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.18 2006/11/08 14:40:20 ghen Exp $
  
  # IP or host address where to listen in for connections. It's not currently
  # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
-@@ -81,7 +78,7 @@
+@@ -82,7 +79,7 @@
  #ssl_listen =
  
  # Disable SSL/TLS support.
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.18 2006/11/08 14:40:20 ghen Exp $
  
  # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
  # dropping root privileges, so keep the key file unreadable by anyone but
-@@ -480,19 +477,19 @@
+@@ -487,19 +484,19 @@
  
  protocol imap {
    # Login executable location.
@@ -55,7 +55,7 @@ $NetBSD: patch-ab,v 1.18 2006/11/08 14:40:20 ghen Exp $
  
    # Maximum IMAP command line length in bytes. Some clients generate very long
    # command lines with huge mailboxes, so you may need to raise this if you get
-@@ -502,7 +499,7 @@ protocol imap {
+@@ -509,7 +506,7 @@ protocol imap {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -64,7 +64,7 @@ $NetBSD: patch-ab,v 1.18 2006/11/08 14:40:20 ghen Exp $
  
    # Send IMAP capabilities in greeting message. This makes it unnecessary for
    # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -545,11 +542,11 @@ protocol imap {
+@@ -552,11 +549,11 @@ protocol imap {
  
  protocol pop3 {
    # Login executable location.
@@ -78,7 +78,7 @@ $NetBSD: patch-ab,v 1.18 2006/11/08 14:40:20 ghen Exp $
  
    # Don't try to set mails non-recent or seen with POP3 sessions. This is
    # mostly intended to reduce disk I/O. With maildir it doesn't move files
-@@ -608,7 +605,7 @@ protocol pop3 {
+@@ -616,7 +613,7 @@ protocol pop3 {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -87,7 +87,7 @@ $NetBSD: patch-ab,v 1.18 2006/11/08 14:40:20 ghen Exp $
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -636,10 +633,10 @@ protocol lda {
+@@ -644,10 +641,10 @@ protocol lda {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -100,7 +100,7 @@ $NetBSD: patch-ab,v 1.18 2006/11/08 14:40:20 ghen Exp $
  
    # UNIX socket path to master authentication server to find users.
    #auth_socket_path = /var/run/dovecot/auth-master
-@@ -650,7 +647,7 @@ protocol lda {
+@@ -658,7 +655,7 @@ protocol lda {
  ##
  
  # Executable location
@@ -109,16 +109,16 @@ $NetBSD: patch-ab,v 1.18 2006/11/08 14:40:20 ghen Exp $
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -765,7 +762,7 @@ auth default {
+@@ -772,7 +769,7 @@ auth default {
    # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
    # authentication to actually work.
    # http://wiki.dovecot.org/PasswordDatabase/PAM
 -  passdb pam {
 +  #passdb pam {
-     #  [session=yes] [setcred=yes] [cache_key=<key>] [<service name>]
+     # [blocking=yes] [session=yes] [setcred=yes]
+     # [cache_key=<key>] [<service name>]
      #
-     # session=yes makes Dovecot open and immediately close PAM session. Some
-@@ -793,14 +790,14 @@ auth default {
+@@ -805,18 +802,18 @@ auth default {
      #   args = session=yes *
      #   args = cache_key=%u dovecot
      #args = dovecot
@@ -130,8 +130,12 @@ $NetBSD: patch-ab,v 1.18 2006/11/08 14:40:20 ghen Exp $
    # configured in /etc/nsswitch.conf.
    # http://wiki.dovecot.org/AuthDatabase/Passwd
 -  #passdb passwd {
--  #}
 +  passdb passwd {
+     # [blocking=yes] - By default the lookups are done in the main dovecot-auth
+     # process. This setting causes the lookups to be done in auth worker
+     # proceses. Useful with remote NSS lookups that may block.
+     #args = 
+-  #}
 +  }
  
    # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays.