Update dovecot2 to 2.2.25, and bump PORTREVISION on pigeonhole and

antispam-plugin.

  * lmtp: Start tracking lmtp_user_concurrency_limit and reject already
    at RCPT TO stage. This avoids MTA unnecessarily completing DATA only
    to get an error.
  * doveadm: Previously only mail settings were read from protocol
    doveadm { .. } section. Now all settings are.

  + quota: Added quota_over_flag_lazy_check setting. It avoids checking
    quota_over_flag always at startup. Instead it's checked only when
    quota is being read for some other purpose.
  + auth: Added a new auth policy service:
    http://wiki2.dovecot.org/Authentication/Policy
  + auth: Added PBKDF2 password scheme
  + auth: Added %{auth_user}, %{auth_username} and %{auth_domain}
  + auth: Added ":remove" suffix to extra field names to remove them.
  + auth: Added "delay_until=<timestamp>[+<max random secs>]" passdb
    extra field. The auth will wait until <timestamp> and optionally some
    randomness and then return success.
  + dict proxy: Added idle_msecs=<n> parameter. Support async operations.
  + Performance improvements for handling large mailboxes.
  + Added lib-dcrypt API for providing cryptographic functions.
  + Added "doveadm mailbox update" command
  + imap commands' output now includes timing spent on the "syncing"
    stage if it's larger than 0.
  + cassandra: Added metrics=<path> to connect setting to output internal
    statistics in JSON format every second to <path>.
  + doveadm mailbox delete: Added -e parameter to delete only empty
    mailboxes. Added --unsafe option to quickly delete a mailbox,
    bypassing lazy_expunge and quota plugins.
  + doveadm user & auth cache flush are now available via doveadm-server.
  + doveadm service stop <services> will stop specified services while
    leaving the rest of Dovecot running.
  + quota optimization: Avoid reading mail sizes for backends which
    don't need them (count, fs, dirsize)
  + Added mailbox { autoexpunge_max_mails=<n> } setting.
  + Added welcome plugin: http://wiki2.dovecot.org/Plugins/Welcome
  + fts: Added fts_autoindex_exclude setting.
  - v2.2.24's MIME parser was assert-crashing on mails having truncated
    MIME headers.
  - auth: With multiple userdbs the final success/failure result wasn't
    always correct. The last userdb's result was always used.
  - doveadm backup was sometimes deleting entire mailboxes unnecessarily.
  - doveadm: Command -parameters weren't being sent to doveadm-server.
  - If dovecot.index read failed e.g. because mmap() reached VSZ limit,
    an empty index could have been opened instead, corrupting the
    mailbox state.
  - imapc: Fixed EXPUNGE handling when imapc_features didn't have modseq.
  - lazy-expunge: Fixed a crash when copying failed. Various other fixes.
  - fts-lucene: Fixed crash on index rescan.
  - auth_stats=yes produced broken output
  - dict-ldap: Various fixes
  - dict-sql: NULL values crashed. Now they're treated as "not found".

5 files changed, 27 insertions, 6 deletions

diff --git a/mail/dovecot2-antispam-plugin/Makefile b/mail/dovecot2-antispam-plugin/Makefile
index b6f6ddd9ca0d..0680cf18645e 100644
--- a/mail/dovecot2-antispam-plugin/Makefile
+++ b/mail/dovecot2-antispam-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dovecot2-antispam-plugin
 PORTVERSION=	20130429
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	mail
 MASTER_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile
index 64cecff983d3..0c79098472e7 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dovecot-pigeonhole
 PORTVERSION=	0.4.14
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index fc527134dcc9..63611734e83e 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -13,7 +13,7 @@
 ######################################################################
 
 PORTNAME=	dovecot
-PORTVERSION=	2.2.24
+PORTVERSION=	2.2.25
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
 PKGNAMESUFFIX=	2
@@ -26,9 +26,8 @@ LICENSE_COMB=	dual
 
 CONFLICTS=	dovecot-1.[0-9]*
 
-USES=		cpe iconv libtool
+USES=		cpe iconv libtool ssl
 USE_RC_SUBR=	dovecot
-USE_OPENSSL=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 09427e6e0417..6ce560748957 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (dovecot-2.2.24.tar.gz) = 71c86891ea8deb5703d3dbbc3ea31ce2cbf7638f1aa395d9e8794d3ff7aebeb7
-SIZE (dovecot-2.2.24.tar.gz) = 5345872
+TIMESTAMP = 1467385503
+SHA256 (dovecot-2.2.25.tar.gz) = d8d9f32c846397f7c22749a84c5cf6f59c55ff7ded3dc9f07749a255182f9667
+SIZE (dovecot-2.2.25.tar.gz) = 5576235
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist
index 7fa88abf6acb..8ffc9625af9b 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot2/pkg-plist
@@ -56,6 +56,7 @@ include/dovecot/auth-fields.h
 include/dovecot/auth-master-connection.h
 include/dovecot/auth-master.h
 include/dovecot/auth-penalty.h
