dovecot2: updated to 2.3.3

2.3.3:
* 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)

5 files changed, 13 insertions, 27 deletions

diff --git a/mail/dovecot2/MESSAGE b/mail/dovecot2/MESSAGE
deleted file mode 100644
index 72d2d0eb2cc..00000000000
--- a/mail/dovecot2/MESSAGE
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2012/10/01 07:10:14 ghen Exp $
-
-The configuration for Dovecot 2.0 now lives in ${PKG_SYSCONFDIR}/dovecot/,
-and is split in multiple files.
-
-When upgrading from Dovecot 1.2.x, you can either:
-- convert your old config to a single, minimal new config file:
-  ${PREFIX}/bin/doveconf -n -c dovecot.conf > dovecot.conf.new
-- start over, editing the templates in ${PKG_SYSCONFDIR}/dovecot/conf.d/
-
-For more information, see http://wiki2.dovecot.org/Upgrading/2.0
-
-For upgrading from Dovecot 2.0, see http://wiki2.dovecot.org/Upgrading/2.1
-
-===========================================================================
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index fdbe894c534..af172cf1172 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2018/05/22 20:49:45 triaxx Exp $
+# $NetBSD: Makefile,v 1.97 2018/10/23 16:29:18 adam Exp $
 
 .include "../../mail/dovecot2/Makefile.common"
 
@@ -22,7 +22,7 @@ EGDIR=			${PREFIX}/share/examples/dovecot
 
 CNFS_cmd=		${SED} -ne "s,^share/examples/dovecot/,,p" PLIST
 CNFS=			${CNFS_cmd:sh}
-CONF_FILES=		${EGDIR}/dovecot.conf ${PKG_SYSCONFDIR}/dovecot/dovecot-example.conf
+CONF_FILES=		${EGDIR}/dovecot.conf ${PKG_SYSCONFDIR}/dovecot/dovecot.conf
 .for file in ${CNFS}
 CONF_FILES+=		${EGDIR}/${file:Q} ${PKG_SYSCONFDIR}/dovecot/${file:Q}
 .endfor
diff --git a/mail/dovecot2/Makefile.common b/mail/dovecot2/Makefile.common
index 3b45d3be6ee..9bf8c868dec 100644
--- a/mail/dovecot2/Makefile.common
+++ b/mail/dovecot2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2018/07/14 20:15:33 adam Exp $
+# $NetBSD: Makefile.common,v 1.21 2018/10/23 16:29:18 adam 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.2.1
+DISTNAME=	dovecot-2.3.3
 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 de9e02ca89c..54eb1aed0f9 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.61 2018/07/14 20:15:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.62 2018/10/23 16:29:18 adam Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -105,6 +105,7 @@ include/dovecot/event-filter.h
 include/dovecot/event-log.h
 include/dovecot/execv-const.h
 include/dovecot/fail-mail-storage.h
+include/dovecot/failures-private.h
 include/dovecot/failures.h
 include/dovecot/fd-util.h
 include/dovecot/fdatasync-path.h
@@ -800,6 +801,7 @@ share/doc/dovecot/wiki/Dictionary.txt
 share/doc/dovecot/wiki/Director.txt
 share/doc/dovecot/wiki/DomainLost.txt
 share/doc/dovecot/wiki/Errors.ChgrpNoPerm.txt
+share/doc/dovecot/wiki/Events.txt
 share/doc/dovecot/wiki/FindMailLocation.txt
 share/doc/dovecot/wiki/FinishBasicConfiguration.txt
 share/doc/dovecot/wiki/HAProxy.txt
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index ee19aeae9fa..46c597b7bad 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.84 2018/07/14 20:15:33 adam Exp $
+$NetBSD: distinfo,v 1.85 2018/10/23 16:29:18 adam Exp $
 
-SHA1 (dovecot-2.3.2.1.tar.gz) = 4f4996db202584d4c54a1a906df870ee16ff02ed
-RMD160 (dovecot-2.3.2.1.tar.gz) = b60ac0bd2c20f57cbe272781bd30523c9cbfa8a9
-SHA512 (dovecot-2.3.2.1.tar.gz) = c085a0d04925485423086736a3c7d919ad0ca9efeff005890382da5333edb68c7d23ccb89fbe2ac44f8f016fc993bf2c669e450794c3ab13463676cbb47c7bf7
-Size (dovecot-2.3.2.1.tar.gz) = 6797491 bytes
+SHA1 (dovecot-2.3.3.tar.gz) = 26be4a4b5b7c175b19e634b1498075a8bc1c086c
+RMD160 (dovecot-2.3.3.tar.gz) = e4c1ce666cc5a8b68dc1cabaae0907dcf6a2df69
+SHA512 (dovecot-2.3.3.tar.gz) = 8666c4f92f7df883067540f85be9d03dbe6815b58a7f5de55b4292e986e9a2a1ef52c7e0c72dde2bc781fe40d57488b78a99b6b813745b8e4683f1a2fdc1f2ff
+Size (dovecot-2.3.3.tar.gz) = 6851107 bytes
 SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
 SHA1 (patch-ab) = 9db15fd853ba47ef4bf04f2adc9ab24f71ee4d1e
 SHA1 (patch-ae) = c795585df9f415ceabb28eec1ff691ee26168d3b