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

Probably one more RC after this.

	* Security fix: If zlib plugin was loaded, it was possible to open
	  gzipped mbox files outside the user's mail directory.

	+ Added auth_gssapi_hostname setting.
	- IMAP: LIST "" "" didn't return anything if there didn't exist a
	  namespace with empty prefix. This broke some clients.
	- If Dovecot is tried to be started when it's already running, don't
	  delete existing auth sockets and break the running Dovecot
	- If deliver failed too early it still returned exit code 89 instead
	  of EX_TEMPFAIL.
	- deliver: INBOX fallbacking with -n parameter wasn't working.
	- passdb passwd and shadow couldn't be used as master or deny databases
	- IDLE: inotify didn't notice changes in mbox file
	- If index file directory couldn't be created, disable indexes instead
	  of failing to open the mailbox.
	- Several other minor fixes

5 files changed, 156 insertions, 33 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 5d8de5eee1c..7a2dce103bf 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.90 2007/03/24 14:39:40 ghen Exp $
+# $NetBSD: Makefile,v 1.91 2007/03/30 19:10:38 ghen Exp $
 
-DISTNAME=		dovecot-1.0.rc28
+DISTNAME=		dovecot-1.0.rc29
 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 b05cc3513a7..17291cdaeb5 100644
--- a/mail/dovecot/PLIST
+++ b/mail/dovecot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2007/03/24 14:39:43 ghen Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/03/30 19:10:38 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,10 +37,133 @@ libexec/dovecot/rawlog
 libexec/dovecot/ssl-build-param
 sbin/dovecot
 sbin/dovecotpw
-share/doc/dovecot/USE-WIKI-INSTEAD
 share/doc/dovecot/auth-protocol.txt
+share/doc/dovecot/documentation.txt
 share/doc/dovecot/securecoding.txt
