dovecot2: update to 2.3.1

Changes:
* Submission server support improvements and bug fixes
  - Lots of bug fixes to submission server
* API CHANGE: array_idx_modifiable will no longer allocate space
 - Particularly affects how you should check MODULE_CONTEXT result, or use REQUIRE_MODULE_CONTEXT.

+ mail_attachment_detection_options setting controls when
  $HasAttachment and $HasNoAttachment keywords are set for mails.
+ imap: Support fetching body snippets using FETCH (SNIPPET) or
  (SNIPPET (LAZY=FUZZY))
+ fs-compress: Automatically detect whether input is compressed or not.
  Prefix the compression algorithm with "maybe-" to enable the
  detection, for example: "compress:maybe-gz:6:..."
+ Added settings to change dovecot.index* files' optimization behavior.
  See https://wiki2.dovecot.org/IndexFiles#Settings
+ Auth cache can now utilize auth workers to do password hash
  verification by setting auth_cache_verify_password_with_worker=yes.
+ Added charset_alias plugin. See
  https://wiki2.dovecot.org/Plugins/CharsetAlias
+ imap_logout_format and pop3_logout_format settings now support all of the generic variables (e.g. %{rip}, %{session}, etc.)

6 files changed, 21 insertions, 26 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index ed76109388d..fdbe894c534 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.95 2018/04/17 22:29:32 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2018/05/22 20:49:45 triaxx Exp $
 
-PKGREVISION= 1
 .include "../../mail/dovecot2/Makefile.common"
 
 RCD_SCRIPTS=		dovecot
diff --git a/mail/dovecot2/Makefile.common b/mail/dovecot2/Makefile.common
index 2c1ee462f4a..9e109a7279b 100644
--- a/mail/dovecot2/Makefile.common
+++ b/mail/dovecot2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2018/03/01 11:13:14 taca Exp $
+# $NetBSD: Makefile.common,v 1.19 2018/05/22 20:49:45 triaxx Exp $
 #
 # when updating to a new release, update ABI depends in
 # the buildlink3.mk file as well, since the plugins' version
@@ -7,9 +7,9 @@
 # used by mail/dovecot2/Makefile
 # used by mail/dovecot2/Makefile.plugin
 
-DISTNAME=	dovecot-2.3.0.1
+DISTNAME=	dovecot-2.3.1
 CATEGORIES=	mail
-MASTER_SITES=	https://www.dovecot.org/releases/${PKGVERSION_NOREV:R:R}/
+MASTER_SITES=	https://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.dovecot.org/
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index b5de9675d61..6b0ab69cb0a 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.59 2018/03/01 11:13:14 taca Exp $
+@comment $NetBSD: PLIST,v 1.60 2018/05/22 20:49:45 triaxx Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -155,6 +155,7 @@ include/dovecot/hostpid.h
 include/dovecot/http-auth.h
 include/dovecot/http-client-private.h
 include/dovecot/http-client.h
+include/dovecot/http-common.h
 include/dovecot/http-date.h
 include/dovecot/http-header-parser.h
 include/dovecot/http-header.h
@@ -434,7 +435,6 @@ include/dovecot/oauth2.h
 include/dovecot/ostream-cmp.h
 include/dovecot/ostream-dot.h
 include/dovecot/ostream-encrypt.h
-include/dovecot/ostream-escaped.h
 include/dovecot/ostream-failure-at.h
 include/dovecot/ostream-file-private.h
 include/dovecot/ostream-hash.h
@@ -543,6 +543,7 @@ include/dovecot/sql-api.h
 include/dovecot/sql-db-cache.h
 include/dovecot/stats-client.h
 include/dovecot/stats-connection.h
+include/dovecot/stats-dist.h
 include/dovecot/stats-parser.h
 include/dovecot/stats.h
 include/dovecot/str-find.h
@@ -556,7 +557,6 @@ include/dovecot/subscription-file.h
 include/dovecot/syslog-util.h
 include/dovecot/test-common.h
 include/dovecot/time-util.h
