mail/dovecot, mail/dovecot-pigeonhole: upgrade to 2.3.2 and 0.5.2 respectively

dovecot changelog:
v2.3.2 is mainly a bugfix release. It contains all the changes in v2.2.36, as well as a bunch of other fixes (mainly for v2.3-only bugs). Binary packages are already in https://repo.dovecot.org/

* old-stats plugin: Don't temporarily enable PR_SET_DUMPABLE while
   opening /proc/self/io. This may still cause security problems if the
   process is ptrace()d at the same time. Instead, open it while still
   running as root.
+ doveadm: Added mailbox cache decision&remove commands. See
   doveadm-mailbox(1) man page for details.
+ doveadm: Added rebuild attachments command for rebuilding
   $HasAttachment or $HasNoAttachment flags for matching mails. See
   doveadm-rebuild(1) man page for details.
+ cassandra: Use fallback_consistency on more types of errors
+ lmtp proxy: Support outgoing SSL/TLS connections
+ lmtp: Add lmtp_rawlog_dir and lmtp_proxy_rawlog_dir settings.
+ submission: Add support for rawlog_dir
+ submission: Add submission_client_workarounds setting.
+ lua auth: Add password_verify() function and additional fields in
   auth request.
- doveadm-server: TCP connections are hanging when there is a lot of
   network output. This especially caused hangs in dsync-replication.
- Using multiple type=shared mdbox namespaces crashed
- mail_fsync setting was ignored. It was always set to "optimized".
- lua auth: Fix potential crash at deinit
- SSL/TLS servers may have crashed if client disconnected during
   handshake.
- SSL/TLS servers: Don't send extraneous certificates to client when
   alt certs are used.
- lda, lmtp: Return-Path header without '<' may have assert-crashed.
- lda, lmtp: Unencoded UTF-8 in email address headers may assert-crash
- lda: -f parameter didn't allow empty/null/domainless address
- lmtp, submission: Message size limit was hardcoded to 40 MB.
   Exceeding it caused the connection to get dropped during transfer.
- lmtp: Fix potential crash when delivery fails at DATA stage
- lmtp: login_greeting setting was ignored
- Fix to work with OpenSSL v1.0.2f
- systemd unit restrictions were too strict by default
- Fix potential crashes when a lot of log output was produced
- SMTP client may have assert-crashed when sending mail
- IMAP COMPRESS: Send "end of compression" marker when disconnecting.
- cassandra: Fix consistency=quorum to work
- dsync: Lock file generation failed if home directory didn't exist
- Snippet generation for HTML mails didn't ignore &entities inside
   blockquotes, producing strange looking snippets.
- imapc: Fix assert-crash if getting disconnected and after
   reconnection all mails in the selected mailbox are gone.
- pop3c: Handle unexpected server disconnections without assert-crash
- fts: Fixes to indexing mails via virtual mailboxes.
- fts: If mails contained NUL characters, the text around it wasn't
   indexed.
- Obsolete dovecot.index.cache offsets were sometimes used. Trying to
   fetch a field that was just added to cache file may not have always
   found it.

pigeonhole changelog:
Changelog v0.5.2:

+ Implement plugin for the a vendor-defined IMAP capability called
   "FILTER=SIEVE". It adds the ability to manually invoke Sieve filtering
   in IMAP. More information can be found in
   doc/plugins/imap_filter_sieve.txt.
- The Sieve address test caused an assertion panic for invalid addresses
   with UTF-8 codepoints in the localpart. Fixed by properly detecting
   invalid addresses with UTF-8 codepoints in the localpart and skipping
   these like other invalid addresses while iterating addresses for the
   address test.
- Make the length of the subject header for the vacation response
   configurable and enforce the limit in UTF-8 codepoints rather than
   bytes. The subject header for a vacation response was statically
   truncated to 256 bytes, which is too limited for multi-byte UTF-8
   characters.
- Sieve editheader extension: Fix assertion panic occurring when it is
   used to manipulate a message header with a very large header field.
- Properly abort execution of the sieve_discard script upon error.
   Before, the LDA Sieve plugin attempted to execute the sieve_discard
   script when an error occurs. This can lead to the message being lost.
