Update mail/dovecot2 to 2.2.22, and bump PORTREVISION on dovecot2-pigeonhole

and dovecot2-antispam-plugin.

Changes for 2.2.22:
 + Added doveadm HTTP API: See
   http://wiki2.dovecot.org/Design/DoveadmProtocol/HTTP
 + virtual plugin: Mailbox filtering can now be done based on the
   mailbox metadata. See http://wiki2.dovecot.org/Plugins/Virtual
 + stats: Added doveadm stats reset to reset global stats.
 + stats: Added authentication statistics if auth_stats=yes.
 + dsync, imapc, pop3c & pop3-migration: Many optimizations,
   improvements and error handling fixes.
 + doveadm: Most commands now stop soon after SIGINT/SIGTERM.
 - auth: Auth caching was done too aggressively when %variables were
   used in default_fields, override_fields or LDAP pass/user_attrs.
   userdb result_* were also ignored when user was found from cache.
 - imap: Fixed various assert-crashes caused v2.2.20+. Some of them
   caught actual hangs or otherwise unwanted behavior towards IMAP
   clients.
 - Expunges were forgotten in some situations, for example when
   pipelining multiple IMAP MOVE commands.
 - quota: Per-namespaces quota were broken for dict and count backends
   in v2.2.20+
 - fts-solr: Search queries were using OR instead of AND as the
   separator for multi-token search queries in v2.2.20+.
 - Single instance storage support wasn't really working in v2.2.16+
 - dbox: POP3 message ordering wasn't working correctly.
 - virtual plugin: Fixed crashes related to backend mailbox deletions.

5 files changed, 21 insertions, 5 deletions

diff --git a/mail/dovecot2-antispam-plugin/Makefile b/mail/dovecot2-antispam-plugin/Makefile
index 2cc07caa5dec..a95b2b3ad89c 100644
--- a/mail/dovecot2-antispam-plugin/Makefile
+++ b/mail/dovecot2-antispam-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dovecot2-antispam-plugin
 PORTVERSION=	20130429
-PORTREVISION=	15
+PORTREVISION=	16
 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 efb2e54bd63d..addb875b9a26 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dovecot-pigeonhole
 PORTVERSION=	0.4.12
+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 be59198fde48..5cf7f751c0fd 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -13,8 +13,7 @@
 ######################################################################
 
 PORTNAME=	dovecot
-PORTVERSION=	2.2.21
-PORTREVISION=	1
+PORTVERSION=	2.2.22
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
 PKGNAMESUFFIX=	2
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 13adc3be8876..176643e66831 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.2.21.tar.gz) = 7ab7139e59e1f0353bf9c24251f13c893cf1a6ef4bcc47e2d44de437108d0b20
-SIZE (dovecot-2.2.21.tar.gz) = 4985686
+SHA256 (dovecot-2.2.22.tar.gz) = c7a9db3c4ae9d9b4da920d2c82669700a0d407934501b405f37f89cc0b706ec7
+SIZE (dovecot-2.2.22.tar.gz) = 5318023
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist
index 0d4790072612..f9643c3ec88b 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot2/pkg-plist
@@ -58,10 +58,12 @@ include/dovecot/auth-master.h
 include/dovecot/auth-penalty.h
 include/dovecot/auth-postfix-connection.h
 include/dovecot/auth-request-handler.h
+include/dovecot/auth-request-stats.h
 include/dovecot/auth-request-var-expand.h
 include/dovecot/auth-request.h
 include/dovecot/auth-server-connection.h
 include/dovecot/auth-settings.h
+include/dovecot/auth-stats.h
 include/dovecot/auth-token.h
 include/dovecot/auth-worker-client.h
 include/dovecot/auth-worker-server.h
@@ -152,6 +154,7 @@ include/dovecot/fts-language.h
 include/dovecot/fts-library.h
 include/dovecot/fts-parser.h
 include/dovecot/fts-storage.h
+include/dovecot/fts-tokenizer-common.h
 include/dovecot/fts-tokenizer-generic-private.h
 include/dovecot/fts-tokenizer-private.h
 include/dovecot/fts-tokenizer.h
@@ -198,6 +201,9 @@ include/dovecot/imap-fetch.h
 include/dovecot/imap-id.h
 include/dovecot/imap-keepalive.h
 include/dovecot/imap-list.h
+include/dovecot/imap-login-client.h
+include/dovecot/imap-login-commands.h
+include/dovecot/imap-login-settings.h
 include/dovecot/imap-master-client.h
 include/dovecot/imap-match.h
 include/dovecot/imap-metadata.h
@@ -405,6 +411,7 @@ include/dovecot/message-date.h
 include/dovecot/message-decoder.h
 include/dovecot/message-header-decode.h
 include/dovecot/message-header-encode.h
+include/dovecot/message-header-hash.h
 include/dovecot/message-header-parser.h
 include/dovecot/message-id.h
 include/dovecot/message-parser.h
@@ -427,6 +434,7 @@ include/dovecot/notify-plugin.h
 include/dovecot/numpack.h
 include/dovecot/ostream-cmp.h
 include/dovecot/ostream-dot.h
+include/dovecot/ostream-escaped.h
 include/dovecot/ostream-failure-at.h
 include/dovecot/ostream-hash.h
 include/dovecot/ostream-metawrap.h
@@ -508,6 +516,7 @@ include/dovecot/sql-api-private.h
 include/dovecot/sql-api.h
 include/dovecot/sql-db-cache.h
 include/dovecot/ssl-proxy.h
+include/dovecot/stats-connection.h
 include/dovecot/stats-parser.h
 include/dovecot/stats.h
 include/dovecot/str-find.h
@@ -607,6 +616,10 @@ lib/dovecot/libdovecot-dsync.a
 lib/dovecot/libdovecot-dsync.so
 lib/dovecot/libdovecot-dsync.so.0
 lib/dovecot/libdovecot-dsync.so.0.0.0
+lib/dovecot/libdovecot-fts.a
+lib/dovecot/libdovecot-fts.so
+lib/dovecot/libdovecot-fts.so.0
+lib/dovecot/libdovecot-fts.so.0.0.0
 lib/dovecot/libdovecot-lda.a
 lib/dovecot/libdovecot-lda.so
 lib/dovecot/libdovecot-lda.so.0
@@ -629,6 +642,8 @@ lib/dovecot/libdovecot.so.0
 lib/dovecot/libdovecot.so.0.0.0
 lib/dovecot/libfs_compress.a
 lib/dovecot/libfs_compress.so
+lib/dovecot/stats/libstats_auth.a
+lib/dovecot/stats/libstats_auth.so
 lib/dovecot/stats/libstats_mail.a
 lib/dovecot/stats/libstats_mail.so
 libexec/dovecot/aggregator
@@ -700,6 +715,7 @@ man/man1/doveadm-quota.1.gz
 man/man1/doveadm-reload.1.gz
 man/man1/doveadm-replicator.1.gz
 man/man1/doveadm-search.1.gz
+man/man1/doveadm-stats.1.gz
 man/man1/doveadm-stop.1.gz
 man/man1/doveadm-sync.1.gz
 man/man1/doveadm-user.1.gz