+include/dovecot/auth-policy.h
 include/dovecot/auth-postfix-connection.h
 include/dovecot/auth-request-handler.h
 include/dovecot/auth-request-stats.h
@@ -89,6 +90,9 @@ include/dovecot/crc32.h
 include/dovecot/cydir-storage.h
 include/dovecot/cydir-sync.h
 include/dovecot/data-stack.h
+include/dovecot/dcrypt-iostream-private.h
+include/dovecot/dcrypt-private.h
+include/dovecot/dcrypt.h
 include/dovecot/db-checkpassword.h
 include/dovecot/db-dict.h
 include/dovecot/db-ldap.h
@@ -243,6 +247,7 @@ include/dovecot/imem.h
 include/dovecot/index-attachment.h
 include/dovecot/index-mail.h
 include/dovecot/index-mailbox-size.h
+include/dovecot/index-pop3-uidl.h
 include/dovecot/index-rebuild.h
 include/dovecot/index-search-private.h
 include/dovecot/index-search-result.h
@@ -277,6 +282,7 @@ include/dovecot/istream-callback.h
 include/dovecot/istream-chain.h
 include/dovecot/istream-concat.h
 include/dovecot/istream-crlf.h
+include/dovecot/istream-decrypt.h
 include/dovecot/istream-dot.h
 include/dovecot/istream-failure-at.h
 include/dovecot/istream-file-private.h
@@ -435,6 +441,7 @@ include/dovecot/notify-plugin.h
 include/dovecot/numpack.h
 include/dovecot/ostream-cmp.h
 include/dovecot/ostream-dot.h
+include/dovecot/ostream-encrypt.h
 include/dovecot/ostream-escaped.h
 include/dovecot/ostream-failure-at.h
 include/dovecot/ostream-hash.h
@@ -449,6 +456,7 @@ include/dovecot/passdb-cache.h
 include/dovecot/passdb-template.h
 include/dovecot/passdb.h
 include/dovecot/password-scheme.h
+include/dovecot/pkcs5.h
 include/dovecot/pop3-capability.h
 include/dovecot/pop3-client.h
 include/dovecot/pop3-commands.h
@@ -610,6 +618,9 @@ lib/dovecot/lib90_stats_plugin.a
 lib/dovecot/lib90_stats_plugin.so
 lib/dovecot/lib95_imap_stats_plugin.a
 lib/dovecot/lib95_imap_stats_plugin.so
+lib/dovecot/lib99_welcome_plugin.a
+lib/dovecot/lib99_welcome_plugin.so
+lib/dovecot/libdcrypt_openssl.so
 lib/dovecot/libdovecot-compression.a
 lib/dovecot/libdovecot-compression.so
 lib/dovecot/libdovecot-compression.so.0
@@ -699,6 +710,7 @@ man/man1/doveadm-expunge.1.gz
 man/man1/doveadm-fetch.1.gz
 man/man1/doveadm-flags.1.gz
 man/man1/doveadm-force-resync.1.gz
+man/man1/doveadm-fs.1.gz
 man/man1/doveadm-fts.1.gz
 man/man1/doveadm-help.1.gz
 man/man1/doveadm-import.1.gz
@@ -730,10 +742,18 @@ man/man1/dsync.1.gz
 man/man7/doveadm-search-query.7.gz
 sbin/dovecot
 share/aclocal/dovecot.m4
+%%DATADIR%%/stopwords/stopwords_da.txt
+%%DATADIR%%/stopwords/stopwords_de.txt
 %%DATADIR%%/stopwords/stopwords_en.txt
+%%DATADIR%%/stopwords/stopwords_es.txt
 %%DATADIR%%/stopwords/stopwords_fi.txt
 %%DATADIR%%/stopwords/stopwords_fr.txt
+%%DATADIR%%/stopwords/stopwords_it.txt
+%%DATADIR%%/stopwords/stopwords_nl.txt
 %%DATADIR%%/stopwords/stopwords_no.txt
+%%DATADIR%%/stopwords/stopwords_pt.txt
+%%DATADIR%%/stopwords/stopwords_ro.txt
+%%DATADIR%%/stopwords/stopwords_ru.txt
 %%DATADIR%%/stopwords/stopwords_sv.txt
 %%LIBWRAP%%libexec/dovecot/tcpwrap
 %%LDAP%%include/dovecot/ldap-client.h