- Fix the interaction between quota and the sieve_discard script. When
   quota was used together with a sieve_discard script, the message
   delivery did not bounce when the quota was exceeded.

8 files changed, 13 insertions, 89 deletions

diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile
index b9b95e1bcea1..687805c000a4 100644
--- a/mail/dovecot-pigeonhole/Makefile
+++ b/mail/dovecot-pigeonhole/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dovecot-pigeonhole
-PORTVERSION=	0.5.1
+PORTVERSION=	0.5.2
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
@@ -12,8 +12,8 @@ COMMENT=	Sieve plugin for the Dovecot 'deliver' LDA and LMTP
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	dovecot>=2.3.1:mail/dovecot
-RUN_DEPENDS=	dovecot>=2.3.1:mail/dovecot
+BUILD_DEPENDS=	dovecot>=2.3.2:mail/dovecot
+RUN_DEPENDS=	dovecot>=2.3.2:mail/dovecot
 
 DOVECOTVERSION=	2.3
 
diff --git a/mail/dovecot-pigeonhole/distinfo b/mail/dovecot-pigeonhole/distinfo
index e352b2379de4..b194e03da935 100644
--- a/mail/dovecot-pigeonhole/distinfo
+++ b/mail/dovecot-pigeonhole/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522192447
-SHA256 (dovecot-2.3-pigeonhole-0.5.1.tar.gz) = e3b0aa59261881bcb0d33a6c398f3cb5f9f75e077e67bae175cf33c362577547
-SIZE (dovecot-2.3-pigeonhole-0.5.1.tar.gz) = 1792702
+TIMESTAMP = 1530289706
+SHA256 (dovecot-2.3-pigeonhole-0.5.2.tar.gz) = 950e8e15c58e539761255e140dd3678dd2477fa432a5f2b804e53821bdc02535
+SIZE (dovecot-2.3-pigeonhole-0.5.2.tar.gz) = 1814618
diff --git a/mail/dovecot-pigeonhole/pkg-plist b/mail/dovecot-pigeonhole/pkg-plist
index 7a7f598057f4..25c299b567bf 100644
--- a/mail/dovecot-pigeonhole/pkg-plist
+++ b/mail/dovecot-pigeonhole/pkg-plist
@@ -64,6 +64,8 @@ lib/dovecot-2.3-pigeonhole/libdovecot-sieve.so.0
 lib/dovecot-2.3-pigeonhole/libdovecot-sieve.so.0.0.0
 lib/dovecot/doveadm/lib10_doveadm_sieve_plugin.a
 lib/dovecot/doveadm/lib10_doveadm_sieve_plugin.so
+lib/dovecot/lib95_imap_filter_sieve_plugin.a
+lib/dovecot/lib95_imap_filter_sieve_plugin.so
 lib/dovecot/lib95_imap_sieve_plugin.a
 lib/dovecot/lib95_imap_sieve_plugin.so
 lib/dovecot/sieve/lib90_sieve_imapsieve_plugin.a
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index f43f105c473c..1211f8eebf93 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -7,8 +7,7 @@
 ######################################################################
 
 PORTNAME=	dovecot
