Changes 2.2.21:

- doveadm mailbox list (and some others) were broken in v2.2.20
- director: Fixed making backend changes when running with only a
  single director server.
- virtual plugin: Fixed crash when trying to open nonexistent
  autocreated backend mailbox.

4 files changed, 16 insertions, 10 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 49d1d57e0ae..f68b8dc914d 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.80 2015/10/17 07:45:43 adam Exp $
+# $NetBSD: Makefile,v 1.81 2015/12/27 12:36:37 adam Exp $
 #
 # when updating to a new release, update ABI depends in
 # the buildlink3.mk file as well, since the plugins' version
 # must match (see PR 49563).
 
-DISTNAME=	dovecot-2.2.19
+DISTNAME=	dovecot-2.2.21
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
 
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index f679539594d..e17a09aa9dd 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2015/10/17 07:45:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.42 2015/12/27 12:36:37 adam Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -120,7 +120,9 @@ include/dovecot/fts-filter.h
 include/dovecot/fts-icu.h
 include/dovecot/fts-indexer.h
 include/dovecot/fts-language.h
+include/dovecot/fts-library.h
 include/dovecot/fts-parser.h
+include/dovecot/fts-storage.h
 include/dovecot/fts-tokenizer-generic-private.h
 include/dovecot/fts-tokenizer-private.h
 include/dovecot/fts-tokenizer.h
@@ -273,6 +275,7 @@ include/dovecot/login-proxy-state.h
 include/dovecot/login-proxy.h
 include/dovecot/login-settings.h
 include/dovecot/macros.h
+include/dovecot/mail-autoexpunge.h
 include/dovecot/mail-cache-private.h
 include/dovecot/mail-cache.h
 include/dovecot/mail-copy.h
@@ -831,6 +834,7 @@ 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.Count.txt
 share/doc/dovecot/wiki/Quota.Dict.txt
 share/doc/dovecot/wiki/Quota.Dirsize.txt
 share/doc/dovecot/wiki/Quota.FS.txt
@@ -882,6 +886,8 @@ share/doc/dovecot/wiki/uw2dovecot.sh.txt
 share/dovecot/stopwords/stopwords_en.txt
 share/dovecot/stopwords/stopwords_fi.txt
 share/dovecot/stopwords/stopwords_fr.txt
+share/dovecot/stopwords/stopwords_no.txt
+share/dovecot/stopwords/stopwords_sv.txt
 share/examples/dovecot/conf.d/10-auth.conf
 share/examples/dovecot/conf.d/10-director.conf
 share/examples/dovecot/conf.d/10-logging.conf
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
index ef2884fe913..dc1f47c3d10 100644
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2015/10/17 07:45:43 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2015/12/27 12:36:37 adam Exp $
 
 BUILDLINK_TREE+=	dovecot
 
@@ -7,7 +7,7 @@ DOVECOT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.dovecot+=		dovecot>=2.2.0
 # must match current package version for plugins to load
-BUILDLINK_ABI_DEPENDS.dovecot+=		dovecot>=2.2.19
+BUILDLINK_ABI_DEPENDS.dovecot+=		dovecot>=2.2.21
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot2
 
 pkgbase:=	dovecot
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 8d4134d4210..e39e4c80dfd 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.60 2015/11/04 17:41:19 agc Exp $
+$NetBSD: distinfo,v 1.61 2015/12/27 12:36:37 adam Exp $
 
-SHA1 (dovecot-2.2.19.tar.gz) = cc748b72478d1670997ebb0796fd68f3f2d546be
-RMD160 (dovecot-2.2.19.tar.gz) = cb21bccf69c17e4188dc2834fb9ae11d42c638b8
-SHA512 (dovecot-2.2.19.tar.gz) = 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9
-Size (dovecot-2.2.19.tar.gz) = 5256627 bytes
+SHA1 (dovecot-2.2.21.tar.gz) = 1153fb7eb990053379b99821c7eaf5b63cd6818a
+RMD160 (dovecot-2.2.21.tar.gz) = 8de6d8ee180551156ae19b56c27678c43f774535
+SHA512 (dovecot-2.2.21.tar.gz) = 0d246d44e0c908ea40d324982fb279b19424ddcb642e51796078f600fc5bf530898d2fa387fcfd971d43758cff22590e5ea6918c31e9f4a63f13a8c525a23d9b
+Size (dovecot-2.2.21.tar.gz) = 4985686 bytes
 SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
 SHA1 (patch-ab) = d637a64feec8e4eafacda149cf0193aa1b70a054
 SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656