Update to Dovecot 2.0.7.

* master: default_process_limit wasn't actually used anywhere,
  rather the default was unlimited. Now that it is enforced, you might
  notice that the default limit is too low and you need to increase it.
  Dovecot logs a warning when this happens.
* mail-log plugin: Log mailbox name as virtual name rather than
  physical name (e.g. namespace prefix is included in the name)

+ doveadm dump: Added imapzlib type to uncompress IMAP's
  COMPRESS DEFLATE I/O traffic (e.g. from rawlog).
- IMAP: Fixed LIST-STATUS when listing subscriptions with
  subscriptions=no namespaces.
- IMAP: Fixed SELECT QRESYNC not to crash on mailbox close if a lot of
  changes were being sent.
- quota: Don't count virtual mailboxes in quota
- doveadm expunge didn't always actually do the physical expunging
- Fixed some index reading optimizations introduced by v2.0.5.
- LMTP proxying fixes

3 files changed, 16 insertions, 15 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 408ee1eaf7c..8bf9c596bbd 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/11/09 15:23:11 ghen Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/09 15:35:47 ghen Exp $
 
 DOVECOT_VERSION=	2.0
-DOVECOT_SUBVERSION=	.6
+DOVECOT_SUBVERSION=	.7
 SIEVE_VERSION=		0.2.1
 DISTNAME=		dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}
 CATEGORIES=		mail
@@ -53,7 +53,7 @@ SUBST_FILES.egdir=	doc/example-config/Makefile.in
 SUBST_FILES.egdir+=	doc/example-config/conf.d/Makefile.in
 SUBST_FILES.egdir+=	src/config/Makefile.in
 SUBST_STAGE.egdir=	pre-configure
-SUBST_SED.egdir=	-e 's,^exampledir = .*/example-config,exampledir = $(PREFIX)/share/examples/dovecot,'
+SUBST_SED.egdir=	-e 's,^exampledir = .*/example-config,exampledir = ${PREFIX}/share/examples/dovecot,'
 
 EGDIR=			${PREFIX}/share/examples/dovecot
 
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index 8635f9c1617..ca359c55cfb 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/11/09 15:35:47 ghen Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -319,9 +319,9 @@ include/dovecot/utc-offset.h
 include/dovecot/var-expand.h
 include/dovecot/wildcard-match.h
 include/dovecot/write-full.h
-@pkgdir lib/dovecot/auth
 lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la
+lib/dovecot/doveadm/lib10_doveadm_zlib_plugin.la
 lib/dovecot/dovecot-config
 lib/dovecot/lib01_acl_plugin.la
 lib/dovecot/lib02_imap_acl_plugin.la
@@ -429,6 +429,7 @@ share/doc/dovecot/wiki/BasicConfiguration.txt
 share/doc/dovecot/wiki/Chrooting.txt
 share/doc/dovecot/wiki/Clients.NegativeUIDs.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
@@ -437,7 +438,6 @@ 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.Dsync.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
@@ -463,7 +463,6 @@ 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/Director.txt
 share/doc/dovecot/wiki/DomainLost.txt
 share/doc/dovecot/wiki/FindMailLocation.txt
 share/doc/dovecot/wiki/FinishBasicConfiguration.txt
@@ -475,24 +474,25 @@ share/doc/dovecot/wiki/HowTo.Rootless.txt
 share/doc/dovecot/wiki/HowTo.SimpleVirtualInstall.txt
 share/doc/dovecot/wiki/HowTo.txt
 share/doc/dovecot/wiki/IndexFiles.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.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/LMTP.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.mbox.txt
 share/doc/dovecot/wiki/MailLocation.txt
 share/doc/dovecot/wiki/MailboxFormat.Cydir.txt
 share/doc/dovecot/wiki/MailboxFormat.MH.txt
@@ -537,6 +537,7 @@ share/doc/dovecot/wiki/PasswordDatabase.Shadow.txt
 share/doc/dovecot/wiki/PasswordDatabase.txt
 share/doc/dovecot/wiki/PerformanceTuning.txt
 share/doc/dovecot/wiki/Plugins.Autocreate.txt
+share/doc/dovecot/wiki/Plugins.Convert.txt
 share/doc/dovecot/wiki/Plugins.Expire.txt
 share/doc/dovecot/wiki/Plugins.FTS.Lucene.txt
 share/doc/dovecot/wiki/Plugins.FTS.Solr.txt
@@ -553,7 +554,7 @@ 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.Configuration.txt
+share/doc/dovecot/wiki/Quota.1.1.txt
 share/doc/dovecot/wiki/Quota.Dict.txt
 share/doc/dovecot/wiki/Quota.Dirsize.txt
 share/doc/dovecot/wiki/Quota.FS.txt
@@ -578,7 +579,6 @@ share/doc/dovecot/wiki/TimeMovedBackwards.txt
 share/doc/dovecot/wiki/Upgrading.1.0.txt
 share/doc/dovecot/wiki/Upgrading.1.1.txt
 share/doc/dovecot/wiki/Upgrading.1.2.txt
-share/doc/dovecot/wiki/Upgrading.2.0.txt
 share/doc/dovecot/wiki/Upgrading.txt
 share/doc/dovecot/wiki/UserDatabase.ExtraFields.txt
 share/doc/dovecot/wiki/UserDatabase.NSS.txt
@@ -623,3 +623,4 @@ share/examples/dovecot/dovecot-sql.conf.ext
 share/examples/dovecot/dovecot.conf
 share/examples/dovecot/mkcert.sh
 share/examples/rc.d/dovecot
+@pkgdir lib/dovecot/auth
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 31b9a126dec..5a9dc7b58e5 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2010/11/09 15:23:11 ghen Exp $
+$NetBSD: distinfo,v 1.3 2010/11/09 15:35:47 ghen Exp $
 
 SHA1 (dovecot-2.0-pigeonhole-0.2.1.tar.gz) = ef06d157302576a9276c8f1181a3c5de018e2f36
 RMD160 (dovecot-2.0-pigeonhole-0.2.1.tar.gz) = a3cd58c13c3de33e6941c94633c580af4406ad85
 Size (dovecot-2.0-pigeonhole-0.2.1.tar.gz) = 1195090 bytes
-SHA1 (dovecot-2.0.6.tar.gz) = 70b4f58d00f6c5e6e0a129544119c88c13db62d5
-RMD160 (dovecot-2.0.6.tar.gz) = a41f0b774f3f11a28587f6f9e6a134cc4dd958a6
-Size (dovecot-2.0.6.tar.gz) = 3155389 bytes
+SHA1 (dovecot-2.0.7.tar.gz) = 3aab6cee878bd02e364aebcb70741bf1e4affc0d
+RMD160 (dovecot-2.0.7.tar.gz) = b284c99630935e87b124f48f132970a14737c985
+Size (dovecot-2.0.7.tar.gz) = 3174912 bytes
 SHA1 (patch-aa) = 3f85e3858f451413e07e73916e654cfe81188551
 SHA1 (patch-ab) = 43361741cf68d1ad5d6e1073cfb9746acf497868
 SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6