Update Dovecot to 1.2.13.

This release fixes a bug in ACL plugin, which could be considered a security
bug: If Maildir is used with default settings (INBOX is same as Maildir root
dir) and user set some ACLs to INBOX, those ACLs were copied to all newly
created mailboxes. This should have been done only for "default ACLs", but with
Maildir the INBOX directory is the same as the default ACL directory, so this
mixup happened. This bug exists only in v1.2.x releases.

Other fixes:

- Fixed iconv() crash when it was processing several kilobytes of broken
  continuous input. This mainly could have caused a problem with IMAP SEARCH.
  Possibly also with some Sieve checks.
- If MIME encoded-words contained line feeds, Dovecot logged cache corruption
  errors.
- mbox: Renaming mailbox under newly created dir didn't move index directory.
- mbox: When generating envelope to From_-line, don't append a second
  @owndomain if username already has one.

3 files changed, 40 insertions, 10 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index d01cdb7961e..76d4492e0c9 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.149 2010/06/20 09:55:52 ghen Exp $
+# $NetBSD: Makefile,v 1.150 2010/07/25 22:17:19 ghen Exp $
 
 DOVECOT_VERSION=	1.2
-DOVECOT_SUBVERSION=	.12
+DOVECOT_SUBVERSION=	.13
 SIEVE_VERSION=		0.1.17
 MANAGESIEVE_VERSION=	0.11.11
 DISTNAME=		dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}
diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST
index 7f8c47b2d30..2732ce6e097 100644
--- a/mail/dovecot/PLIST
+++ b/mail/dovecot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2010/01/25 12:31:20 ghen Exp $
+@comment $NetBSD: PLIST,v 1.28 2010/07/25 22:17:20 ghen Exp $
 include/dovecot/config.h
 include/dovecot/src/auth/auth-cache.h
 include/dovecot/src/auth/auth-client-connection.h
@@ -356,15 +356,35 @@ share/doc/dovecot/wiki/Debugging.Authentication.txt
 share/doc/dovecot/wiki/Debugging.ProcessTracing.txt
 share/doc/dovecot/wiki/Debugging.Rawlog.txt
 share/doc/dovecot/wiki/Debugging.Thunderbird.txt
+share/doc/dovecot/wiki/Design.Arrays.txt
 share/doc/dovecot/wiki/Design.AuthProcess.txt
+share/doc/dovecot/wiki/Design.Buffers.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.InputStreams.txt
 share/doc/dovecot/wiki/Design.MailProcess.txt
+share/doc/dovecot/wiki/Design.Memory.txt
+share/doc/dovecot/wiki/Design.OutputStreams.txt
+share/doc/dovecot/wiki/Design.Plugins.txt
 share/doc/dovecot/wiki/Design.Processes.txt
+share/doc/dovecot/wiki/Design.Storage.ErrorHandling.txt
+share/doc/dovecot/wiki/Design.Storage.Mail.txt
+share/doc/dovecot/wiki/Design.Storage.MailNamespace.txt
+share/doc/dovecot/wiki/Design.Storage.MailStorage.txt
+share/doc/dovecot/wiki/Design.Storage.MailUser.txt
+share/doc/dovecot/wiki/Design.Storage.Mailbox.Save.txt
+share/doc/dovecot/wiki/Design.Storage.Mailbox.Search.txt
+share/doc/dovecot/wiki/Design.Storage.Mailbox.Sync.txt
+share/doc/dovecot/wiki/Design.Storage.Mailbox.Transaction.txt
+share/doc/dovecot/wiki/Design.Storage.Mailbox.txt
+share/doc/dovecot/wiki/Design.Storage.MailboxList.txt
+share/doc/dovecot/wiki/Design.Storage.Plugins.txt
+share/doc/dovecot/wiki/Design.Strings.txt
 share/doc/dovecot/wiki/Design.txt
+share/doc/dovecot/wiki/DomainLost.txt
 share/doc/dovecot/wiki/FindMailLocation.txt
 share/doc/dovecot/wiki/FinishBasicConfiguration.txt
 share/doc/dovecot/wiki/HowTo.EximAndDovecotSASL.txt
@@ -382,6 +402,8 @@ share/doc/dovecot/wiki/LDA.Indexing.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.CMU.txt
+share/doc/dovecot/wiki/LDA.Sieve.Dovecot.txt
 share/doc/dovecot/wiki/LDA.Sieve.txt
 share/doc/dovecot/wiki/LDA.txt
 share/doc/dovecot/wiki/Logging.txt
