Changes 2.1.15:

v2.1.14's dovecot.index.cache fixes caused Dovecot to use more disk I/O
and memory than was necessary.

7 files changed, 19 insertions, 15 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index f0920542b6c..b3e003221f9 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2013/02/06 23:20:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.38 2013/02/11 21:30:00 adam Exp $
 
-DISTNAME=	dovecot-2.1.13
-PKGREVISION=	2
+DISTNAME=	dovecot-2.1.15
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dovecot.org/releases/2.1/
 
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index d5b6ebd6957..f8f7f242c39 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2013/01/19 05:25:51 manu Exp $
+@comment $NetBSD: PLIST,v 1.20 2013/02/11 21:30:00 adam Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -462,7 +462,6 @@ share/doc/dovecot/thread-refs.txt
 share/doc/dovecot/wiki/ACL.txt
 share/doc/dovecot/wiki/AixPluginsSupport.txt
 share/doc/dovecot/wiki/AuthDatabase.CheckPassword.txt
-share/doc/dovecot/wiki/AuthDatabase.Dict.txt
 share/doc/dovecot/wiki/AuthDatabase.LDAP.AuthBinds.txt
 share/doc/dovecot/wiki/AuthDatabase.LDAP.PasswordLookups.txt
 share/doc/dovecot/wiki/AuthDatabase.LDAP.Userdb.txt
@@ -590,7 +589,6 @@ share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.NoLogin.txt
 share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.Proxy.txt
 share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.User.txt
 share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.txt
-share/doc/dovecot/wiki/PasswordDatabase.IMAP.txt
 share/doc/dovecot/wiki/PasswordDatabase.PAM.txt
 share/doc/dovecot/wiki/PasswordDatabase.Shadow.txt
 share/doc/dovecot/wiki/PasswordDatabase.Static.txt
@@ -663,7 +661,6 @@ share/doc/dovecot/wiki/Upgrading.1.1.txt
 share/doc/dovecot/wiki/Upgrading.1.2.txt
 share/doc/dovecot/wiki/Upgrading.2.0.txt
 share/doc/dovecot/wiki/Upgrading.2.1.txt
-share/doc/dovecot/wiki/Upgrading.2.2.txt
 share/doc/dovecot/wiki/Upgrading.txt
 share/doc/dovecot/wiki/UserDatabase.ExtraFields.txt
 share/doc/dovecot/wiki/UserDatabase.NSS.txt
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 09ca5bb38a6..80a2e5325cb 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.31 2013/01/27 11:50:04 bouyer Exp $
+$NetBSD: distinfo,v 1.32 2013/02/11 21:30:00 adam Exp $
 
-SHA1 (dovecot-2.1.13.tar.gz) = 76c631f799c389731c75e5c8afef7722f0438c70
-RMD160 (dovecot-2.1.13.tar.gz) = c6ed60d0183e0ece0119d32dde218b09b6c89910
-Size (dovecot-2.1.13.tar.gz) = 3843407 bytes
+SHA1 (dovecot-2.1.15.tar.gz) = b7a5db2b5fefc5033adf45c87079f2e4c15eb4d2
+RMD160 (dovecot-2.1.15.tar.gz) = ba1d02cfe7ca264469f236be3ffab7824809b489
+Size (dovecot-2.1.15.tar.gz) = 3862058 bytes
 SHA1 (patch-aa) = 882f0c9fcf3acdfd2feaf7919309f770324f9843
 SHA1 (patch-ab) = 218948585c96492a832ea903f31a6f9ad9fc69f0
 SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6
@@ -11,10 +11,10 @@ SHA1 (patch-af) = 6d4b339898cba762243c1ff415e0fd09e3dec750
 SHA1 (patch-aj) = 9e7970d29d11c097b9588ad16611f6d0e48235c2
 SHA1 (patch-ak) = ca4edaa46472a0cb609cea4d06893c7bd1312f54
 SHA1 (patch-config.h.in) = d6eb5879d71a838f17e3f2d33350d80a546f6ef4
-SHA1 (patch-configure) = 1252abb974a641f316a80365c371b579d7d030c8
-SHA1 (patch-configure.in) = 22676c2acc2967142231e447e44c3b033982bc0e
+SHA1 (patch-configure) = 39f9bb98ac1a2c99ff277f522e725c56d381279f
+SHA1 (patch-configure.in) = bb80a414f28577450dfd139050d0577c4f056bcd
 SHA1 (patch-src_lib_network.c) = 31e666492a2ce7c660e04f5e6aa57018b047940d
-SHA1 (patch-src_plugins_quota_Makefile.am) = 2cce87a5c4f34aa726f94c2eb9c3ceb77bd066dd
-SHA1 (patch-src_plugins_quota_Makefile.in) = 84375b23af9f18fc2eee24c90524e4be23128ced
+SHA1 (patch-src_plugins_quota_Makefile.am) = 8f36b1b089b164f2ef1828dbcc058a7666909e04
+SHA1 (patch-src_plugins_quota_Makefile.in) = 0919a4d99f53f0521d167f588db3418509122990
 SHA1 (patch-src_plugins_quota_quota-fs.c) = a2f47d3df1d508fdf894f91367f7899b23e156a3
 SHA1 (patch-src_plugins_quota_quota-fs.h) = 69f9dc9a97049229ebfe3f36a617952fba25e4a1
diff --git a/mail/dovecot2/patches/patch-configure b/mail/dovecot2/patches/patch-configure
index 65803184699..856229969d5 100644
--- a/mail/dovecot2/patches/patch-configure
+++ b/mail/dovecot2/patches/patch-configure
@@ -1,3 +1,5 @@
+$NetBSD: patch-configure,v 1.2 2013/02/11 21:30:00 adam Exp $
+
 --- configure.orig	2013-01-07 08:52:01.000000000 +0100
 +++ configure	2013-01-19 02:57:06.000000000 +0100
 @@ -631,8 +631,9 @@
diff --git a/mail/dovecot2/patches/patch-configure.in b/mail/dovecot2/patches/patch-configure.in
index f1e5edb60e8..6b4b50636cc 100644
--- a/mail/dovecot2/patches/patch-configure.in
+++ b/mail/dovecot2/patches/patch-configure.in
@@ -1,3 +1,5 @@
+$NetBSD: patch-configure.in,v 1.2 2013/02/11 21:30:00 adam Exp $
+
 --- configure.in.orig	2013-01-07 08:51:52.000000000 +0100
 +++ configure.in	2013-01-19 02:56:47.000000000 +0100
 @@ -288,9 +288,10 @@
diff --git a/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.am b/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.am
index 2767f97f910..6c149efcf36 100644
--- a/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.am
+++ b/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.am
@@ -1,3 +1,5 @@
+$NetBSD: patch-src_plugins_quota_Makefile.am,v 1.2 2013/02/11 21:30:00 adam Exp $
+
 --- src/plugins/quota/Makefile.am.orig	2013-01-19 02:59:14.000000000 +0100
 +++ src/plugins/quota/Makefile.am	2013-01-19 03:05:16.000000000 +0100
 @@ -26,8 +26,11 @@
diff --git a/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.in b/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.in
index c830e5a260a..885b3a5d728 100644
--- a/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.in
+++ b/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.in
@@ -1,3 +1,5 @@
+$NetBSD: patch-src_plugins_quota_Makefile.in,v 1.2 2013/02/11 21:30:00 adam Exp $
+
 --- src/plugins/quota/Makefile.in.orig	2013-01-19 03:09:26.000000000 +0100
 +++ src/plugins/quota/Makefile.in	2013-01-19 03:07:06.000000000 +0100
 @@ -84,9 +84,10 @@