-share/doc/dovecot/variables.txt
+share/doc/dovecot/wiki/ACL.txt
+share/doc/dovecot/wiki/AixPluginsSupport.txt
+share/doc/dovecot/wiki/AuthDatabase.LDAP.txt
+share/doc/dovecot/wiki/AuthDatabase.Passwd.txt
+share/doc/dovecot/wiki/AuthDatabase.PasswdFile.txt
+share/doc/dovecot/wiki/AuthDatabase.SQL.txt
+share/doc/dovecot/wiki/AuthDatabase.VPopMail.txt
+share/doc/dovecot/wiki/AuthDatabase.txt
+share/doc/dovecot/wiki/Authentication.Kerberos.txt
+share/doc/dovecot/wiki/Authentication.MasterUsers.txt
+share/doc/dovecot/wiki/Authentication.Mechanisms.txt
+share/doc/dovecot/wiki/Authentication.MultipleDatabases.txt
+share/doc/dovecot/wiki/Authentication.PasswordSchemes.txt
+share/doc/dovecot/wiki/Authentication.RestrictAccess.txt
+share/doc/dovecot/wiki/Authentication.txt
+share/doc/dovecot/wiki/BasicConfiguration.txt
+share/doc/dovecot/wiki/Chrooting.txt
+share/doc/dovecot/wiki/Clients.txt
+share/doc/dovecot/wiki/CommandLine.txt
+share/doc/dovecot/wiki/CompilingSource.txt
+share/doc/dovecot/wiki/Debugging.Authentication.txt
+share/doc/dovecot/wiki/Debugging.ProcessTracing.txt
+share/doc/dovecot/wiki/Debugging.Thunderbird.txt
+share/doc/dovecot/wiki/Design.AuthProcess.txt
+share/doc/dovecot/wiki/Design.Indexes.Cache.txt
+share/doc/dovecot/wiki/Design.Indexes.MailIndexApi.txt
+share/doc/dovecot/wiki/Design.Indexes.MainIndex.txt
+share/doc/dovecot/wiki/Design.Indexes.TransactionLog.txt
+share/doc/dovecot/wiki/Design.Indexes.txt
+share/doc/dovecot/wiki/Design.MailProcess.txt
+share/doc/dovecot/wiki/Design.Processes.txt
+share/doc/dovecot/wiki/Design.txt
+share/doc/dovecot/wiki/FindMailLocation.txt
+share/doc/dovecot/wiki/FinishBasicConfiguration.txt
+share/doc/dovecot/wiki/InetdInstall.txt
+share/doc/dovecot/wiki/Iptables.txt
+share/doc/dovecot/wiki/LDA.Exim.txt
+share/doc/dovecot/wiki/LDA.Postfix.txt
+share/doc/dovecot/wiki/LDA.Qmail.txt
+share/doc/dovecot/wiki/LDA.Sendmail.txt
+share/doc/dovecot/wiki/LDA.Sieve.txt
+share/doc/dovecot/wiki/LDA.txt
+share/doc/dovecot/wiki/Logging.txt
+share/doc/dovecot/wiki/LoginProcess.txt
+share/doc/dovecot/wiki/MDA.txt
+share/doc/dovecot/wiki/MTA.txt
+share/doc/dovecot/wiki/MailLocation.LocalDisk.txt
+share/doc/dovecot/wiki/MailLocation.Maildir.txt
+share/doc/dovecot/wiki/MailLocation.Mbox.txt
+share/doc/dovecot/wiki/MailLocation.SharedDisk.txt
+share/doc/dovecot/wiki/MailLocation.txt
+share/doc/dovecot/wiki/MailboxFormat.MH.txt
+share/doc/dovecot/wiki/MailboxFormat.Maildir.txt
+share/doc/dovecot/wiki/MailboxFormat.dbox.txt
+share/doc/dovecot/wiki/MailboxFormat.mailstore.txt
+share/doc/dovecot/wiki/MailboxFormat.mbox.txt
+share/doc/dovecot/wiki/MailboxFormat.mbx.txt
+share/doc/dovecot/wiki/MailboxFormat.txt
+share/doc/dovecot/wiki/MboxLocking.txt
+share/doc/dovecot/wiki/MboxProblems.txt
+share/doc/dovecot/wiki/Migration.Courier.txt
+share/doc/dovecot/wiki/Migration.Cyrus.txt
+share/doc/dovecot/wiki/Migration.Linuxconf.txt
+share/doc/dovecot/wiki/Migration.MailFormat.txt
+share/doc/dovecot/wiki/Migration.UW.txt
+share/doc/dovecot/wiki/Migration.txt
+share/doc/dovecot/wiki/MissingMailboxes.txt
+share/doc/dovecot/wiki/NFS.txt
+share/doc/dovecot/wiki/Namespaces.txt
+share/doc/dovecot/wiki/OSCompatibility.txt
+share/doc/dovecot/wiki/POP3Server.txt
+share/doc/dovecot/wiki/PasswordDatabase.BSDAuth.txt
+share/doc/dovecot/wiki/PasswordDatabase.CheckPassword.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.AllowNets.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.Host.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.NoDelay.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.NoLogin.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.Proxy.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.User.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.txt
+share/doc/dovecot/wiki/PasswordDatabase.PAM.txt
+share/doc/dovecot/wiki/PasswordDatabase.Shadow.txt
+share/doc/dovecot/wiki/PasswordDatabase.txt
+share/doc/dovecot/wiki/PerformanceTuning.txt
+share/doc/dovecot/wiki/Plugins.Convert.txt
+share/doc/dovecot/wiki/Plugins.Expire.txt
+share/doc/dovecot/wiki/Plugins.Lazyexpunge.txt
+share/doc/dovecot/wiki/Plugins.MailLog.txt
+share/doc/dovecot/wiki/Plugins.Trash.txt
+share/doc/dovecot/wiki/Plugins.txt
+share/doc/dovecot/wiki/PopBSMTPAndDovecot.txt
+share/doc/dovecot/wiki/PopRelay.txt
+share/doc/dovecot/wiki/PostLoginScripting.txt
+share/doc/dovecot/wiki/PostfixAndDovecotSASL.txt
+share/doc/dovecot/wiki/QuickConfiguration.txt
+share/doc/dovecot/wiki/Quota.Dict.txt
+share/doc/dovecot/wiki/Quota.Dirsize.txt
+share/doc/dovecot/wiki/Quota.FS.txt
+share/doc/dovecot/wiki/Quota.Maildir.txt
+share/doc/dovecot/wiki/Quota.txt
+share/doc/dovecot/wiki/Rootless.txt
+share/doc/dovecot/wiki/RunningDovecot.txt
+share/doc/dovecot/wiki/SSL.CertificateClientImporting.txt
+share/doc/dovecot/wiki/SSL.CertificateCreation.txt
+share/doc/dovecot/wiki/SSL.DovecotConfiguration.txt
+share/doc/dovecot/wiki/SSL.txt
+share/doc/dovecot/wiki/Sasl.txt
+share/doc/dovecot/wiki/SecurityTuning.txt
+share/doc/dovecot/wiki/SharedMailboxes.txt
+share/doc/dovecot/wiki/SystemUsers.txt
+share/doc/dovecot/wiki/TestInstallation.txt
+share/doc/dovecot/wiki/TestPop3Installation.txt
+share/doc/dovecot/wiki/UpgradingDovecot.txt
+share/doc/dovecot/wiki/UserDatabase.ExtraFields.txt
+share/doc/dovecot/wiki/UserDatabase.Prefetch.txt
+share/doc/dovecot/wiki/UserDatabase.Static.txt
+share/doc/dovecot/wiki/UserDatabase.txt
+share/doc/dovecot/wiki/UserIds.txt
+share/doc/dovecot/wiki/Variables.txt
+share/doc/dovecot/wiki/VirtualUsers.txt
+share/doc/dovecot/wiki/WhyDoesItNotWork.txt
+share/doc/dovecot/wiki/maildrop.txt
+share/doc/dovecot/wiki/mutt.txt
+share/doc/dovecot/wiki/uw2dovecot.sh.txt
 share/examples/dovecot/dovecot-example.conf
 share/examples/dovecot/dovecot-ldap-example.conf
 share/examples/dovecot/dovecot-openssl.cnf
