pkg/51047: Update dovecot2 to 2.2.23

[Hauke Fath <hf%spg.tu-darmstadt.de@localhost>]

>Number:         51047
>Category:       pkg
>Synopsis:       Update dovecot2 to 2.2.23 (with patch)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Apr 05 15:10:01 +0000 2016
>Originator:     Hauke Fath
>Release:        NetBSD 6.1_STABLE
>Organization:
Technische Universitaet Darmstadt
>Environment:
	
	
System: NetBSD Hochstuhl 6.1_STABLE NetBSD 6.1_STABLE (GENERIC) #0: Fri Jan 16 13:21:00 CET 2015 hf@Hochstuhl:/var/obj/netbsd-builds/6/amd64/sys/arch/amd64/compile/GENERIC amd64
Architecture: x86_64
Machine: amd64
>Description:

	There is a 2.2.23 patch release for Dovecot 2:

<snip>
http://dovecot.org/releases/2.2/dovecot-2.2.23.tar.gz
http://dovecot.org/releases/2.2/dovecot-2.2.23.tar.gz.sig

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.
</snip>

>How-To-Repeat:


>Fix:

	Apply the two following patches:

? patches/patch-src_plugins_quota_quota-fs.c
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/dovecot2/Makefile,v
retrieving revision 1.83
diff -u -u -r1.83 Makefile
--- Makefile	5 Mar 2016 11:27:50 -0000	1.83
+++ Makefile	5 Apr 2016 11:41:21 -0000
@@ -4,8 +4,8 @@
 # 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
+#PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/mail/dovecot2/PLIST,v
retrieving revision 1.42
diff -u -u -r1.42 PLIST
--- PLIST	27 Dec 2015 12:36:37 -0000	1.42
+++ PLIST	5 Apr 2016 11:41:22 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2015/12/27 12:36:37 adam Exp $
+@comment $NetBSD$
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -29,10 +29,12 @@
 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-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-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-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/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.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,13 +550,15 @@
 lib/dovecot/lib95_imap_stats_plugin.la
 lib/dovecot/libdovecot-compression.la
 lib/dovecot/libdovecot-dsync.la
+lib/dovecot/libdovecot-fts.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
 lib/dovecot/libfs_compress.la
-${PLIST.ssl}lib/dovecot/libssl_iostream_openssl.la
+lib/dovecot/libssl_iostream_openssl.la
+lib/dovecot/stats/libstats_auth.la
 lib/dovecot/stats/libstats_mail.la
 libexec/dovecot/aggregator
 libexec/dovecot/anvil
@@ -583,7 +594,7 @@
 libexec/dovecot/script-login
 libexec/dovecot/ssl-params
 libexec/dovecot/stats
-${PLIST.tcpwrappers}libexec/dovecot/tcpwrap
+libexec/dovecot/tcpwrap
 libexec/dovecot/xml2text
 man/man1/deliver.1
 man/man1/doveadm-acl.1
@@ -619,6 +630,7 @@
 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 +679,7 @@
 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 +689,7 @@
 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 +732,7 @@
 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 +759,7 @@
 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
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/dovecot2/buildlink3.mk,v
retrieving revision 1.15
diff -u -u -r1.15 buildlink3.mk
--- buildlink3.mk	5 Mar 2016 11:27:50 -0000	1.15
+++ buildlink3.mk	5 Apr 2016 11:41:22 -0000
@@ -7,7 +7,7 @@
 
 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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/dovecot2/distinfo,v
retrieving revision 1.61
diff -u -u -r1.61 distinfo
--- distinfo	27 Dec 2015 12:36:37 -0000	1.61
+++ distinfo	5 Apr 2016 11:41:22 -0000
@@ -1,12 +1,13 @@
 $NetBSD: distinfo,v 1.61 2015/12/27 12:36:37 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) = dbdfbb6a85206db0e17ace515d881caff8dbad01
 SHA1 (patch-src_stats_mail-stats.h) = 90645c2aab956a0119630da4b71905db704bffda


--- /dev/null	2016-04-05 17:03:25.000000000 +0200
+++ patches/patch-src_plugins_quota_quota-fs.c	2016-04-05 17:04:15.000000000 +0200
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Missing declaration, corrected upstream.
+
+--- src/plugins/quota/quota-fs.c.orig	2016-03-30 07:52:09.000000000 +0000
++++ src/plugins/quota/quota-fs.c
+@@ -692,7 +692,7 @@ fs_quota_get_netbsd(struct fs_quota_root
+ 	qk.qk_idtype = group ? QUOTA_IDTYPE_GROUP : QUOTA_IDTYPE_USER;
+ 	qk.qk_id = group ? root->gid : root->uid;
+ 
+-	for (i = 0; i < 2; i++) {
++	for (int i = 0; i < 2; i++) {
+ 		qk.qk_objtype = i == 0 ? QUOTA_OBJTYPE_BLOCKS : QUOTA_OBJTYPE_FILES;
+ 
+ 		if (quota_get(qh, &qk, &qv) != 0) {

>Unformatted: