Update dovecot2 to 2.2.15.

Some small fixes and changes to v2.2.14. This release is mainly in the hope
that it could still make it into the next Debian stable instead of v2.2.14 -
mainly because of a couple of new assert crashes that started happening in
v2.2.14 and should be fixed now.

	* Plugins can now print a banner comment in doveconf output
	  (typically the plugin version)
	* Replication plugin now triggers low (instead of high) priority for
	  mail copying operations.
	* IMAP/POP3/ManageSieve proxy: If destination server can't be
	  connected to, retry connecting once per second up to the value of
	  proxy_timeout. This allows quick restarts/upgrades on the backend
	  server without returning login failures.
	* Internal passdb lookups (e.g. done by lmtp/doveadm proxy) wasn't
	  returning failure in some situations where it should have (e.g.
	  allow_nets mismatch)
	* LMTP uses mail_log_prefix now for logging mail deliveries instead of
	  a hardcoded prefix. The non-delivery log prefix is still hardcoded
	  though.

	+ passdb allow_nets=local matches lookups that don't contain an IP
	  address (internally done by Dovecot services)
	+ Various debug logging and error logging improvements
	- Various race condition fixes to LAYOUT=index
	- v2.2.14 virtual plugin crashed in some situations

5 files changed, 7 insertions, 82 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 063e51d155b..631e7abe9a9 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2014/10/20 09:29:11 adam Exp $
+# $NetBSD: Makefile,v 1.68 2014/11/02 07:34:51 taca Exp $
 
-DISTNAME=	dovecot-2.2.14
+DISTNAME=	dovecot-2.2.15
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
 
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index e9b8acd14cb..2516e298426 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2014/10/20 09:29:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.37 2014/11/02 07:34:51 taca Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -760,7 +760,6 @@ share/doc/dovecot/wiki/SSL.txt
 share/doc/dovecot/wiki/Sasl.txt
 share/doc/dovecot/wiki/SecurityTuning.txt
 share/doc/dovecot/wiki/Services.txt
-share/doc/dovecot/wiki/SharedMailboxes.ClusterSetup.txt
 share/doc/dovecot/wiki/SharedMailboxes.Permissions.txt
 share/doc/dovecot/wiki/SharedMailboxes.Public.txt
 share/doc/dovecot/wiki/SharedMailboxes.Shared.txt
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index d07083384c4..cd497147973 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.50 2014/10/20 10:15:16 wiz Exp $
+$NetBSD: distinfo,v 1.51 2014/11/02 07:34:51 taca Exp $
 
-SHA1 (dovecot-2.2.14.tar.gz) = c1bd46b679e72e90c8e70eb6bd285d799b7ed922
-RMD160 (dovecot-2.2.14.tar.gz) = a5688af3ed4c5ab0d833fa09c01ba3240bf5b256
-Size (dovecot-2.2.14.tar.gz) = 4720087 bytes
+SHA1 (dovecot-2.2.15.tar.gz) = 10c90f1f08797b5931703d52a871437e6561d76f
+RMD160 (dovecot-2.2.15.tar.gz) = 32e15e566814c5adc3e292eddb6794d2bf59ff41
+Size (dovecot-2.2.15.tar.gz) = 4747444 bytes
 SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
 SHA1 (patch-ab) = d637a64feec8e4eafacda149cf0193aa1b70a054
 SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
 SHA1 (patch-af) = c066e94dd6593d16eec3e66f5f4d26f021918498
-SHA1 (patch-src_plugins_quota_quota-fs.c) = aa4865214cab4cbde1e04dc578ee394f97103185
-SHA1 (patch-src_plugins_quota_quota-fs.h) = 068b5f418f1354233805e2f7230b95e7a9c407b4
diff --git a/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.c b/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.c
deleted file mode 100644
index b0d55317926..00000000000
--- a/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.c
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-src_plugins_quota_quota-fs.c,v 1.4 2013/08/05 23:12:42 bouyer Exp $
-
-fix support for NetBSD's libquota
-
---- src/plugins/quota/quota-fs.c.orig	2013-02-26 09:42:04.000000000 +0100
-+++ src/plugins/quota/quota-fs.c	2013-08-06 01:00:32.000000000 +0200
-@@ -672,34 +672,38 @@
- {
- 	struct quotakey qk;
- 	struct quotaval qv;
-+	struct quotahandle *qh;
-+	int ret;
- 
--	if (root->qh == NULL) {
--		if ((root->qh = quota_open(root->mount->mount_path)) == NULL) {
--			i_error("cannot open quota for %s: %m",
--				root->mount->mount_path);
--			fs_quota_root_disable(root, group);
--			return 0;
--		}
--	} 
-+	if ((qh = quota_open(root->mount->mount_path)) == NULL) {
-+		i_error("cannot open quota for %s: %m",
-+			root->mount->mount_path);
-+		fs_quota_root_disable(root, group);
-+		return 0;
-+	}
- 
- 	qk.qk_idtype = group ? QUOTA_IDTYPE_GROUP : QUOTA_IDTYPE_USER;
- 	qk.qk_id = group ? root->gid : root->uid;
- 	qk.qk_objtype = bytes ? QUOTA_OBJTYPE_BLOCKS : QUOTA_OBJTYPE_FILES;
- 
--	if (quota_get(root->qh, &qk, &qv) != 0) {
-+	if (quota_get(qh, &qk, &qv) != 0) {
- 		if (errno == ESRCH) {
- 			fs_quota_root_disable(root, group);
- 			return 0;
- 		}
- 		i_error("quotactl(Q_GETQUOTA, %s) failed: %m",
- 			root->mount->mount_path);
--		return -1;
-+		ret = -1;
-+		goto end;
- 	}
- 
- 	*value_r = qv.qv_usage * DEV_BSIZE;
- 	*limit_r = qv.qv_softlimit * DEV_BSIZE;
- 
--	return 1;
-+	ret = 1;
-+end:
-+	quota_close(qh);
-+	return ret;
- }
- #endif
- 
diff --git a/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.h b/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.h
deleted file mode 100644
index ebb21e6dfbb..00000000000
--- a/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_plugins_quota_quota-fs.h,v 1.4 2013/08/05 23:12:42 bouyer Exp $
-
-fix support for NetBSD's libquota
-
---- src/plugins/quota/quota-fs.h.orig	2013-08-06 00:53:34.000000000 +0200
-+++ src/plugins/quota/quota-fs.h	2013-08-06 00:54:29.000000000 +0200
-@@ -7,7 +7,8 @@
- #endif
- 
- #ifdef HAVE_QUOTA_OPEN
--#  include <quota.h> /* NetBSD with libquota */
-+/* absolute path to avoid confusion with ./quota.h */
-+#  include "/usr/include/quota.h" /* NetBSD with libquota */
- #endif
- 
- #ifdef HAVE_SYS_QUOTA_H