@@ -48,6 +171,7 @@ share/examples/dovecot/dovecot-sql-example.conf
 share/examples/dovecot/mkcert.sh
 share/examples/rc.d/dovecot
 @dirrm share/examples/dovecot
+@dirrm share/doc/dovecot/wiki
 @dirrm share/doc/dovecot
 @dirrm libexec/dovecot
 @dirrm lib/dovecot/pop3
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index b936b5cb8f4..76505ade3a0 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.62 2007/03/24 14:39:43 ghen Exp $
+$NetBSD: distinfo,v 1.63 2007/03/30 19:10:38 ghen Exp $
 
-SHA1 (dovecot-1.0.rc28.tar.gz) = bf7f98298905f53700b3f2abde8c60f9aa6ba035
-RMD160 (dovecot-1.0.rc28.tar.gz) = 7ea445c844d382115eb4fad651ff00d51dc58e9e
-Size (dovecot-1.0.rc28.tar.gz) = 1534090 bytes
+SHA1 (dovecot-1.0.rc29.tar.gz) = f090f6ceb22849da4fc255d21e99d303f537c237
+RMD160 (dovecot-1.0.rc29.tar.gz) = b09da68a67e951bf019ab077bf17ebbfd7e729a2
+Size (dovecot-1.0.rc29.tar.gz) = 1670673 bytes
 SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
-SHA1 (patch-ab) = fa56aebfba75bbba1fb6ce6c36222ce5f21e321d
-SHA1 (patch-ac) = 270dfe0c49ee20c63226dbaf6e2dbbe0fa949022
+SHA1 (patch-ab) = 51faa52bc035a2c7ef96a3166191166e47c03876
+SHA1 (patch-ac) = 0f1d45ba606736a437892c7cb141d02396744db5
 SHA1 (patch-ag) = bd180441a0983ceccc898024370a3bdefdc11b1f
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index b79a9300a5a..6d46f43083d 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.20 2007/03/24 14:39:44 ghen Exp $
+$NetBSD: patch-ab,v 1.21 2007/03/30 19:10:38 ghen Exp $
 
---- dovecot-example.conf.orig	2007-03-23 01:00:54.000000000 +0100
+--- dovecot-example.conf.orig	2007-03-30 13:36:18.000000000 +0200
 +++ dovecot-example.conf
