Changes 2.0.11:

* dotlock_use_excl setting's default was accidentally "no" in all
  v2.0.x releases, instead of "yes" as in v1.1 and v1.2. Changed it
  back to "yes".
- v2.0.10: LDAP support was broken
- v2.0.10: dsyncing to remote often hanged (timed out in 15 mins)

Chamges 2.0.10:
* LMTP: For user+detail at domain deliveries, the +detail is again written
  to Delivered-To: header.
* Skip auth penalty checks from IPs in login_trusted_networks.
+ Added import_environment setting.
+ Added submission_host setting to send mails via SMTP instead of
  via sendmail binary.
+ Added doveadm acl get/set/delete commands for ACL manipulation,
  similar to how IMAP ACL extension works.
+ Added doveadm acl debug command to help debug and fix problems
  with why shared mailboxes aren't working as expected.
- IMAP: Fixed hangs with COMPRESS extension
- IMAP: Fixed a hang when trying to COPY to a nonexistent mailbox.
- IMAP: Fixed hang/crash with SEARCHRES + pipelining $.
- IMAP: Fixed assert-crash if IDLE+DONE is sent in same TCP packet.
- LMTP: Fixed sending multiple messages in a session.
- doveadm: Fixed giving parameters to mail commands.
- doveadm import: Settings weren't correctly used for the
  import storage.
- dsync: Fixed somewhat random failures with saving messages to
  remote dsync.
- v2.0.9: Config reload didn't notify running processes with
  shutdown_clients=no, so they could have kept serving new clients
  with old settings.

6 files changed, 16 insertions, 35 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 404badc512a..99bd89841c0 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2011/02/02 22:19:24 tron Exp $
+# $NetBSD: Makefile,v 1.8 2011/03/10 13:42:54 adam Exp $
 
-DISTNAME=		dovecot-2.0.9
-PKGREVISION=		1
+DISTNAME=		dovecot-2.0.11
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/2.0/
 
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index 188b40f3fd2..0b7a95f62ff 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2011/01/13 12:59:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/03/10 13:42:54 adam Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -319,6 +319,7 @@ include/dovecot/utc-offset.h
 include/dovecot/var-expand.h
 include/dovecot/wildcard-match.h
 include/dovecot/write-full.h
+lib/dovecot/doveadm/lib10_doveadm_acl_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_zlib_plugin.la
@@ -342,6 +343,7 @@ lib/dovecot/lib21_fts_squat_plugin.la
 lib/dovecot/lib30_imap_zlib_plugin.la
 lib/dovecot/libdovecot-lda.la
 lib/dovecot/libdovecot-login.la
+lib/dovecot/libdovecot-sql.la
 lib/dovecot/libdovecot-storage.la
 lib/dovecot/libdovecot.la
 libexec/dovecot/anvil
@@ -481,7 +483,6 @@ 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.txt
 share/doc/dovecot/wiki/LDA.txt
 share/doc/dovecot/wiki/LMTP.txt
 share/doc/dovecot/wiki/Logging.txt
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index ecb6621cf7a..928bffb46d8 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.7 2011/02/02 22:19:24 tron Exp $
+$NetBSD: distinfo,v 1.8 2011/03/10 13:42:54 adam Exp $
 
-SHA1 (dovecot-2.0.9.tar.gz) = 1cf5d331c770e09f47c7f98297f8af67e150cafa
-RMD160 (dovecot-2.0.9.tar.gz) = 3c6c430f867dba7fa4d9da33342892b3c631bac7
-Size (dovecot-2.0.9.tar.gz) = 3208677 bytes
-SHA1 (patch-aa) = b7e2923ead1ad1eacd3b8b1a37111325794135d2
+SHA1 (dovecot-2.0.11.tar.gz) = e79cce204d06a3cabf43dbeb4f0a9bc109d4d095
+RMD160 (dovecot-2.0.11.tar.gz) = e63234ad2c000f55b701ee2a27865c91b1d02beb
+Size (dovecot-2.0.11.tar.gz) = 3225716 bytes
+SHA1 (patch-aa) = 882f0c9fcf3acdfd2feaf7919309f770324f9843
 SHA1 (patch-ab) = 218948585c96492a832ea903f31a6f9ad9fc69f0
 SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6
-SHA1 (patch-ad) = c6f369392b2d71f70495e7e0171824594b2bbdbc
 SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
-SHA1 (patch-af) = 691cb36fcd5d71e1dea1812da5ed3e93a9ca029a
+SHA1 (patch-af) = 6d4b339898cba762243c1ff415e0fd09e3dec750
 SHA1 (patch-ah) = 13d7b1e84610c7a694e4b79888e8ebc3cee9ab79
 SHA1 (patch-aj) = 9e7970d29d11c097b9588ad16611f6d0e48235c2
diff --git a/mail/dovecot2/patches/patch-aa b/mail/dovecot2/patches/patch-aa
index 639f7db8775..f7b474580f6 100644
--- a/mail/dovecot2/patches/patch-aa
+++ b/mail/dovecot2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2010/11/09 15:51:48 ghen Exp $
+$NetBSD: patch-aa,v 1.4 2011/03/10 13:42:54 adam Exp $
 
 --- doc/example-config/Makefile.in.orig	2010-10-21 17:37:01.000000000 +0000
 +++ doc/example-config/Makefile.in
-@@ -280,7 +280,7 @@ top_srcdir = @top_srcdir@
+@@ -283,7 +283,7 @@ top_srcdir = @top_srcdir@
  SUBDIRS = conf.d
  pkgsysconfdir = $(sysconfdir)/dovecot
  nodist_pkgsysconf_DATA = README
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2010/11/09 15:51:48 ghen Exp $
  example_DATA = \
  	dovecot.conf \
  	dovecot-db.conf.ext \
-@@ -623,8 +623,7 @@ info: info-recursive
+@@ -626,8 +626,7 @@ info: info-recursive
  
  info-am:
  
diff --git a/mail/dovecot2/patches/patch-ad b/mail/dovecot2/patches/patch-ad
deleted file mode 100644
index 2c5a720f37d..00000000000
--- a/mail/dovecot2/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2011/02/02 22:19:25 tron Exp $
-
-Fix a hang when trying to COPY to a non existent mailbox via IMAP.
-Patch taken from here:
-
-http://hg.dovecot.org/dovecot-2.0/rev/826981b2c5c4
-
---- src/imap/cmd-copy.c.orig	2010-03-25 15:03:33.000000000 +0000
-+++ src/imap/cmd-copy.c	2011-02-02 22:10:21.000000000 +0000
-@@ -126,7 +126,7 @@
- 	case MAILBOX_NAME_NOINFERIORS:
- 		client_fail_mailbox_name_status(cmd, mailbox,
- 						"TRYCREATE", status);
--		return NULL;
-+		return TRUE;
- 	}
- 
- 	if (mailbox_equals(client->mailbox, dest_ns, storage_name))
diff --git a/mail/dovecot2/patches/patch-af b/mail/dovecot2/patches/patch-af
index 8914221bac0..c358e95b242 100644
--- a/mail/dovecot2/patches/patch-af
+++ b/mail/dovecot2/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2010/11/09 15:51:48 ghen Exp $
+$NetBSD: patch-af,v 1.4 2011/03/10 13:42:54 adam Exp $
 
 --- doc/example-config/conf.d/Makefile.in.orig	2010-11-04 14:32:20.000000000 +0000
 +++ doc/example-config/conf.d/Makefile.in
-@@ -237,7 +237,7 @@ top_build_prefix = @top_build_prefix@
+@@ -240,7 +240,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  pkgsysconfdir = $(sysconfdir)/dovecot