dovecot2: updated to 2.3.4

2.3.4:
 * The default postmaster_address is now "postmaster@<user domain or
   server hostname>". If username contains the @domain part, that's
   used. If not, then the server's hostname is used.
 * "doveadm stats dump" now returns two decimals for the "avg" field.

 + Added push notification driver that uses a Lua script
 + Added new SQL, DNS and connection events.
   See https://wiki2.dovecot.org/Events
 + Added "doveadm mailbox cache purge" command.
 + Added events API support for Lua scripts
 + doveadm force-resync -f parameter performs "index fsck" while opening
   the index. This may be useful to fix some types of broken index files.
   This may become the default behavior in a later version.
 - director: Kicking a user crashes if login process is very slow
 - pop3_no_flag_updates=no: Don't expunge DELEted and RETRed messages
   unless QUIT is sent.
 - auth: Fix crypt() segfault with glibc-2.28+
 - imap: Running UID FILTER script with errors assert-crashes
 - dsync, pop3-migration: POP3 UIDLs weren't added to
   dovecot.index.cache while mails were saved.
 - dict clients may have been using 100% CPU while waiting for dict
   server to finish commands.
 - doveadm user: Fixed user listing via HTTP API
 - All levels of Cassandra log messages were logged as Dovecot errors.
 - http/smtp client may have crashed after SSL handshake
 - Lua auth converted strings that looked like numbers into numbers.

11 files changed, 48 insertions, 51 deletions

diff --git a/mail/dovecot2-gssapi/Makefile b/mail/dovecot2-gssapi/Makefile
index 665a4f90143..bf0303e7f77 100644
--- a/mail/dovecot2-gssapi/Makefile
+++ b/mail/dovecot2-gssapi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/10/23 16:29:18 adam Exp $
+# $NetBSD: Makefile,v 1.5 2018/11/30 18:43:09 adam Exp $
 
-.include "../../mail/dovecot2/Makefile.plugin"
+.include "../../mail/dovecot2/Makefile.common"
 
-PKGNAME=		${DISTNAME:S/dovecot/dovecot-gssapi/}
-COMMENT+=		(GSSAPI plugin)
+PKGNAME=	${DISTNAME:S/dovecot/dovecot-gssapi/}
+COMMENT+=	(GSSAPI plugin)
 
 CONFIGURE_ARGS+=	--with-gssapi=plugin
 
diff --git a/mail/dovecot2-ldap/Makefile b/mail/dovecot2-ldap/Makefile
index f2e096985bf..852688cfc84 100644
--- a/mail/dovecot2-ldap/Makefile
+++ b/mail/dovecot2-ldap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/10/23 16:29:18 adam Exp $
+# $NetBSD: Makefile,v 1.4 2018/11/30 18:43:09 adam Exp $
 
-.include "../../mail/dovecot2/Makefile.plugin"
+.include "../../mail/dovecot2/Makefile.common"
 
-PKGNAME=		${DISTNAME:S/dovecot/dovecot-ldap/}
-COMMENT+=		(LDAP plugin)
+PKGNAME=	${DISTNAME:S/dovecot/dovecot-ldap/}
+COMMENT+=	(LDAP plugin)
 
 CONFIGURE_ARGS+=	--with-ldap=plugin
 
@@ -11,17 +11,16 @@ INSTALLATION_DIRS+=	include/dovecot \
 			lib/dovecot/auth lib/dovecot/dict
 
 do-install:
-	cd ${WRKSRC} && (\
+	cd ${WRKSRC} && \
 		${LIBTOOL} --mode=install ${INSTALL_LIB} \
 			src/auth/libauthdb_ldap.la \
-			${DESTDIR}${PREFIX}/lib/dovecot/auth; \
+			${DESTDIR}${PREFIX}/lib/dovecot/auth && \
 		${LIBTOOL} --mode=install ${INSTALL_LIB} \
 			src/lib-ldap/libdovecot-ldap.la \
-			${DESTDIR}${PREFIX}/lib/dovecot; \
+			${DESTDIR}${PREFIX}/lib/dovecot && \
 		${LIBTOOL} --mode=install ${INSTALL_LIB} \
 			src/lib-dict-backend/libdict_ldap.la \
-			${DESTDIR}${PREFIX}/lib/dovecot/dict; \
-	)
+			${DESTDIR}${PREFIX}/lib/dovecot/dict
 	${INSTALL_DATA} ${WRKSRC}/src/lib-ldap/ldap-client.h \
 		${DESTDIR}${PREFIX}/include/dovecot
 
