Pullup ticket #4212 - requested by adam

mail/dovecot2: security update

Revisions pulled up:
- mail/dovecot2/Makefile                                    1.46,1.50 via patch
- mail/dovecot2/PLIST                                       1.25-1.26
- mail/dovecot2/distinfo                                    1.36,1.38

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Tue Jul  2 15:38:19 UTC 2013

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

   Log Message:
   Changes 2.2.4:
   + doveadm: Added "flags" command to modify message flags.
   + doveadm: Added "deduplicate" command to expunge message duplicates.
   + dsync: Show the state in process title with verbose_proctitle=yes.
   - imap/pop3 proxy: Master user logins were broken in v2.2.3
   - sdbox/mdbox: A corrupted index header with wrong size was never
     automatically fixed in v2.2.3.
   - mbox: Fixed assert-crashes related to locking

---
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Thu Aug 15 09:42:41 UTC 2013

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

   Log Message:
   Changes 2.2.5:
   + SSL: Added support for ECDH/ECDHE cipher suites
   + Added some missing man pages
   + quota-status: Added quota_status_toolarge setting
   - director: Users near expiration could have been redirected to
     different servers at the same time.
   - pop3: Avoid assert-crash if client disconnects during LIST.
   - mdbox: Corrupted index header still wasn't automatically fixed.
   - dsync: Various fixes to work better with imapc and pop3c storages.
   - ldap: sasl_bind=yes caused crashes, because Dovecot's lib-sasl
     symbols conflicted with Cyrus SASL library.
   - imap: Various error handling fixes to CATENATE. (Found using
     Apple's stress test script.)

3 files changed, 19 insertions, 9 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index a8e5630210e..5d464f8b557 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.45.2.1 2013/08/06 15:57:07 tron Exp $
+# $NetBSD: Makefile,v 1.45.2.2 2013/08/16 10:19:53 tron Exp $
 
-DISTNAME=	dovecot-2.2.2
+DISTNAME=	dovecot-2.2.5
 CATEGORIES=	mail
-MASTER_SITES=	http://www.dovecot.org/releases/2.2/
-PKGREVISION=	1
+MASTER_SITES=	http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.dovecot.org/
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index d954537df75..adc5260a5d3 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2013/05/23 19:45:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.24.2.1 2013/08/16 10:19:53 tron Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -75,6 +75,8 @@ include/dovecot/doveadm-settings.h
 include/dovecot/doveadm-util.h
 include/dovecot/doveadm.h
 include/dovecot/dovecot-version.h
+include/dovecot/dsasl-client-private.h
+include/dovecot/dsasl-client.h
 include/dovecot/duplicate.h
 include/dovecot/eacces-error.h
 include/dovecot/env-util.h
@@ -110,8 +112,11 @@ include/dovecot/http-client-private.h
 include/dovecot/http-client.h
 include/dovecot/http-date.h
 include/dovecot/http-header-parser.h
+include/dovecot/http-message-parser.h
 include/dovecot/http-parser.h
+include/dovecot/http-request-parser.h
 include/dovecot/http-response-parser.h
+include/dovecot/http-response.h
 include/dovecot/http-transfer.h
 include/dovecot/http-url.h
 include/dovecot/imap-arg.h
@@ -484,10 +489,13 @@ man/man1/deliver.1
 man/man1/doveadm-altmove.1
 man/man1/doveadm-auth.1
 man/man1/doveadm-config.1
+man/man1/doveadm-deduplicate.1
 man/man1/doveadm-director.1
 man/man1/doveadm-dump.1
+man/man1/doveadm-exec.1
 man/man1/doveadm-expunge.1
 man/man1/doveadm-fetch.1
+man/man1/doveadm-flags.1
 man/man1/doveadm-force-resync.1
 man/man1/doveadm-help.1
 man/man1/doveadm-import.1
@@ -559,6 +567,7 @@ share/doc/dovecot/wiki/Design.AuthProcess.txt
 share/doc/dovecot/wiki/Design.AuthProtocol.txt
 share/doc/dovecot/wiki/Design.Buffers.txt
 share/doc/dovecot/wiki/Design.Code.txt
+share/doc/dovecot/wiki/Design.DoveadmProtocol.txt
 share/doc/dovecot/wiki/Design.Dsync.txt
 share/doc/dovecot/wiki/Design.Indexes.Cache.txt
 share/doc/dovecot/wiki/Design.Indexes.MailIndexApi.txt
@@ -634,6 +643,7 @@ share/doc/dovecot/wiki/Migration.BincIMAP.txt
 share/doc/dovecot/wiki/Migration.Courier.txt
 share/doc/dovecot/wiki/Migration.Cyrus.txt
 share/doc/dovecot/wiki/Migration.Dsync.txt
+share/doc/dovecot/wiki/Migration.Gmail.txt
 share/doc/dovecot/wiki/Migration.Linuxconf.txt
 share/doc/dovecot/wiki/Migration.MailFormat.txt
 share/doc/dovecot/wiki/Migration.Online.txt
@@ -693,6 +703,7 @@ 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.Snarf.txt
+share/doc/dovecot/wiki/Plugins.Stats.txt
 share/doc/dovecot/wiki/Plugins.Trash.txt
 share/doc/dovecot/wiki/Plugins.Virtual.txt
 share/doc/dovecot/wiki/Plugins.Zlib.txt
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 5e1c5d8ef77..138127b48ae 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.35.2.1 2013/08/06 15:57:07 tron Exp $
+$NetBSD: distinfo,v 1.35.2.2 2013/08/16 10:19:53 tron Exp $
 
-SHA1 (dovecot-2.2.2.tar.gz) = c095b0a8e25d730b854f0ace37544ad203db0891
-RMD160 (dovecot-2.2.2.tar.gz) = ada7c9c12949e1150a4a4bbe7bea257e296f13ca
-Size (dovecot-2.2.2.tar.gz) = 4282339 bytes
+SHA1 (dovecot-2.2.5.tar.gz) = 12c976ec24a869d958f3b09c1a8803dda54fab86
+RMD160 (dovecot-2.2.5.tar.gz) = ca3c0140fbd04f6543ce423cb4bc0a97214127f6
+Size (dovecot-2.2.5.tar.gz) = 4356745 bytes
 SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
 SHA1 (patch-ab) = ce698e00729aeccbb7f3fa4ee9d037791fdd2d14
 SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6