Update dovecot2 to 2.2.31, and bump PORTREVISION on the modules.

* LMTP: Removed "(Dovecot)" from added Received headers. Some
  installations want to hide it, and there's not really any good reason
  for anyone to have it.

+ Add ssl_alt_cert and ssl_alt_key settings to add support for
  having both RSA and ECDSA certificates.
+ dsync/imapc, pop3-migration plugin: Strip trailing whitespace from
  headers when matching mails. This helps with migrations from Zimbra.
+ acl: Add acl_globals_only setting to disable looking up
  per-mailbox dovecot-acl files.
+ Parse invalid message addresses better. This mainly affects the
  generated IMAP ENVELOPE replies.
- v2.2.30 wasn't fixing corrupted dovecot.index.cache files properly.
  It could have deleted wrong mail's cache or assert-crashed.
- v2.2.30 mail-crypt-acl plugin was assert-crashing
- v2.2.30 welcome plugin wasn't working
- Various fixes to handling mailbox listing. Especially related to
  handling nonexistent autocreated/autosubscribed mailboxes and ACLs.
- Global ACL file was parsed as if it was local ACL file. This caused
  some of the ACL rule interactions to not work exactly as intended.
- auth: forward_* fields didn't work properly: Only the first forward
  field was working, and only if the first passdb lookup succeeded.
- Using mail_sort_max_read_count sometimes caused "Broken sort-*
  indexes, resetting" errors.
- Using mail_sort_max_read_count may have caused very high CPU usage.
- Message address parsing could have crashed on invalid input.
- imapc_features=fetch-headers wasn't always working correctly and
  caused the full header to be fetched.
- imapc: Various bugfixes related to connection failure handling.
- quota=imapc sent unnecessary FETCH RFC822.SIZE to server when
  expunging mails.
- quota=count: quota_warning = -storage=.. was never executed
- quota=count: Add support for "ns" parameter
- dsync: Fix incremental syncing for mails that don't have Date or
  Message-ID headers.
- imap: Fix hang when client sends pipelined SEARCH +
  EXPUNGE/CLOSE/LOGOUT.
- oauth2: Token validation didn't accept empty server responses.
- imap: NOTIFY command has been almost completely broken since the
  beginning. I guess nobody has been trying to use it.

6 files changed, 10 insertions, 34 deletions

diff --git a/mail/dovecot2-antispam-plugin/Makefile b/mail/dovecot2-antispam-plugin/Makefile
index 87e50c0e30b9..3250322d013c 100644
--- a/mail/dovecot2-antispam-plugin/Makefile
+++ b/mail/dovecot2-antispam-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dovecot2-antispam-plugin
 PORTVERSION=	20130429
-PORTREVISION=	29
+PORTREVISION=	30
 CATEGORIES=	mail
 MASTER_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile
index 87b5f0b73552..71b41b00f3ac 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dovecot-pigeonhole
 PORTVERSION=	0.4.18
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index a9c422e8f7af..efce3faf4c1a 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -13,10 +13,9 @@
 ######################################################################
 
 PORTNAME=	dovecot
-PORTVERSION=	2.2.30.2
-PORTREVISION=	1
+PORTVERSION=	2.2.31
 CATEGORIES=	mail ipv6
-MASTER_SITES=	https://www.dovecot.org/releases/${PORTVERSION:R:R}/
+MASTER_SITES=	https://www.dovecot.org/releases/2.2/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	adamw@FreeBSD.org
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 780a843a2b75..dac92543c70f 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496763108
-SHA256 (dovecot-2.2.30.2.tar.gz) = f3dba79c1ceeaa9dd0633f648d3a607704bf3d0591e7d48168084c8add87189e
-SIZE (dovecot-2.2.30.2.tar.gz) = 6008134
+TIMESTAMP = 1498515382
+SHA256 (dovecot-2.2.31.tar.gz) = 034be40907748128d65088a4f59789b2f99ae7b33a88974eae0b6a68ece376a1
+SIZE (dovecot-2.2.31.tar.gz) = 5993283
diff --git a/mail/dovecot2/files/patch-upstream-corrupted_cache_record b/mail/dovecot2/files/patch-upstream-corrupted_cache_record
deleted file mode 100644
index 70633d3be370..000000000000
--- a/mail/dovecot2/files/patch-upstream-corrupted_cache_record
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8a5fe0c06f48b202a5f1d3dd49f7ed7ed92d64ae Mon Sep 17 00:00:00 2001
-From: Timo Sirainen <timo.sirainen@dovecot.fi>
-Date: Fri, 9 Jun 2017 14:31:15 +0300
-Subject: [PATCH] lib-storage: Fix setting the correct cache record corrupted
-
-It was mixing UIDs and sequences, so a wrong mail could have been set
-corrupted or it could have crashed with:
-
-Panic: file mail-index-transaction-update.c: line 1018 (mail_index_update_ext): assertion failed: (seq > 0 && (seq <= mail_index_view_get_messages_count(t->view) || seq <= t->last_new_seq))
----
- src/lib-storage/mail-storage.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
-index 067a65bc1..2405161e0 100644
---- src/lib-storage/mail-storage.c
-+++ src/lib-storage/mail-storage.c
-@@ -2754,7 +2754,7 @@ void mail_set_mail_cache_corrupted(struct mail *mail, const char *fmt, ...)
- 	va_start(va, fmt);
- 
- 	T_BEGIN {
--		mail_cache_set_seq_corrupted_reason(cache_view, mail->uid,
-+		mail_cache_set_seq_corrupted_reason(cache_view, mail->seq,
- 			t_strdup_printf("UID %u: %s",
- 					mail->uid,
- 					t_strdup_vprintf(fmt, va)));
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist
index d919e1adcafd..098f4938ec62 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot2/pkg-plist
@@ -371,6 +371,7 @@ include/dovecot/mailbox-list-fs.h
 include/dovecot/mailbox-list-index-storage.h
 include/dovecot/mailbox-list-index-sync.h
 include/dovecot/mailbox-list-index.h
+include/dovecot/mailbox-list-iter-private.h
 include/dovecot/mailbox-list-iter.h
 include/dovecot/mailbox-list-maildir.h
 include/dovecot/mailbox-list-notify-tree.h
@@ -463,6 +464,7 @@ include/dovecot/ostream-metawrap.h
 include/dovecot/ostream-null.h
 include/dovecot/ostream-private.h
 include/dovecot/ostream-rawlog.h
+include/dovecot/ostream-unix.h
 include/dovecot/ostream-zlib.h
 include/dovecot/ostream.h
 include/dovecot/passdb-blocking.h
@@ -506,6 +508,7 @@ include/dovecot/push-notification-triggers.h
 include/dovecot/push-notification-txn-mbox.h
 include/dovecot/push-notification-txn-msg.h
 include/dovecot/qp-decoder.h
+include/dovecot/qp-encoder.h
 include/dovecot/quota-fs.h
 include/dovecot/quota-plugin.h
 include/dovecot/quota-private.h