diff --git a/mail/dovecot2-mysql/Makefile b/mail/dovecot2-mysql/Makefile
index 84a382de443..be0ce9214b4 100644
--- a/mail/dovecot2-mysql/Makefile
+++ b/mail/dovecot2-mysql/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2018/10/23 16:29:18 adam Exp $
+# $NetBSD: Makefile,v 1.3 2018/11/30 18:43:09 adam Exp $
 
-.include "../../mail/dovecot2/Makefile.plugin"
+.include "../../mail/dovecot2/Makefile.common"
 
-PKGNAME=		${DISTNAME:S/dovecot/dovecot-mysql/}
-COMMENT+=		(mysql plugin)
+PKGNAME=	${DISTNAME:S/dovecot/dovecot-mysql/}
+COMMENT+=	(MySQL plugin)
 
 CONFIGURE_ARGS+=	--with-sql=plugin
 CONFIGURE_ARGS+=	--with-mysql
diff --git a/mail/dovecot2-pgsql/Makefile b/mail/dovecot2-pgsql/Makefile
index 4cfcbce83ac..f6a76697602 100644
--- a/mail/dovecot2-pgsql/Makefile
+++ b/mail/dovecot2-pgsql/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2017/03/18 07:14:47 adam Exp $
+# $NetBSD: Makefile,v 1.4 2018/11/30 18:43:09 adam Exp $
 
-.include "../../mail/dovecot2/Makefile.plugin"
+.include "../../mail/dovecot2/Makefile.common"
 
-PKGNAME=		${DISTNAME:S/dovecot/dovecot-pgsql/}
-COMMENT+=		(pgsql plugin)
+PKGNAME=	${DISTNAME:S/dovecot/dovecot-pgsql/}
+COMMENT+=	(PostgreSQL plugin)
 
 CONFIGURE_ARGS+=	--with-sql=plugin
 CONFIGURE_ARGS+=	--with-pgsql
diff --git a/mail/dovecot2-sqlite/Makefile b/mail/dovecot2-sqlite/Makefile
index 8561f80c8fd..4bddb643b8a 100644
--- a/mail/dovecot2-sqlite/Makefile
+++ b/mail/dovecot2-sqlite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2018/10/23 16:29:18 adam Exp $
+# $NetBSD: Makefile,v 1.15 2018/11/30 18:43:10 adam Exp $
 
-.include "../../mail/dovecot2/Makefile.plugin"
+.include "../../mail/dovecot2/Makefile.common"
 
-PKGNAME=		${DISTNAME:S/dovecot/dovecot-sqlite/}
-COMMENT+=		(sqlite plugin)
+PKGNAME=	${DISTNAME:S/dovecot/dovecot-sqlite/}
+COMMENT+=	(SQLite plugin)
 
 CONFIGURE_ARGS+=	--with-sql=plugin
 CONFIGURE_ARGS+=	--with-sqlite
diff --git a/mail/dovecot2/Makefile.common b/mail/dovecot2/Makefile.common
index 9bf8c868dec..2cc970f0dee 100644
--- a/mail/dovecot2/Makefile.common
+++ b/mail/dovecot2/Makefile.common
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile.common,v 1.21 2018/10/23 16:29:18 adam Exp $
+# $NetBSD: Makefile.common,v 1.22 2018/11/30 18:43:09 adam Exp $
 #
 # when updating to a new release, update ABI depends in
 # the buildlink3.mk file as well, since the plugins' version
 # must match (see PR 49563).
 #
 # used by mail/dovecot2/Makefile
-# used by mail/dovecot2/Makefile.plugin
+# used by mail/dovecot2-gssapi/Makefile
+# used by mail/dovecot2-ldap/Makefile
+# used by mail/dovecot2-mysql/Makefile
+# used by mail/dovecot2-pgsql/Makefile
+# used by mail/dovecot2-sqlite/Makefile
 
-DISTNAME=	dovecot-2.3.3
+DISTNAME=	dovecot-2.3.4
 CATEGORIES=	mail
 MASTER_SITES=	https://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
 
@@ -19,6 +23,10 @@ LICENSE=	mit AND gnu-lgpl-v2.1 AND modified-bsd
 DISTINFO_FILE=	${.CURDIR}/../../mail/dovecot2/distinfo
 PATCHDIR=	${.CURDIR}/../../mail/dovecot2/patches
 
