Changes 2.2.23:

This is a bugfix-only release with various important fixes on top of v2.2.22.
 - Various fixes to doveadm. Especially running commands via
   doveadm-server was broken.
 - director: Fixed user weakness getting stuck in some situations
 - director: Fixed a situation where directors keep re-sending
   different states to each others and never becoming synced.
 - director: Fixed assert-crash related to a slow "user killed" reply
 - Fixed assert-crash related to istream-concat, which could have
   been triggered at least by a Sieve script.

5 files changed, 45 insertions, 11 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index a35a210c78e..aecd73f8ac4 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.83 2016/03/05 11:27:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.84 2016/04/08 07:55:15 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.21
-PKGREVISION=	1
+DISTNAME=	dovecot-2.2.23
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
 
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index e17a09aa9dd..18024b9796d 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2015/12/27 12:36:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.43 2016/04/08 07:55:15 adam Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -29,10 +29,12 @@ include/dovecot/auth-master.h
 include/dovecot/auth-penalty.h
 include/dovecot/auth-postfix-connection.h
 include/dovecot/auth-request-handler.h
+include/dovecot/auth-request-stats.h
 include/dovecot/auth-request-var-expand.h
 include/dovecot/auth-request.h
 include/dovecot/auth-server-connection.h
 include/dovecot/auth-settings.h
+include/dovecot/auth-stats.h
 include/dovecot/auth-token.h
 include/dovecot/auth-worker-client.h
 include/dovecot/auth-worker-server.h
@@ -123,6 +125,7 @@ include/dovecot/fts-language.h
 include/dovecot/fts-library.h
 include/dovecot/fts-parser.h
 include/dovecot/fts-storage.h
+include/dovecot/fts-tokenizer-common.h
 include/dovecot/fts-tokenizer-generic-private.h
 include/dovecot/fts-tokenizer-private.h
 include/dovecot/fts-tokenizer.h
@@ -169,6 +172,9 @@ include/dovecot/imap-fetch.h
 include/dovecot/imap-id.h
 include/dovecot/imap-keepalive.h
 include/dovecot/imap-list.h
+include/dovecot/imap-login-client.h
+include/dovecot/imap-login-commands.h
+include/dovecot/imap-login-settings.h
 include/dovecot/imap-master-client.h
 include/dovecot/imap-match.h
 include/dovecot/imap-metadata.h
@@ -376,6 +382,7 @@ include/dovecot/message-date.h
 include/dovecot/message-decoder.h
 include/dovecot/message-header-decode.h
 include/dovecot/message-header-encode.h
+include/dovecot/message-header-hash.h
 include/dovecot/message-header-parser.h
 include/dovecot/message-id.h
 include/dovecot/message-parser.h
@@ -398,6 +405,7 @@ include/dovecot/notify-plugin.h
 include/dovecot/numpack.h
 include/dovecot/ostream-cmp.h
 include/dovecot/ostream-dot.h
+include/dovecot/ostream-escaped.h
 include/dovecot/ostream-failure-at.h
 include/dovecot/ostream-hash.h
 include/dovecot/ostream-metawrap.h
@@ -479,6 +487,7 @@ include/dovecot/sql-api-private.h
 include/dovecot/sql-api.h
 include/dovecot/sql-db-cache.h
 include/dovecot/ssl-proxy.h
+include/dovecot/stats-connection.h
 include/dovecot/stats-parser.h
 include/dovecot/stats.h
 include/dovecot/str-find.h
@@ -541,6 +550,10 @@ lib/dovecot/lib90_stats_plugin.la
 lib/dovecot/lib95_imap_stats_plugin.la
 lib/dovecot/libdovecot-compression.la
 lib/dovecot/libdovecot-dsync.la
+lib/dovecot/libdovecot-fts.0.dylib
+lib/dovecot/libdovecot-fts.a
+lib/dovecot/libdovecot-fts.dylib
+lib/dovecot/libdovecot-fts.la
 lib/dovecot/libdovecot-lda.la
 lib/dovecot/libdovecot-login.la
 lib/dovecot/libdovecot-sql.la
@@ -548,6 +561,7 @@ lib/dovecot/libdovecot-storage.la
 lib/dovecot/libdovecot.la
 lib/dovecot/libfs_compress.la
 ${PLIST.ssl}lib/dovecot/libssl_iostream_openssl.la
+lib/dovecot/stats/libstats_auth.la
 lib/dovecot/stats/libstats_mail.la
 libexec/dovecot/aggregator
 libexec/dovecot/anvil
@@ -619,6 +633,7 @@ man/man1/doveadm-quota.1
 man/man1/doveadm-reload.1
 man/man1/doveadm-replicator.1
 man/man1/doveadm-search.1
+man/man1/doveadm-stats.1
 man/man1/doveadm-stop.1
 man/man1/doveadm-sync.1
 man/man1/doveadm-user.1