-include/dovecot/timing.h
 include/dovecot/unichar.h
 include/dovecot/unix-socket-create.h
 include/dovecot/unlink-directory.h
@@ -594,6 +594,7 @@ lib/dovecot/lib11_imap_quota_plugin.la
 lib/dovecot/lib11_trash_plugin.la
 lib/dovecot/lib15_notify_plugin.la
 lib/dovecot/lib20_autocreate_plugin.la
+lib/dovecot/lib20_charset_alias_plugin.la
 lib/dovecot/lib20_expire_plugin.la
 lib/dovecot/lib20_fts_plugin.la
 lib/dovecot/lib20_listescape_plugin.la
@@ -623,7 +624,7 @@ lib/dovecot/libdovecot.la
 lib/dovecot/libfs_compress.la
 lib/dovecot/libfs_crypt.la
 lib/dovecot/libfs_mail_crypt.la
-${PLIST.ssl}lib/dovecot/libssl_iostream_openssl.la
+lib/dovecot/libssl_iostream_openssl.la
 lib/dovecot/old-stats/libold_stats_mail.la
 lib/dovecot/old-stats/libstats_auth.la
 libexec/dovecot/aggregator
@@ -662,7 +663,7 @@ libexec/dovecot/script-login
 libexec/dovecot/stats
 libexec/dovecot/submission
 libexec/dovecot/submission-login
-${PLIST.tcpwrappers}libexec/dovecot/tcpwrap
+libexec/dovecot/tcpwrap
 libexec/dovecot/xml2text
 man/man1/deliver.1
 man/man1/doveadm-acl.1
@@ -727,7 +728,6 @@ share/doc/dovecot/wiki/AuthDatabase.LDAP.AuthBinds.txt
 share/doc/dovecot/wiki/AuthDatabase.LDAP.PasswordLookups.txt
 share/doc/dovecot/wiki/AuthDatabase.LDAP.Userdb.txt
 share/doc/dovecot/wiki/AuthDatabase.LDAP.txt
-share/doc/dovecot/wiki/AuthDatabase.Lua.txt
 share/doc/dovecot/wiki/AuthDatabase.Passwd.txt
 share/doc/dovecot/wiki/AuthDatabase.PasswdFile.txt
 share/doc/dovecot/wiki/AuthDatabase.SQL.txt
@@ -765,14 +765,12 @@ share/doc/dovecot/wiki/Design.Dcrypt.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.Events.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
 share/doc/dovecot/wiki/Design.Indexes.TransactionLog.txt
 share/doc/dovecot/wiki/Design.Indexes.txt
 share/doc/dovecot/wiki/Design.InputStreams.txt
-share/doc/dovecot/wiki/Design.Lua.txt
 share/doc/dovecot/wiki/Design.MailProcess.txt
 share/doc/dovecot/wiki/Design.Memory.txt
 share/doc/dovecot/wiki/Design.OutputStreams.txt
@@ -905,7 +903,6 @@ share/doc/dovecot/wiki/Pigeonhole.Sieve.txt
 share/doc/dovecot/wiki/Pigeonhole.txt
 share/doc/dovecot/wiki/Plugins.Apparmor.txt
 share/doc/dovecot/wiki/Plugins.Autocreate.txt
-share/doc/dovecot/wiki/Plugins.CharsetAlias.txt
 share/doc/dovecot/wiki/Plugins.Compress.txt
 share/doc/dovecot/wiki/Plugins.Expire.txt
 share/doc/dovecot/wiki/Plugins.FTS.Lucene.txt
@@ -958,7 +955,6 @@ share/doc/dovecot/wiki/SharedMailboxes.Shared.txt
 share/doc/dovecot/wiki/SharedMailboxes.Symlinks.txt
 share/doc/dovecot/wiki/SharedMailboxes.txt
 share/doc/dovecot/wiki/SocketUnavailable.txt
