Pullup ticket #4424 - requested by taca

mail/dovecot2: security update

Revisions pulled up:
- mail/dovecot2/Makefile                                        1.61-1.62
- mail/dovecot2/PLIST                                           1.35
- mail/dovecot2/distinfo                                        1.46

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Wed Apr  9 07:27:19 UTC 2014

   Modified Files:
   	pkgsrc/mail/dovecot2: Makefile

   Log Message:
   recursive bump from icu shlib major bump.

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Wed May 14 06:09:53 UTC 2014

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

   Log Message:
   Changes 2.2.13:
   * Fixed a DoS attack against imap/pop3-login processes. If SSL/TLS
     handshake was started but wasn't finished, the login process
     attempted to eventually forcibly disconnect the client, but failed
     to do it correctly. This could have left the connections hanging
     arond for a long time. (Affected Dovecot v1.1+)

   + mdbox: Added mdbox_purge_preserve_alt setting to keep the file
     within alt storage during purge. (Should become enforced in v2.3.0?)
   + fts: Added support for parsing attachments via Apache Tika. Enable
     with: plugin { fts_tika = http://tikahost:9998/tika/ }
   + virtual plugin: Delay opening backend mailboxes until it's necessary.
     This requires mailbox_list_index=yes to work. (Currently IMAP IDLE
     command still causes all backend mailboxes to be opened.)
   + mail_never_cache_fields=* means now to disable all caching. This may
     be a useful optimization as doveadm/dsync parameter for some admin
     tasks which shouldn't really update the cache file.
   + IMAP: Return SPECIAL-USE flags always for LSUB command.
   - pop3 server was still crashing in v2.2.12 with some settings
   - maildir: Various fixes and improvements to handling compressed mails,
     especially when they have broken/missing S=sizes in filenames.
   - fts-lucene, fts-solr: Fixed crash on search when the index contained
     duplicate entries.
   - Many fixes and performance improvements to dsync and replication
   - director was somewhat broken when there were exactly two directors
     in the ring. It caused errors about "weak users" getting stuck.
   - mail_attachment_dir: Attachments with the last base64-encoded line
     longer than the rest wasn't handled correctly.
   - IMAP: SEARCH/SORT PARTIAL was handled completely wrong in v2.2.11+
   - acl: Global ACL file handling was broken when multiple entries
     matched the mailbox name. (Only the first entry was used.)

3 files changed, 9 insertions, 14 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index e41ed61c9f3..b12071fc996 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2014/03/11 14:34:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.60.2.1 2014/05/28 19:34:15 tron Exp $
 
-DISTNAME=	dovecot-2.2.12
+DISTNAME=	dovecot-2.2.13
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
 
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index 3a913531981..9cc4698b488 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2014/03/11 14:05:03 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.34.2.1 2014/05/28 19:34:15 tron Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -215,6 +215,7 @@ include/dovecot/istream-rawlog.h
 include/dovecot/istream-seekable.h
 include/dovecot/istream-sized.h
 include/dovecot/istream-tee.h
+include/dovecot/istream-timeout.h
 include/dovecot/istream-zlib.h
 include/dovecot/istream.h
 include/dovecot/json-parser.h
@@ -326,6 +327,7 @@ include/dovecot/message-header-parser.h
 include/dovecot/message-id.h
 include/dovecot/message-parser.h
 include/dovecot/message-part-serialize.h
+include/dovecot/message-part.h
 include/dovecot/message-search.h
 include/dovecot/message-size.h
 include/dovecot/mkdir-parents.h
@@ -540,7 +542,6 @@ share/doc/dovecot/solr-schema.xml
 share/doc/dovecot/thread-refs.txt
 share/doc/dovecot/wiki/ACL.txt
 share/doc/dovecot/wiki/AixPluginsSupport.txt
-share/doc/dovecot/wiki/AntiSpam.txt
 share/doc/dovecot/wiki/AuthDatabase.CheckPassword.txt
 share/doc/dovecot/wiki/AuthDatabase.Dict.txt
 share/doc/dovecot/wiki/AuthDatabase.LDAP.AuthBinds.txt
@@ -561,7 +562,6 @@ share/doc/dovecot/wiki/Authentication.Mechanisms.Winbind.txt
 share/doc/dovecot/wiki/Authentication.Mechanisms.txt
 share/doc/dovecot/wiki/Authentication.MultipleDatabases.txt
 share/doc/dovecot/wiki/Authentication.PasswordSchemes.txt
-share/doc/dovecot/wiki/Authentication.Penalty.txt
 share/doc/dovecot/wiki/Authentication.RestrictAccess.txt
 share/doc/dovecot/wiki/Authentication.txt
 share/doc/dovecot/wiki/BasicConfiguration.txt
@@ -611,17 +611,13 @@ share/doc/dovecot/wiki/DomainLost.txt
 share/doc/dovecot/wiki/Errors.ChgrpNoPerm.txt
 share/doc/dovecot/wiki/FindMailLocation.txt
 share/doc/dovecot/wiki/FinishBasicConfiguration.txt
-share/doc/dovecot/wiki/HowTo.ConvertPasswordSchemes.txt
 share/doc/dovecot/wiki/HowTo.EximAndDovecotSASL.txt
-share/doc/dovecot/wiki/HowTo.F5SLBTLSOffload.txt
 share/doc/dovecot/wiki/HowTo.ImapcProxy.txt
 share/doc/dovecot/wiki/HowTo.PopBSMTPAndDovecot.txt
 share/doc/dovecot/wiki/HowTo.PopRelay.txt
 share/doc/dovecot/wiki/HowTo.PostfixAndDovecotSASL.txt
 share/doc/dovecot/wiki/HowTo.Rootless.txt
 share/doc/dovecot/wiki/HowTo.SimpleVirtualInstall.txt
-share/doc/dovecot/wiki/HowTo.TriggerGetmailOnIMAPAccess.txt
-share/doc/dovecot/wiki/HowTo.Virtual(2b)Postfix(2b)Dspam(2b)Dovecot.txt
 share/doc/dovecot/wiki/HowTo.txt
 share/doc/dovecot/wiki/IndexFiles.txt
 share/doc/dovecot/wiki/LDA.Exim.txt
@@ -651,7 +647,6 @@ share/doc/dovecot/wiki/MailboxFormat.mbox.txt
 share/doc/dovecot/wiki/MailboxFormat.mbx.txt
 share/doc/dovecot/wiki/MailboxFormat.txt
 share/doc/dovecot/wiki/MailboxSettings.txt
-share/doc/dovecot/wiki/MainConfig.txt
 share/doc/dovecot/wiki/MboxChildFolders.txt
 share/doc/dovecot/wiki/MboxLocking.txt
 share/doc/dovecot/wiki/MboxProblems.txt
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 9c7cf0a0955..fe0321e0a60 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.45 2014/02/19 15:29:23 taca Exp $
+$NetBSD: distinfo,v 1.45.2.1 2014/05/28 19:34:15 tron Exp $
 
-SHA1 (dovecot-2.2.12.tar.gz) = fdd1b455b714a7dd318698600f62ba9fc976012e
-RMD160 (dovecot-2.2.12.tar.gz) = cdec86b8e24df4ab2924a8d26e0575ae92339571
-Size (dovecot-2.2.12.tar.gz) = 4587634 bytes
+SHA1 (dovecot-2.2.13.tar.gz) = ee8efc77cb9d502dc416ae4fba242adc5f01c163
+RMD160 (dovecot-2.2.13.tar.gz) = 64c0dc156b5661037721dde7436013f95a024e2e
+Size (dovecot-2.2.13.tar.gz) = 4613824 bytes
 SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
 SHA1 (patch-ab) = ce698e00729aeccbb7f3fa4ee9d037791fdd2d14
 SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6