mail/dovecot upgrade to 2.3.3, mail/dovecot-pigeonhole upgrade to 0.5.3.

dovecot changelog:
* doveconf hides more secrets now in the default output.
* ssl_dh setting is no longer enforced at startup. If it's not set and
   non-ECC DH key exchange happens, error is logged and client is
   disconnected.

+ Added log_debug=<filter> setting.
+ Added log_core_filter=<log filter> setting.
+ quota-clone: Write to dict asynchronously
+ --enable-hardening attempts to use retpoline Spectre 2 mitigations
+ lmtp proxy: Support source_ip passdb extra field.
+ doveadm stats dump: Support more fields and output stddev by default.
+ push-notification: Add SSL support for OX backend.
- NUL bytes in mail headers can cause truncated replies when fetched.
- director: Conflicting host up/down state changes may in some rare
   situations ended up in a loop of two directors constantly overwriting
   each others' changes.
- director: Fix hang/crash when multiple doveadm commands are being
   handled concurrently.
- director: Fix assert-crash if doveadm disconnects too early
- virtual plugin: Some searches used 100% CPU for many seconds
- dsync assert-crashed with acl plugin in some situations.
- mail_attachment_detection_options=add-flags-on-save assert-crashed
   with some specific Sieve scripts.
- Mail snippet generation crashed with mails containing invalid
   Content-Type:multipart header.
- Log prefix ordering was different for some log lines.
- quota: With noenforcing option current quota usage wasn't updated.
- auth: Kerberos authentication against Samba assert-crashed.
- stats clients were unnecessarily chatty with the stats server.
- imapc: Fixed various assert-crashes when reconnecting to server.
- lmtp, submission: Fix potential crash if client disconnects while
   handling a command.
- quota: Fixed compiling with glibc-2.26 / support libtirpc.
- fts-solr: Empty search values resulted in 400 Bad Request errors
- fts-solr: default_ns parameter couldn't be used
- submission server crashed if relay server returned over 7 lines in
   a reply (e.g. to EHLO)

pigeonhole changelog:
- Fix assertion panic occurring when managesieve service fails to open
   INBOX while saving a Sieve script. This was caused by a lack of
   cleanup after failure.
- Fix specific messages causing an assert panic with actions that
   compose a reply (e.g. vacation). With some rather weird input from the
   original message, the header folding algorithm (as used for composing
   the References header for the reply) got confused, causing the panic.
- IMAP FILTER=SIEVE capability: Fix FILTER SIEVE SCRIPT command parsing.
   After finishing reading the Sieve script, the command parsing
   sometimes didn't continue with the search arguments. This is a time-
   critical bug that likely only occurs when the Sieve script is sent in
   the next TCP frame.

Add a patch to close stderr in src/master/main.c, should fix PR 228003.

PR:		228003
Submitted by:	psagers@ignorare.net

6 files changed, 20 insertions, 10 deletions

diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile
index ee9600ccd978..2a1b23282a16 100644
--- a/mail/dovecot-pigeonhole/Makefile
+++ b/mail/dovecot-pigeonhole/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dovecot-pigeonhole
-PORTVERSION=	0.5.2
-PORTREVISION=	3
+PORTVERSION=	0.5.3
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
diff --git a/mail/dovecot-pigeonhole/distinfo b/mail/dovecot-pigeonhole/distinfo
index b194e03da935..1b8f5c3f01e8 100644
--- a/mail/dovecot-pigeonhole/distinfo
+++ b/mail/dovecot-pigeonhole/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530289706
-SHA256 (dovecot-2.3-pigeonhole-0.5.2.tar.gz) = 950e8e15c58e539761255e140dd3678dd2477fa432a5f2b804e53821bdc02535
-SIZE (dovecot-2.3-pigeonhole-0.5.2.tar.gz) = 1814618
+TIMESTAMP = 1538434703
+SHA256 (dovecot-2.3-pigeonhole-0.5.3.tar.gz) = e02f2741c05f9e2af1c5f46da35efb74997f9d4b941ba68936206d310ddf2622
+SIZE (dovecot-2.3-pigeonhole-0.5.3.tar.gz) = 1827329
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 701e778dccd7..e4521f8adae5 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -7,8 +7,7 @@
 ######################################################################
 
 PORTNAME=	dovecot
-PORTVERSION=	2.3.2.1
-PORTREVISION=	1
+PORTVERSION=	2.3.3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	https://www.dovecot.org/releases/2.3/
 
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index ea617f11277f..8b838b72c92e 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531157067
-SHA256 (dovecot-2.3.2.1.tar.gz) = 4a65118508dc7a562e5f90dd7c3f56219fff22367c496f17d77cd0c7e2724e34
-SIZE (dovecot-2.3.2.1.tar.gz) = 6797491
+TIMESTAMP = 1538434422
+SHA256 (dovecot-2.3.3.tar.gz) = 15af27ee25258afb4ad9581f8df681be998b763597086bbae54ca7d77a066d8e
+SIZE (dovecot-2.3.3.tar.gz) = 6851107
diff --git a/mail/dovecot/files/patch-src_master_main.c b/mail/dovecot/files/patch-src_master_main.c
new file mode 100644
index 000000000000..82a6f023f2ca
--- /dev/null
+++ b/mail/dovecot/files/patch-src_master_main.c
@@ -0,0 +1,11 @@
+--- src/master/main.c.orig	2018-03-20 03:15:40.000000000 -0700
++++ src/master/main.c	2018-05-05 18:57:32.485732000 -0700
+@@ -861,6 +861,8 @@
+ 		i_fatal("dup2(dev_null_fd) failed: %m");
+ 	if (!foreground && dup2(dev_null_fd, STDOUT_FILENO) < 0)
+ 		i_fatal("dup2(dev_null_fd) failed: %m");
++	if (!foreground && dup2(dev_null_fd, STDERR_FILENO) < 0)
++		i_fatal("dup2(dev_null_fd) failed: %m");
+ 
+ 	pidfile_path =
+ 		i_strconcat(set->base_dir, "/"MASTER_PID_FILE_NAME, NULL);
diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
index f96dcccecf8f..7dec438c4836 100644
--- a/mail/dovecot/pkg-plist
+++ b/mail/dovecot/pkg-plist
@@ -136,6 +136,7 @@ include/dovecot/event-log.h
 include/dovecot/execv-const.h
 include/dovecot/fail-mail-storage.h
 include/dovecot/failures.h
+include/dovecot/failures-private.h
 include/dovecot/fd-util.h
 include/dovecot/fdatasync-path.h
 include/dovecot/fdpass.h