-share/doc/dovecot/wiki/Statistics.Old.txt
 share/doc/dovecot/wiki/Statistics.txt
 share/doc/dovecot/wiki/SystemUsers.txt
 share/doc/dovecot/wiki/TestInstallation.txt
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
index df300f2a548..d475d000753 100644
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2018/04/17 22:29:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2018/05/22 20:49:45 triaxx 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.3.0.1nb1
+BUILDLINK_ABI_DEPENDS.dovecot+=		dovecot>=2.3.1
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot2
 
 pkgbase:=	dovecot
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index b9fe57c2cd1..897d66c950a 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.82 2018/03/01 11:13:14 taca Exp $
+$NetBSD: distinfo,v 1.83 2018/05/22 20:49:45 triaxx Exp $
 
-SHA1 (dovecot-2.3.0.1.tar.gz) = 911440fa278c7204b1257f4d861e7de123bf5305
-RMD160 (dovecot-2.3.0.1.tar.gz) = 6745d03a4b8d860476e2e7aacf91dd757b906037
-SHA512 (dovecot-2.3.0.1.tar.gz) = 2b30c46c1660f425f6303a15cf638388439fd7a8065c91d28caf41d9a6403a4fccb530df3f69037a634bc3b0b9e498037da6b0b93c176f5e3b5808907d3f759d
-Size (dovecot-2.3.0.1.tar.gz) = 6499984 bytes
+SHA1 (dovecot-2.3.1.tar.gz) = 4f098f4c1a63a714ec428292dce20f7ae5cc8ce1
+RMD160 (dovecot-2.3.1.tar.gz) = 0728aee3bdaf66cdbb488dc59a1e1a5268b6db36
+SHA512 (dovecot-2.3.1.tar.gz) = fe664ab771145f2390fef45839ff2756e36731c61e571dfa6975014f9cea43144e2aca0acf1a83b1dac55ad50042d0fa170b83570aa411228557861ada410b79
+Size (dovecot-2.3.1.tar.gz) = 6703089 bytes
 SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
 SHA1 (patch-ab) = 9db15fd853ba47ef4bf04f2adc9ab24f71ee4d1e
 SHA1 (patch-ae) = c795585df9f415ceabb28eec1ff691ee26168d3b
 SHA1 (patch-af) = c066e94dd6593d16eec3e66f5f4d26f021918498
 SHA1 (patch-src_imap_imap-client.h) = 1a2bf95ab6af57d88862a1512624bf263f4c2ce7
+SHA1 (patch-src_lib_connection.h) = c147511f4ff50e4b5a048c3a363f0af90ee4c6ad
 SHA1 (patch-src_lib-ldap_ldap-private.h) = 2d5ce32330ad4164cc75f8d209ba499d37ed01fc
-SHA1 (patch-src_lib_connection.h) = c749dd1517902b6602f81e41bb90c6288a571487
 SHA1 (patch-src_old-stats_mail-stats.h) = 0d40c618445c089af2646a6864c3e909812282af
diff --git a/mail/dovecot2/patches/patch-src_lib_connection.h b/mail/dovecot2/patches/patch-src_lib_connection.h
index 51c4c40fa5c..c4380f79666 100644
--- a/mail/dovecot2/patches/patch-src_lib_connection.h
+++ b/mail/dovecot2/patches/patch-src_lib_connection.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_lib_connection.h,v 1.1 2016/11/12 16:12:08 taca Exp $
+$NetBSD: patch-src_lib_connection.h,v 1.2 2018/05/22 20:49:45 triaxx Exp $
 
 * Require header for timeval structure.
 
---- src/lib/connection.h.orig	2016-10-27 12:26:28.000000000 +0000
+--- src/lib/connection.h.orig	2018-03-20 10:15:40.000000000 +0000
 +++ src/lib/connection.h
 @@ -3,6 +3,10 @@
  
@@ -12,6 +12,6 @@ $NetBSD: patch-src_lib_connection.h,v 1.1 2016/11/12 16:12:08 taca Exp $
 +#include <sys/time.h>
 +#endif
 +
+ struct ioloop;
  struct connection;
  
- enum connection_behavior {