+.if "${PKGPATH}" != "mail/dovecot2"
+DEPENDS+=	dovecot>=${PKGVERSION_NOREV}{nb*,}:../../mail/dovecot2
+.endif
+
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config rpcgen
 GNU_CONFIGURE=		yes
@@ -46,7 +54,7 @@ CONFIGURE_ARGS.SunOS+=	--with-notify=none
 
 # Sharing sources between binary and lib triggers libtool bugs
 # mv: rename .deps/auth-stats.Tpo to .deps/auth-stats.Po: No such file or directory
-MAKE_JOBS_SAFE=	no
+#MAKE_JOBS_SAFE=	no
 
 .include "options.mk"
 
diff --git a/mail/dovecot2/Makefile.plugin b/mail/dovecot2/Makefile.plugin
deleted file mode 100644
index 3e984a4da42..00000000000
--- a/mail/dovecot2/Makefile.plugin
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile.plugin,v 1.2 2017/10/12 10:34:28 adam Exp $
-#
-# used by mail/dovecot2-gssapi/Makefile
-# used by mail/dovecot2-ldap/Makefile
-# used by mail/dovecot2-mysql/Makefile
-# used by mail/dovecot2-pgsql/Makefile
-# used by mail/dovecot2-sqlite/Makefile
-
-.include "../../mail/dovecot2/Makefile.common"
-
-DEPENDS+=	dovecot>=${PKGVERSION_NOREV}{nb*,}:../../mail/dovecot2
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index 54eb1aed0f9..860a961ae54 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.62 2018/10/23 16:29:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.63 2018/11/30 18:43:09 adam Exp $
+@pkgdir etc/dovecot
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -780,6 +781,7 @@ 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
+share/doc/dovecot/wiki/Design.ParameterForwarding.txt
 share/doc/dovecot/wiki/Design.Plugins.txt
 share/doc/dovecot/wiki/Design.Processes.txt
 share/doc/dovecot/wiki/Design.Storage.ErrorHandling.txt
@@ -1040,4 +1042,3 @@ share/examples/dovecot/dovecot-openssl.cnf
 share/examples/dovecot/dovecot-sql.conf.ext
 share/examples/dovecot/dovecot.conf
 share/examples/dovecot/mkcert.sh
-@pkgdir etc/dovecot
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
index d475d000753..7286c53d5be 100644
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2018/05/22 20:49:45 triaxx Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/11/30 18:43:09 adam 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.1
+BUILDLINK_ABI_DEPENDS.dovecot+=		dovecot>=2.3.4
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot2
 
 pkgbase:=	dovecot
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 46c597b7bad..85e475d6b6e 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.85 2018/10/23 16:29:18 adam Exp $
+$NetBSD: distinfo,v 1.86 2018/11/30 18:43:09 adam Exp $
 
-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 (dovecot-2.3.4.tar.gz) = 45f4ec697515d6c17d2a9c34b8bd345f84964229
+RMD160 (dovecot-2.3.4.tar.gz) = 50f3ee11843de138299e903cd0cfcb4d91436dbe
+SHA512 (dovecot-2.3.4.tar.gz) = 9e97eb08c319c417e8abcb430b3e6c87ed5aa820d6288656fdfd958ff34664f67202a66e4846763bfc85b309b116cea8012e49dab98b478c57974cc178a37a5a
+Size (dovecot-2.3.4.tar.gz) = 6924178 bytes
 SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
 SHA1 (patch-ab) = 9db15fd853ba47ef4bf04f2adc9ab24f71ee4d1e
 SHA1 (patch-ae) = c795585df9f415ceabb28eec1ff691ee26168d3b
diff --git a/mail/dovecot2/options.mk b/mail/dovecot2/options.mk
index dc0367e6d36..2c8c7702440 100644
--- a/mail/dovecot2/options.mk
+++ b/mail/dovecot2/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.10 2016/07/18 15:03:05 fhajny Exp $
+# $NetBSD: options.mk,v 1.11 2018/11/30 18:43:09 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dovecot
 PKG_SUPPORTED_OPTIONS=	kqueue pam tcpwrappers
-PKG_OPTIONS_OPTIONAL_GROUPS= ssl
+PKG_OPTIONS_OPTIONAL_GROUPS=ssl
 PKG_OPTIONS_GROUP.ssl=	gnutls ssl
 PKG_SUGGESTED_OPTIONS=	pam ssl tcpwrappers