Pullup ticket #3981 - requested by adam

mail/dovecot2: security update

Revisions pulled up:
- mail/dovecot2/MESSAGE                                         1.2
- mail/dovecot2/Makefile                                        1.29,1.32-1.33
- mail/dovecot2/PLIST                                           1.17-1.18
- mail/dovecot2/distinfo                                        1.26-1.28

---
   Module Name:	pkgsrc
   Committed By:	ghen
   Date:		Mon Oct  1 07:10:15 UTC 2012

   Modified Files:
   	pkgsrc/mail/dovecot2: MESSAGE Makefile PLIST distinfo

   Log Message:
   Update to Dovecot 2.1.10

   + imap: Implemented THREAD=ORDEREDSUBJECT extension.
   + Added "doveadm exec" command to easily execute commands from libexec_dir,
     e.g. "doveadm exec imap -u user@domain"
   + Added "doveadm copy" command.
   + doveadm copy/move: Added optional user parameter to specify the source
     username. This allows easily copying mails between different users.
   + Added namespace { disabled } setting to quickly enable/disable namespaces.
     This is especially useful when its value is returned by userdb.
   + Added mailbox_alias plugin. It allows creating mailbox aliases using
     symlinks.
   + imapc storage: Added imapc_max_idle_time setting to force activity on
     connection.
   + fts-solr: Expunging multiple messages is now faster.
   - director: In some conditions director may have disconnected from another
     director (without logging about it), thinking it was sending invalid data.
   - imap: Various fixes to listing mailboxes.
   - pop3-migration plugin: Avoid disconnection from POP3 server due to idling.
   - login processes crashed if there were a lot of local {} or remote {} settings
     blocks.

---
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Tue Dec  4 08:18:35 UTC 2012

   Modified Files:
   	pkgsrc/mail/dovecot2: Makefile PLIST distinfo

   Log Message:
   Update "dovecot2" package to version 2.1.11. Changes since 2.1.10:
   - lmtp/lda: dovecot.index.cache file is no longer fully mapped to
     memory, allowing mail deliveries to work even if the file is huge.
   - auth: userdb passwd lookups are now done by auth worker processes
     instead of auth master process (as it was documented, but
     accidentally didn't work that way).
   - lmtp: lmtp_rcpt_check_quota=yes setting checks quota on RCPT TO.
   - lmtp: After successful proxying RCPT TO, the next one to a
     nonexistent user gave tempfail error instead of "user not found".
   - lmtp proxy: Fixed hanging if remote server was down.
   - imap: Fixed crash when SEARCH contained multiple KEYWORD parameters.
   - doveadm: Various fixes to handling doveadm-server connections.
   - -i <instance name> parameter for Dovecot tools didn't work correctly.
   - director was somewhat broken in v2.1.10. This version also includes
     various reliability enhancements.
   - auth: passdb imap was broken in v2.1.10.

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Tue Dec  4 09:28:24 UTC 2012

   Modified Files:
   	pkgsrc/mail/dovecot2: Makefile distinfo

   Log Message:
   Changes 2.1.12:
   The dovecot-config file installed by v2.1.11 was missing quotes, which
   broke building Pigeonhole. This release fixes that.

4 files changed, 17 insertions, 8 deletions

diff --git a/mail/dovecot2/MESSAGE b/mail/dovecot2/MESSAGE
index 2fd9eabbb46..7053d21317e 100644
--- a/mail/dovecot2/MESSAGE
+++ b/mail/dovecot2/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2010/11/09 15:23:11 ghen Exp $
+$NetBSD: MESSAGE,v 1.1.16.1 2012/12/04 14:04:43 tron Exp $
 
 The configuration for Dovecot 2.0 now lives in ${PKG_SYSCONFDIR}/dovecot/,
 and is split in multiple files.
@@ -11,4 +11,6 @@ When upgrading from Dovecot 1.2.x, you can either:
 
 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 af62debb20c..1fa73e2928c 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2012/08/13 13:57:46 ghen Exp $
+# $NetBSD: Makefile,v 1.28.2.1 2012/12/04 14:04:43 tron Exp $
 
-DISTNAME=	dovecot-2.1.9
+DISTNAME=	dovecot-2.1.12
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dovecot.org/releases/2.1/
 
@@ -64,6 +64,9 @@ post-install:
 
 .include "options.mk"
 
+# Don't compress manual pages as they include each other.
+.undef MANZ
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index 952a37d14ed..e4863f4ebc4 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2012/08/13 13:57:46 ghen Exp $
+@comment $NetBSD: PLIST,v 1.16.2.1 2012/12/04 14:04:43 tron Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -374,6 +374,7 @@ lib/dovecot/lib20_expire_plugin.la
 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_replication_plugin.la
 lib/dovecot/lib20_virtual_plugin.la
 lib/dovecot/lib20_zlib_plugin.la
@@ -461,6 +462,7 @@ 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
@@ -588,6 +590,7 @@ 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
@@ -660,6 +663,7 @@ 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 082b384673d..80b88e3e6b1 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2012/08/13 13:57:46 ghen Exp $
+$NetBSD: distinfo,v 1.25.2.1 2012/12/04 14:04:43 tron Exp $
 
-SHA1 (dovecot-2.1.9.tar.gz) = f576e3f4015cc88fc509f693741aaf137f46ed91
-RMD160 (dovecot-2.1.9.tar.gz) = a568e57256eecbf8afe32285f7e50eaf4fbae67a
-Size (dovecot-2.1.9.tar.gz) = 3829755 bytes
+SHA1 (dovecot-2.1.12.tar.gz) = 6bbff6c8d9e4be8c2fa95d0adff28f692099a88c
+RMD160 (dovecot-2.1.12.tar.gz) = ebf122130988e5c243a0bdc89be0088ab5aa8acb
+Size (dovecot-2.1.12.tar.gz) = 3839088 bytes
 SHA1 (patch-aa) = 882f0c9fcf3acdfd2feaf7919309f770324f9843
 SHA1 (patch-ab) = 218948585c96492a832ea903f31a6f9ad9fc69f0
 SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6