4 files changed, 31 insertions, 9 deletions
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index be481a83b86..47375aaae60 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.86 2016/04/30 20:16:38 joerg Exp $
+# $NetBSD: Makefile,v 1.87 2016/05/03 01:49:52 taca Exp $
 #
 # when updating to a new release, update ABI depends in
 # the buildlink3.mk file as well, since the plugins' version
 # must match (see PR 49563).
 
-DISTNAME=	dovecot-2.2.23
-PKGREVISION=	1
+DISTNAME=	dovecot-2.2.24
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
 
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index 281ba5c3f27..3db31ea17e2 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.44 2016/04/09 07:59:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.45 2016/05/03 01:49:52 taca Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -112,6 +112,7 @@ include/dovecot/file-set-size.h
 include/dovecot/fs-api-private.h
 include/dovecot/fs-api.h
 include/dovecot/fs-sis-common.h
+include/dovecot/fs-test.h
 include/dovecot/fsync-mode.h
 include/dovecot/fts-api-private.h
 include/dovecot/fts-api.h
@@ -272,6 +273,7 @@ include/dovecot/istream.h
 include/dovecot/json-parser.h
 include/dovecot/json-tree.h
 include/dovecot/lda-settings.h
+include/dovecot/ldap-client.h
 include/dovecot/lib-signals.h
 include/dovecot/lib.h
 include/dovecot/llist.h
@@ -409,6 +411,7 @@ include/dovecot/ostream-escaped.h
 include/dovecot/ostream-failure-at.h
 include/dovecot/ostream-hash.h
 include/dovecot/ostream-metawrap.h
+include/dovecot/ostream-null.h
 include/dovecot/ostream-private.h
 include/dovecot/ostream-rawlog.h
 include/dovecot/ostream-zlib.h
@@ -517,6 +520,7 @@ include/dovecot/var-expand.h
 include/dovecot/wildcard-match.h
 include/dovecot/write-full.h
 lib/dovecot/auth/libauthdb_imap.la
+lib/dovecot/dict/libdict_ldap.la
 lib/dovecot/doveadm/lib10_doveadm_acl_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la
@@ -552,6 +556,7 @@ lib/dovecot/libdovecot-compression.la
 lib/dovecot/libdovecot-dsync.la
 lib/dovecot/libdovecot-fts.la
 lib/dovecot/libdovecot-lda.la
+lib/dovecot/libdovecot-ldap.la
 lib/dovecot/libdovecot-login.la
 lib/dovecot/libdovecot-sql.la
 lib/dovecot/libdovecot-storage.la
@@ -885,6 +890,7 @@ share/doc/dovecot/wiki/Upgrading.1.2.txt
 share/doc/dovecot/wiki/Upgrading.2.0.txt
 share/doc/dovecot/wiki/Upgrading.2.1.txt
 share/doc/dovecot/wiki/Upgrading.2.2.txt
+share/doc/dovecot/wiki/Upgrading.2.3.txt
 share/doc/dovecot/wiki/Upgrading.txt
 share/doc/dovecot/wiki/UserDatabase.ExtraFields.txt
 share/doc/dovecot/wiki/UserDatabase.NSS.txt
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index da01e755ec5..997c6cd64d5 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.62 2016/04/08 07:55:16 adam Exp $
+$NetBSD: distinfo,v 1.63 2016/05/03 01:49:52 taca Exp $
 
-SHA1 (dovecot-2.2.23.tar.gz) = 65be594f78975dc74cddb8f4454a84c124bc4b32
-RMD160 (dovecot-2.2.23.tar.gz) = 18a0be0dabcc9b18c2236695598da940bcf22ef9
-SHA512 (dovecot-2.2.23.tar.gz) = 704d86dcef8b217a54db1d1ae3c1e0d6303827fedd7150aec83e805512cd1c5befc88da44660e7a40765ad6800c14d399f8c7621e84125a7732d68fee7f18d82
-Size (dovecot-2.2.23.tar.gz) = 5291365 bytes
+SHA1 (dovecot-2.2.24.tar.gz) = 005e733f7b76226ca6307ad3699d6cbe5f92c768
+RMD160 (dovecot-2.2.24.tar.gz) = ad2520d6678a94637246cc806c8a7ba4bfb59add
+SHA512 (dovecot-2.2.24.tar.gz) = 90d98996e75353ae631c1e2da2520cc340928f427276c757316714892d7b281745284bf4cb30459eecdb9c96b7d9450eb6801e002e6acafc8669deb2b5e65a81
+Size (dovecot-2.2.24.tar.gz) = 5345872 bytes
 SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
 SHA1 (patch-ab) = d637a64feec8e4eafacda149cf0193aa1b70a054
 SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
 SHA1 (patch-af) = c066e94dd6593d16eec3e66f5f4d26f021918498
+SHA1 (patch-src_lib-ldap_ldap-private.h) = 2d5ce32330ad4164cc75f8d209ba499d37ed01fc
 SHA1 (patch-src_lib_buffer.h) = d75017a1093c1ca34827d01ec85b06e6b03105d2
 SHA1 (patch-src_plugins_quota_quota-fs.c) = c69305eb065a2417df1e8cd6ccbc1d317aee5d00
 SHA1 (patch-src_stats_mail-stats.h) = 90645c2aab956a0119630da4b71905db704bffda
diff --git a/mail/dovecot2/patches/patch-src_lib-ldap_ldap-private.h b/mail/dovecot2/patches/patch-src_lib-ldap_ldap-private.h
new file mode 100644
index 00000000000..743387c86b6
--- /dev/null
+++ b/mail/dovecot2/patches/patch-src_lib-ldap_ldap-private.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_lib-ldap_ldap-private.h,v 1.1 2016/05/03 01:49:52 taca Exp $
+
+Make sure to timeval structure is defined.
+
+--- src/lib-ldap/ldap-private.h.orig	2016-04-26 13:01:21.000000000 +0000
++++ src/lib-ldap/ldap-private.h
+@@ -3,6 +3,9 @@
+ 
+ #include "iostream-ssl.h"
+ #include "ldap-client.h"
++#if HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
+ 
+ #include <ldap.h>
+