Update dovecot2 package to 2.2.18.

v2.2.18 2015-05-15  Timo Sirainen <tss@iki.fi>

	- director: Login UNIX sockets were normally detected as doveadm or
	  director ring sockets, causing it to break in existing installations.
	- sdbox: When copying a mail in alt storage, place the destination to
	  alt storage as well.

v2.2.17 2015-05-13  Timo Sirainen <tss@iki.fi>

	* Dovecot no longer checks or warns if a mountpoint is removed. This
	  was causing more trouble than it was worth. Make sure that all the
	  mountpoints that Dovecot accesses aren't writable by mail processes
	  when they're unmounted.
	* dict server wasn't properly escaping/unescaping data. Fixing this
	  broke backwards compatibility with data that contains line feeds.
	  This hopefully affects only very few installations. If you're using
	  dict to save multiline data (Sieve scripts to SQL), you may be
	  affected.
	* imap: SPECIAL-USE capability is no longer advertised if there are
	  no special_use flags specified for any mailboxes.

	+ lmtp: Added lmtp_hdr_delivery_address setting to specify whether
	  to include email address in Delivered-To: and Received: headers.
	+ Added initial version of full text search library, which includes
	  language-specific text normalization and filtering. This is still
	  in development, but it's already possible to use for testing with
	  fts-lucene and fts-solr.
	+ lda, lmtp: deliver_log_format can now include %{delivery_time},
	  which expands to how many milliseconds it took to deliver the mail.
	  With LMTP %{session_time} also expands to how many milliseconds the
	  LMTP session took, not including the delivery time.
	+ lmtp proxy: Mail delivery logging includes timing information.
	+ imap: Most IMAP commands now include in the tagged reply how many
	  milliseconds it took to run the command (not counting the time spent
	  on waiting for the IMAP client to read/write data).
	+ director: Implemented director_proxy_maybe passdb extra field to
	  be able to run director and backend in the same Dovecot instance.
	  (LMTP doesn't support mixed proxy/non-proxy destinations currently.)
	+ doveadm: Added -F <file> parameter to read a list of users from the
	  given file and run the command for all the users. This is similar to
	  -A parameter reading the list of users from userdb lookup.
	+ Implemented initial Cassandra CQL support as lib-sql backend. It's
	  only usable as dict backend currently.
	+ Added quota-clone plugin to copy current quota usage to a dict.
	- auth: If auth_master_user_separator was set, auth process could be
	  crashed by trying to log in with empty master username.
	- imap-login, pop3-login: Fixed crash on handshake failures with new
	  OpenSSL versions (v1.0.2) when SSLv3 was disabled.
	- auth: If one passdb fails allow_nets check, it shouldn't have failed
	  all the other passdb checks later on.
	- imap: Server METADATA couldn't be accessed
	- imapc: Fixed \Muted label handling in gmail-migration.
	- imapc: Various bugfixes and improvements.
	- Trash plugin fixes by Alexei Gradinari
	- mbox: Fixed crash/corruption in some situations

5 files changed, 29 insertions, 66 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index cc07a5aafe7..bed61e89ee4 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.75 2015/05/10 07:33:49 taca Exp $
+# $NetBSD: Makefile,v 1.76 2015/05/17 00:12:45 taca 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).
 
-DISTNAME=	dovecot-2.2.16
-PKGREVISION=	2
+DISTNAME=	dovecot-2.2.18
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
 
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index cf0f966d4b2..085e028f649 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2015/03/14 10:52:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.40 2015/05/17 00:12:45 taca Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -107,6 +107,7 @@ include/dovecot/fts-api.h
 include/dovecot/fts-expunge-log.h
 include/dovecot/fts-indexer.h
 include/dovecot/fts-parser.h
+include/dovecot/fts-user.h
 include/dovecot/guid.h
 include/dovecot/hash-decl.h
 include/dovecot/hash-format.h
@@ -147,6 +148,7 @@ include/dovecot/imap-envelope.h
 include/dovecot/imap-expunge.h
 include/dovecot/imap-fetch.h
 include/dovecot/imap-id.h
+include/dovecot/imap-keepalive.h
 include/dovecot/imap-list.h
 include/dovecot/imap-match.h
 include/dovecot/imap-metadata.h
@@ -217,6 +219,7 @@ include/dovecot/istream-chain.h
 include/dovecot/istream-concat.h
 include/dovecot/istream-crlf.h
 include/dovecot/istream-dot.h
+include/dovecot/istream-file-private.h
 include/dovecot/istream-fs-file.h
 include/dovecot/istream-hash.h
 include/dovecot/istream-header-filter.h
@@ -232,9 +235,11 @@ include/dovecot/istream-seekable.h
 include/dovecot/istream-sized.h
 include/dovecot/istream-tee.h
 include/dovecot/istream-timeout.h
+include/dovecot/istream-unix.h
 include/dovecot/istream-zlib.h
 include/dovecot/istream.h
 include/dovecot/json-parser.h
+include/dovecot/json-tree.h
 include/dovecot/lda-settings.h
 include/dovecot/lib-signals.h
 include/dovecot/lib.h
@@ -279,6 +284,8 @@ include/dovecot/mail-transaction-log.h
 include/dovecot/mail-types.h
 include/dovecot/mail-user-hash.h
 include/dovecot/mail-user.h
+include/dovecot/mailbox-attribute-private.h
+include/dovecot/mailbox-attribute.h
 include/dovecot/mailbox-guid-cache.h
 include/dovecot/mailbox-list-delete.h
 include/dovecot/mailbox-list-fs.h
@@ -386,6 +393,7 @@ include/dovecot/primes.h
 include/dovecot/printf-format-fix.h
 include/dovecot/priorityq.h
 include/dovecot/process-title.h
+include/dovecot/qp-decoder.h
 include/dovecot/quota-fs.h
 include/dovecot/quota-plugin.h
 include/dovecot/quota-private.h
@@ -470,6 +478,7 @@ lib/dovecot/lib20_fts_plugin.la
 lib/dovecot/lib20_listescape_plugin.la
 lib/dovecot/lib20_mail_log_plugin.la
 lib/dovecot/lib20_mailbox_alias_plugin.la
+lib/dovecot/lib20_quota_clone_plugin.la
 lib/dovecot/lib20_replication_plugin.la
 lib/dovecot/lib20_virtual_plugin.la
 lib/dovecot/lib20_zlib_plugin.la
@@ -484,6 +493,7 @@ lib/dovecot/libdovecot-login.la
 lib/dovecot/libdovecot-sql.la
 lib/dovecot/libdovecot-storage.la
 lib/dovecot/libdovecot.la
+lib/dovecot/libfs_compress.la
 ${PLIST.ssl}lib/dovecot/libssl_iostream_openssl.la
 lib/dovecot/stats/libstats_mail.la
 libexec/dovecot/aggregator
@@ -724,8 +734,13 @@ share/doc/dovecot/wiki/Pigeonhole.ManageSieve.Install.txt
 share/doc/dovecot/wiki/Pigeonhole.ManageSieve.Troubleshooting.txt
 share/doc/dovecot/wiki/Pigeonhole.ManageSieve.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Configuration.Dict.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Configuration.File.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Configuration.LDAP.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Configuration.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Examples.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Duplicate.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Editheader.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Include.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.SpamtestVirustest.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Vacation.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.txt
@@ -751,6 +766,7 @@ share/doc/dovecot/wiki/Plugins.MailFilter.txt
 share/doc/dovecot/wiki/Plugins.MailLog.txt
 share/doc/dovecot/wiki/Plugins.MailboxAlias.txt
 share/doc/dovecot/wiki/Plugins.Notify.txt
+share/doc/dovecot/wiki/Plugins.QuotaClone.txt
 share/doc/dovecot/wiki/Plugins.Snarf.txt
 share/doc/dovecot/wiki/Plugins.Stats.txt
 share/doc/dovecot/wiki/Plugins.Trash.txt
@@ -788,6 +804,7 @@ share/doc/dovecot/wiki/SystemUsers.txt
 share/doc/dovecot/wiki/TestInstallation.txt
 share/doc/dovecot/wiki/TestPop3Installation.txt
 share/doc/dovecot/wiki/TimeMovedBackwards.txt
+share/doc/dovecot/wiki/Timeouts.txt
 share/doc/dovecot/wiki/Upgrading.1.0.txt
 share/doc/dovecot/wiki/Upgrading.1.1.txt
 share/doc/dovecot/wiki/Upgrading.1.2.txt
@@ -808,6 +825,9 @@ share/doc/dovecot/wiki/WhyDoesItNotWork.txt
 share/doc/dovecot/wiki/maildrop.txt
 share/doc/dovecot/wiki/mutt.txt
 share/doc/dovecot/wiki/uw2dovecot.sh.txt
+share/dovecot/stopwords/stopwords_en.txt
+share/dovecot/stopwords/stopwords_fi.txt
+share/dovecot/stopwords/stopwords_fr.txt
 share/examples/dovecot/conf.d/10-auth.conf
 share/examples/dovecot/conf.d/10-director.conf
 share/examples/dovecot/conf.d/10-logging.conf
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
index 4e2c14e2158..6c64879ae7e 100644
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2015/03/14 10:52:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2015/05/17 00:12:45 taca 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.2.16<2.2.17
+BUILDLINK_ABI_DEPENDS.dovecot+=		dovecot>=2.2.18<2.2.19
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot2
 
 pkgbase:=	dovecot
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 2bf37411e83..762daa235dc 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.54 2015/05/10 07:33:49 taca Exp $
+$NetBSD: distinfo,v 1.55 2015/05/17 00:12:45 taca Exp $
 
-SHA1 (dovecot-2.2.16.tar.gz) = 7b267ee939b790ee42809efebc96d6ae78a49432
-RMD160 (dovecot-2.2.16.tar.gz) = 79768b2077137d255a3cfbc492de6d979e594e31
-Size (dovecot-2.2.16.tar.gz) = 4830169 bytes
+SHA1 (dovecot-2.2.18.tar.gz) = 8309b5ef8d33d464eb7a6e1d3cba0b4e87c55eff
+RMD160 (dovecot-2.2.18.tar.gz) = 847ca54f76210d0f06b1471bee62d6fcdc7b02c7
+Size (dovecot-2.2.18.tar.gz) = 5100040 bytes
 SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
 SHA1 (patch-ab) = d637a64feec8e4eafacda149cf0193aa1b70a054
 SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
 SHA1 (patch-af) = c066e94dd6593d16eec3e66f5f4d26f021918498
-SHA1 (patch-src_login-common_ssl-proxy-openssl.c) = ae2929851b36a0ac230cbad602851d6d021f0e71
 SHA1 (patch-src_stats_mail-stats.h) = 90645c2aab956a0119630da4b71905db704bffda
diff --git a/mail/dovecot2/patches/patch-src_login-common_ssl-proxy-openssl.c b/mail/dovecot2/patches/patch-src_login-common_ssl-proxy-openssl.c
deleted file mode 100644
index c779981365f..00000000000
--- a/mail/dovecot2/patches/patch-src_login-common_ssl-proxy-openssl.c
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-src_login-common_ssl-proxy-openssl.c,v 1.1 2015/05/10 07:33:49 taca Exp $
-
-* Fix CVE-2015-3420 from revision 86f535375750 of dovecot-2.2.
-
---- src/login-common/ssl-proxy-openssl.c.orig	2015-01-29 16:01:15.000000000 +0000
-+++ src/login-common/ssl-proxy-openssl.c
-@@ -80,6 +80,7 @@ struct ssl_proxy {
- 	unsigned int cert_broken:1;
- 	unsigned int client_proxy:1;
- 	unsigned int flushing:1;
-+	unsigned int failed:1;
- };
- 
- struct ssl_parameters {
-@@ -131,6 +132,12 @@ static void ssl_proxy_ctx_set_crypto_par
- static int ssl_proxy_ctx_get_pkey_ec_curve_name(const struct master_service_ssl_settings *set);
- #endif
- 
-+static void ssl_proxy_destroy_failed(struct ssl_proxy *proxy)
-+{
-+	proxy->failed = TRUE;
-+	ssl_proxy_destroy(proxy);
-+}
-+
- static unsigned int ssl_server_context_hash(const struct ssl_server_context *ctx)
- {
- 	unsigned int i, g, h = 0;
-@@ -462,7 +469,7 @@ static void ssl_handle_error(struct ssl_
- 
- 	if (errstr != NULL) {
- 		proxy->last_error = i_strdup(errstr);
--		ssl_proxy_destroy(proxy);
-+		ssl_proxy_destroy_failed(proxy);
- 	}
- 	ssl_proxy_unref(proxy);
- }
-@@ -492,7 +499,7 @@ static void ssl_handshake(struct ssl_pro
- 
- 	if (proxy->handshake_callback != NULL) {
- 		if (proxy->handshake_callback(proxy->handshake_context) < 0)
--			ssl_proxy_destroy(proxy);
-+			ssl_proxy_destroy_failed(proxy);
- 	}
- }
- 
-@@ -822,7 +829,8 @@ void ssl_proxy_destroy(struct ssl_proxy 
- 	if (proxy->destroyed || proxy->flushing)
- 		return;
- 	proxy->flushing = TRUE;
--	ssl_proxy_flush(proxy);
-+	if (!proxy->failed && proxy->handshaked)
-+		ssl_proxy_flush(proxy);
- 	proxy->destroyed = TRUE;
- 
- 	ssl_proxy_count--;