-PORTVERSION=	2.3.1
-PORTREVISION=	5
+PORTVERSION=	2.3.2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	https://www.dovecot.org/releases/2.3/
 
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 24cf131f8b97..d9b1b547a69b 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522193729
-SHA256 (dovecot-2.3.1.tar.gz) = 0883821b97fd02a084a84b9469a681f7e6edc56541d854b5419d98891c51fb93
-SIZE (dovecot-2.3.1.tar.gz) = 6703089
+TIMESTAMP = 1530288810
+SHA256 (dovecot-2.3.2.tar.gz) = 6e48f0fa60768427f03035b0a3e93d1ae29b972bb2bd9ca998ccc6a0f6dae393
+SIZE (dovecot-2.3.2.tar.gz) = 6796744
diff --git a/mail/dovecot/files/patch-UPSTREAM-opensmtpd b/mail/dovecot/files/patch-UPSTREAM-opensmtpd
deleted file mode 100644
index 8f59e867ac2d..000000000000
--- a/mail/dovecot/files/patch-UPSTREAM-opensmtpd
+++ /dev/null
@@ -1,66 +0,0 @@
-From fbed9168dc3b104b09bd748409aec902328cd8e5 Mon Sep 17 00:00:00 2001
-From: Stephan Bosch <stephan.bosch@dovecot.fi>
-Date: Tue, 10 Apr 2018 02:36:44 +0200
-Subject: [PATCH] lib-mail: message-address: Fix assert panic occurring in
- message_address_parse_path() when no opening `<' is found.
-
-Panic was:
-
-Panic: file message-address.c: line 147 (parse_angle_addr): assertion failed: (*ctx->parser.data == '<')
---- src/lib-mail/message-address.c.orig	2018-03-20 10:15:40 UTC
-+++ src/lib-mail/message-address.c
-@@ -424,6 +424,8 @@ message_address_parse_path_real(pool_t pool, const uns
- 
- 	if (rfc822_skip_lwsp(&ctx.parser) <= 0)
- 		return -1;
-+	if (*ctx.parser.data != '<')
-+		return -1;
- 	if ((ret=parse_angle_addr(&ctx)) < 0 ||
- 		(ctx.addr.mailbox != NULL && ctx.addr.domain == NULL)) {
- 		ctx.addr.invalid_syntax = TRUE;
- src/lib-mail/message-address.c      |  2 ++
- src/lib-mail/test-message-address.c | 28 ++++++++++++++++++++++++++++
- 2 files changed, 30 insertions(+)
-
---- src/lib-mail/test-message-address.c.orig	2018-03-20 10:15:40 UTC
-+++ src/lib-mail/test-message-address.c
-@@ -395,11 +395,39 @@ static void test_message_address_path(void)
- 	test_end();
- }
- 
-+static void test_message_address_path_invalid(void)
-+{
-+	static const char *tests[] = {
-+		">",
-+		" > ",
-+		"user@domain",
-+		"  user@domain  ",
-+		"user@domain>",
-+		"  user@domain>  ",
-+		"<user>",
-+		"<@route@route2:user>",
-+	};
-+	const struct message_address *addr;
-+	unsigned int i;
-+
-+	test_begin("message address path invalid");
-+
-+	for (i = 0; i < N_ELEMENTS(tests); i++) {
-+		const char *test = tests[i];
-+		int ret;
-+
-+		ret = test_parse_path(test, &addr);
-+		test_assert_idx(ret < 0, i);
-+	}
-+	test_end();
-+}
-+
- int main(void)
- {
- 	static void (*const test_functions[])(void) = {
- 		test_message_address,
- 		test_message_address_path,
-+		test_message_address_path_invalid,
- 		NULL
- 	};
- 	return test_run(test_functions);
diff --git a/mail/dovecot/files/patch-src_doveadm_client-connection-tcp.c b/mail/dovecot/files/patch-src_doveadm_client-connection-tcp.c
deleted file mode 100644
index f95c96a181b1..000000000000
--- a/mail/dovecot/files/patch-src_doveadm_client-connection-tcp.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/doveadm/client-connection-tcp.c.orig	2018-03-20 10:15:40 UTC
-+++ src/doveadm/client-connection-tcp.c
-@@ -334,6 +334,9 @@ static int doveadm_cmd_handle(struct client_connection
- 	   running one and we can't call the original one recursively, so
- 	   create a new ioloop. */
- 	conn->ioloop = io_loop_create();
-+	o_stream_switch_ioloop(conn->output);
-+	if (conn->log_out != NULL)
-+		o_stream_switch_ioloop(conn->log_out);
- 
- 	if (cmd_ver2 != NULL)
- 		doveadm_cmd_server_run_ver2(conn, argc, argv, cctx);
diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
index 3d02328729ea..f96dcccecf8f 100644
--- a/mail/dovecot/pkg-plist
+++ b/mail/dovecot/pkg-plist
@@ -796,6 +796,7 @@ man/man1/doveadm-proxy.1.gz
 man/man1/doveadm-purge.1.gz
 man/man1/doveadm-pw.1.gz
 man/man1/doveadm-quota.1.gz
+man/man1/doveadm-rebuild.1.gz
 man/man1/doveadm-reload.1.gz
 man/man1/doveadm-replicator.1.gz
 man/man1/doveadm-save.1.gz