-@@ -7,17 +7,14 @@
+@@ -10,17 +10,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
  
  # Default values are shown for each setting, it's not required to uncomment
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.20 2007/03/24 14:39:44 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.
-@@ -82,7 +79,7 @@
+@@ -85,7 +82,7 @@
  #ssl_listen =
  
  # Disable SSL/TLS support.
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.20 2007/03/24 14:39:44 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
-@@ -497,19 +494,19 @@
+@@ -498,19 +495,19 @@
  
  protocol imap {
    # Login executable location.
@@ -55,7 +55,7 @@ $NetBSD: patch-ab,v 1.20 2007/03/24 14:39:44 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
-@@ -519,7 +516,7 @@ protocol imap {
+@@ -520,7 +517,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.20 2007/03/24 14:39:44 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.
-@@ -562,11 +559,11 @@ protocol imap {
+@@ -563,11 +560,11 @@ protocol imap {
  
  protocol pop3 {
    # Login executable location.
@@ -78,7 +78,7 @@ $NetBSD: patch-ab,v 1.20 2007/03/24 14:39:44 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
-@@ -626,7 +623,7 @@ protocol pop3 {
+@@ -627,7 +624,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.20 2007/03/24 14:39:44 ghen Exp $
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -654,10 +651,10 @@ protocol lda {
+@@ -655,10 +652,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.20 2007/03/24 14:39:44 ghen Exp $
  
    # UNIX socket path to master authentication server to find users.
    #auth_socket_path = /var/run/dovecot/auth-master
-@@ -668,7 +665,7 @@ protocol lda {
+@@ -669,7 +666,7 @@ protocol lda {
  ##
  
  # Executable location
@@ -109,16 +109,16 @@ $NetBSD: patch-ab,v 1.20 2007/03/24 14:39:44 ghen Exp $
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -782,7 +779,7 @@ auth default {
+@@ -784,7 +781,7 @@ auth default {
+   # database (passwd usually), you can use static userdb.
    # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
-   # authentication to actually work.
-   # http://wiki.dovecot.org/PasswordDatabase/PAM
+   # authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt>
 -  passdb pam {
 +  #passdb pam {
      # [blocking=yes] [session=yes] [setcred=yes]
      # [cache_key=<key>] [<service name>]
      #
-@@ -815,16 +812,16 @@ auth default {
+@@ -817,15 +814,15 @@ auth default {
      #   args = session=yes *
      #   args = cache_key=%u dovecot
      #args = dovecot
@@ -127,8 +127,7 @@ $NetBSD: patch-ab,v 1.20 2007/03/24 14:39:44 ghen Exp $
  
    # /etc/passwd or similar, using getpwnam()
    # In many systems nowadays this uses Name Service Switch, which is
-   # configured in /etc/nsswitch.conf.
-   # http://wiki.dovecot.org/AuthDatabase/Passwd
+   # configured in /etc/nsswitch.conf. <doc/wiki/AuthDatabase.Passwd.txt>
 -  #passdb passwd {
 +  passdb passwd {
      # [blocking=yes] - See userdb passwd for explanation
@@ -137,4 +136,4 @@ $NetBSD: patch-ab,v 1.20 2007/03/24 14:39:44 ghen Exp $
 +  }
  
    # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays.
-   # http://wiki.dovecot.org/PasswordDatabase/Shadow
+   # <doc/wiki/PasswordDatabase.Shadow.txt>
diff --git a/mail/dovecot/patches/patch-ac b/mail/dovecot/patches/patch-ac
index a7d83705ce8..9df45d0af60 100644
--- a/mail/dovecot/patches/patch-ac
+++ b/mail/dovecot/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.5 2007/03/24 14:39:45 ghen Exp $
+$NetBSD: patch-ac,v 1.6 2007/03/30 19:10:38 ghen Exp $
 
---- doc/Makefile.in.orig	2007-03-23 21:40:01.000000000 +0100
+--- doc/Makefile.in.orig	2007-03-28 00:59:55.000000000 +0200
 +++ doc/Makefile.in
-@@ -180,9 +180,7 @@ target_alias = @target_alias@
- top_builddir = @top_builddir@
+@@ -193,9 +193,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ SUBDIRS = wiki
  confdir = $(sysconfdir)
 -conf_DATA = \
 -	dovecot-ldap-example.conf \
@@ -12,4 +12,4 @@ $NetBSD: patch-ac,v 1.5 2007/03/24 14:39:45 ghen Exp $
 +conf_DATA = 
  
  doc_DATA = \
- 	USE-WIKI-INSTEAD \
+ 	auth-protocol.txt \