@@ -667,6 +682,7 @@ share/doc/dovecot/wiki/Chrooting.txt
 share/doc/dovecot/wiki/Clients.NegativeUIDs.txt
 share/doc/dovecot/wiki/Clients.txt
 share/doc/dovecot/wiki/CompilingSource.txt
+share/doc/dovecot/wiki/ConfigFile.txt
 share/doc/dovecot/wiki/Debugging.Authentication.txt
 share/doc/dovecot/wiki/Debugging.ProcessTracing.txt
 share/doc/dovecot/wiki/Debugging.Rawlog.txt
@@ -676,6 +692,7 @@ share/doc/dovecot/wiki/Design.AuthProcess.txt
 share/doc/dovecot/wiki/Design.AuthProtocol.txt
 share/doc/dovecot/wiki/Design.Buffers.txt
 share/doc/dovecot/wiki/Design.Code.txt
+share/doc/dovecot/wiki/Design.DoveadmProtocol.HTTP.txt
 share/doc/dovecot/wiki/Design.DoveadmProtocol.txt
 share/doc/dovecot/wiki/Design.Dsync.txt
 share/doc/dovecot/wiki/Design.Indexes.Cache.txt
@@ -718,6 +735,7 @@ share/doc/dovecot/wiki/HowTo.PopRelay.txt
 share/doc/dovecot/wiki/HowTo.PostfixAndDovecotSASL.txt
 share/doc/dovecot/wiki/HowTo.Rootless.txt
 share/doc/dovecot/wiki/HowTo.SimpleVirtualInstall.txt
+share/doc/dovecot/wiki/HowTo.WriteConfiguration.txt
 share/doc/dovecot/wiki/HowTo.txt
 share/doc/dovecot/wiki/IMAPServer.txt
 share/doc/dovecot/wiki/ImapMetadata.txt
@@ -744,6 +762,7 @@ share/doc/dovecot/wiki/MailboxFormat.Cydir.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.imapc.txt
 share/doc/dovecot/wiki/MailboxFormat.mailstore.txt
 share/doc/dovecot/wiki/MailboxFormat.mbox.txt
 share/doc/dovecot/wiki/MailboxFormat.mbx.txt
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
index d0c32e7d991..402602f495c 100644
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2016/03/05 11:27:50 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2016/04/08 07:55:16 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.21nb1
+BUILDLINK_ABI_DEPENDS.dovecot+=		dovecot>=2.2.23
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot2
 
 pkgbase:=	dovecot
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index e39e4c80dfd..da01e755ec5 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.61 2015/12/27 12:36:37 adam Exp $
+$NetBSD: distinfo,v 1.62 2016/04/08 07:55:16 adam Exp $
 
-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 (dovecot-2.2.23.tar.gz) = 65be594f78975dc74cddb8f4454a84c124bc4b32
+RMD160 (dovecot-2.2.23.tar.gz) = 18a0be0dabcc9b18c2236695598da940bcf22ef9
+SHA512 (dovecot-2.2.23.tar.gz) = 704d86dcef8b217a54db1d1ae3c1e0d6303827fedd7150aec83e805512cd1c5befc88da44660e7a40765ad6800c14d399f8c7621e84125a7732d68fee7f18d82
+Size (dovecot-2.2.23.tar.gz) = 5291365 bytes
 SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
 SHA1 (patch-ab) = d637a64feec8e4eafacda149cf0193aa1b70a054
 SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
 SHA1 (patch-af) = c066e94dd6593d16eec3e66f5f4d26f021918498
 SHA1 (patch-src_lib_buffer.h) = d75017a1093c1ca34827d01ec85b06e6b03105d2
+SHA1 (patch-src_plugins_quota_quota-fs.c) = c69305eb065a2417df1e8cd6ccbc1d317aee5d00
 SHA1 (patch-src_stats_mail-stats.h) = 90645c2aab956a0119630da4b71905db704bffda
diff --git a/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.c b/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.c
new file mode 100644
index 00000000000..49c530ce007
--- /dev/null
+++ b/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_plugins_quota_quota-fs.c,v 1.6 2016/04/08 07:55:16 adam Exp $
+
+Fix for missing declaration.
+
+--- src/plugins/quota/quota-fs.c.orig	2016-04-08 07:46:25.000000000 +0000
++++ src/plugins/quota/quota-fs.c
+@@ -680,7 +680,7 @@ fs_quota_get_netbsd(struct fs_quota_root
+ 	struct quotakey qk;
+ 	struct quotaval qv;
+ 	struct quotahandle *qh;
+-	int ret;
++	int i, ret;
+ 
+ 	if ((qh = quota_open(root->mount->mount_path)) == NULL) {
+ 		i_error("cannot open quota for %s: %m",