@@ -401,6 +423,11 @@ 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/ManageSieve.Clients.txt
+share/doc/dovecot/wiki/ManageSieve.Configuration.txt
+share/doc/dovecot/wiki/ManageSieve.Install.1.0.txt
+share/doc/dovecot/wiki/ManageSieve.Install.txt
+share/doc/dovecot/wiki/ManageSieve.Troubleshooting.txt
 share/doc/dovecot/wiki/ManageSieve.txt
 share/doc/dovecot/wiki/MboxLocking.txt
 share/doc/dovecot/wiki/MboxProblems.txt
@@ -446,6 +473,7 @@ share/doc/dovecot/wiki/Plugins.Virtual.txt
 share/doc/dovecot/wiki/Plugins.Zlib.txt
 share/doc/dovecot/wiki/Plugins.txt
 share/doc/dovecot/wiki/PostLoginScripting.txt
+share/doc/dovecot/wiki/PreAuth.txt
 share/doc/dovecot/wiki/QuickConfiguration.txt
 share/doc/dovecot/wiki/Quota.1.1.txt
 share/doc/dovecot/wiki/Quota.Dict.txt
@@ -479,7 +507,9 @@ 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/VarMailDotLock.txt
 share/doc/dovecot/wiki/Variables.txt
+share/doc/dovecot/wiki/VirtualUsers.Home.txt
 share/doc/dovecot/wiki/VirtualUsers.txt
 share/doc/dovecot/wiki/WhyDoesItNotWork.txt
 share/doc/dovecot/wiki/maildrop.txt
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index c4a250a83f9..be3da002861 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.111 2010/06/20 09:54:48 ghen Exp $
+$NetBSD: distinfo,v 1.112 2010/07/25 22:17:20 ghen Exp $
 
 SHA1 (dovecot-1.2-managesieve-0.11.11.tar.gz) = 53f8618a9e02f953912390a7b803eb6218bf969a
 RMD160 (dovecot-1.2-managesieve-0.11.11.tar.gz) = 161d143f5a42aee929abf51b62b3b0e6e7a9f07a
@@ -6,12 +6,12 @@ Size (dovecot-1.2-managesieve-0.11.11.tar.gz) = 439239 bytes
 SHA1 (dovecot-1.2-sieve-0.1.17.tar.gz) = 420142a8438d76e3849727c3ab4bde5a5b7fb7e4
 RMD160 (dovecot-1.2-sieve-0.1.17.tar.gz) = 7b53742c7388bf27521a46b8e1121f45a764df87
 Size (dovecot-1.2-sieve-0.1.17.tar.gz) = 1029070 bytes
-SHA1 (dovecot-1.2.12-managesieve-0.11.11.diff.gz) = f3719fc5427c97c65416658d73ff3234eaa204c9
-RMD160 (dovecot-1.2.12-managesieve-0.11.11.diff.gz) = 8f55a97e9a68e53faafa78a5f725969403f1f295
-Size (dovecot-1.2.12-managesieve-0.11.11.diff.gz) = 6455 bytes
-SHA1 (dovecot-1.2.12.tar.gz) = 72fedd20c00eb3763012555c3622f84286cb8e65
-RMD160 (dovecot-1.2.12.tar.gz) = 9a2ecf836607905acebee57d082b0b4c36108260
-Size (dovecot-1.2.12.tar.gz) = 2882517 bytes
+SHA1 (dovecot-1.2.13-managesieve-0.11.11.diff.gz) = 636b1bb4dbcfd9e82c93faf4e4fdf83e2dcee755
+RMD160 (dovecot-1.2.13-managesieve-0.11.11.diff.gz) = d26fa4db66c74d46fc562703f4493ee4d5a1b2a7
+Size (dovecot-1.2.13-managesieve-0.11.11.diff.gz) = 6463 bytes
+SHA1 (dovecot-1.2.13.tar.gz) = 8a6e12cc40df02083480f9e9eef57939a81fd7af
+RMD160 (dovecot-1.2.13.tar.gz) = 083dd4504dbf0e86187019853514811155c9087f
+Size (dovecot-1.2.13.tar.gz) = 2946123 bytes
 SHA1 (patch-aa) = 447e46268a93201b3ef22491ff0968752978d020
 SHA1 (patch-ab) = e5b5d72f0553da42d14ee05a9ed0faff8a6c7075
 SHA1 (patch-ac) = 5912392abb79df8e78de6f710c2a83264ee58fe7