Pullup ticket #3450 - requested by tron

mail/dovecot2 security update

Revisions pulled up:
- mail/dovecot2/Makefile                                        1.9,1.11
- mail/dovecot2/PLIST                                           1.6-1.7
- mail/dovecot2/buildlink3.mk                                   1.4
- mail/dovecot2/distinfo                                        1.9-1.10

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Fri Apr 15 13:34:28 UTC 2011

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

   Log Message:
   Changes 2.0.12:
   * doveadm: Added "move" command for moving mails between mailboxes.
   * virtual: Added support for "+mailbox" entries that clear \Recent
     flag from messages (default is to preserve them).
   * dbox: Fixes to handling external attachments
   * dsync: More fixes to avoid hanging with remote syncs
   * dsync: Many other syncing/correctness fixes
   * doveconf: v2.0.10 and v2.0.11 didn't output plugin {} section right

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Fri May 13 07:36:39 UTC 2011

   Modified Files:
   	pkgsrc/mail/dovecot2: Makefile PLIST buildlink3.mk distinfo

   Log Message:
   Changes 2.0.13:
   * Added "doveadm index" command to add unindexed messages into
     index/cache. If full text search is enabled, it also adds unindexed
     messages to the fts database.
   * added "doveadm director dump" command.
   * pop3: Added support for showing messages in "POP3 order", which can
     be different from IMAP message order. This can be useful for
     migrations from other servers. Implemented it for Maildir as 'O'
     field in dovecot-uidlist.
   * doveconf: Fixed a wrong "subsection has ssl=yes" warning.
   * mdbox purge: Fixed wrong warning about corrupted extrefs.
   * sdbox: INBOX GUID changed when INBOX was autocreated, leading to
     trouble with dsync.
   * script-login binary wasn't actually dropping privileges to the
     user/group/chroot specified by its service settings.
   * Fixed potential crashes and other problems when parsing header names
     that contained NUL characters.

4 files changed, 22 insertions, 15 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 99bd89841c0..e503294fef1 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.8 2011/03/10 13:42:54 adam Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2011/06/11 05:11:43 sbd Exp $
 
-DISTNAME=		dovecot-2.0.11
-CATEGORIES=		mail
-MASTER_SITES=		http://www.dovecot.org/releases/2.0/
+DISTNAME=	dovecot-2.0.13
+CATEGORIES=	mail
+MASTER_SITES=	http://www.dovecot.org/releases/2.0/
 
-MAINTAINER=		ghen@NetBSD.org
-HOMEPAGE=		http://www.dovecot.org/
-COMMENT=		Secure IMAP and POP3 server
-LICENSE=		mit AND gnu-lgpl-v2.1 AND modified-bsd
+MAINTAINER=	ghen@NetBSD.org
+HOMEPAGE=	http://www.dovecot.org/
+COMMENT=	Secure IMAP and POP3 server
+LICENSE=	mit AND gnu-lgpl-v2.1 AND modified-bsd
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		pkg-config rpcgen
 USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config rpcgen
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index 0b7a95f62ff..62d4a246f87 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/03/10 13:42:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.5.2.1 2011/06/11 05:11:43 sbd Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -129,6 +129,7 @@ include/dovecot/ioloop-iolist.h
 include/dovecot/ioloop-notify-fd.h
 include/dovecot/ioloop.h
 include/dovecot/iostream-internal.h
+include/dovecot/ipwd.h
 include/dovecot/istream-attachment.h
 include/dovecot/istream-base64-encoder.h
 include/dovecot/istream-concat.h
@@ -380,6 +381,7 @@ man/man1/doveadm-fetch.1
 man/man1/doveadm-force-resync.1
 man/man1/doveadm-help.1
 man/man1/doveadm-import.1
+man/man1/doveadm-index.1
 man/man1/doveadm-kick.1
 man/man1/doveadm-log.1
 man/man1/doveadm-mailbox.1
@@ -468,6 +470,7 @@ share/doc/dovecot/wiki/Design.txt
 share/doc/dovecot/wiki/Dict.txt
 share/doc/dovecot/wiki/Director.txt
 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.EximAndDovecotSASL.txt
@@ -542,6 +545,9 @@ share/doc/dovecot/wiki/Pigeonhole.ManageSieve.Troubleshooting.txt
 share/doc/dovecot/wiki/Pigeonhole.ManageSieve.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Configuration.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Examples.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.SpamtestVirustest.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Vacation.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.Extdata.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Usage.txt
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
index 6da8b879fd8..cd47b38117d 100644
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2011/01/13 13:43:04 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2.2.1 2011/06/11 05:11:43 sbd Exp $
 
 BUILDLINK_TREE+=	dovecot
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	dovecot
 DOVECOT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.dovecot+=		dovecot>=2.0.6
+BUILDLINK_ABI_DEPENDS.dovecot+=		dovecot>=2.0.12nb1
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot2
 
 pkgbase:=	dovecot
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 928bffb46d8..149067f240f 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2011/03/10 13:42:54 adam Exp $
+$NetBSD: distinfo,v 1.8.2.1 2011/06/11 05:11:43 sbd Exp $
 
-SHA1 (dovecot-2.0.11.tar.gz) = e79cce204d06a3cabf43dbeb4f0a9bc109d4d095
-RMD160 (dovecot-2.0.11.tar.gz) = e63234ad2c000f55b701ee2a27865c91b1d02beb
-Size (dovecot-2.0.11.tar.gz) = 3225716 bytes
+SHA1 (dovecot-2.0.13.tar.gz) = 31d556bd1659fb10e5edb45bab8951911151bbfb
+RMD160 (dovecot-2.0.13.tar.gz) = 2c0edd03aba7935e6db18af1384a26bf0b5b432e
+Size (dovecot-2.0.13.tar.gz) = 3272542 bytes
 SHA1 (patch-aa) = 882f0c9fcf3acdfd2feaf7919309f770324f9843
 SHA1 (patch-ab) = 218948585c96492a832ea903f31a6f9ad9fc69f0
 SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6