Changes 2.2.26:

 * master: Removed hardcoded 511 backlog limit for listen(). The kernel
   should limit this as needed.
 * doveadm import: Source user is now initialized the same as target
   user. Added -U parameter to override the source user.
 * Mailbox names are no longer limited to 16 hierarchy levels. We'll
   check another way to make sure mailbox names can't grow larger than
   4096 bytes.

 + Added a concept of "alternative usernames" by returning user_* extra
   field(s) in passdb. doveadm proxy list shows these alt usernames in
   "doveadm proxy list" output. "doveadm director&proxy kick" adds
   -f <passdb field> parameter. The alt usernames don't have to be
   unique, so this allows creation of user groups and kicking them in
   one command.
 + auth: passdb/userdb dict allows now %variables in key settings.
 + auth: If passdb returns noauthenticate=yes extra field, assume that
   it only set extra fields and authentication wasn't actually performed.
 + auth: passdb static now supports password={scheme} prefix.
 + auth, login_log_format_elements: Added %{local_name} variable, which
   expands to TLS SNI hostname if given.
 + imapc: Added imapc_max_line_length to limit maximum memory usage.
 + imap, pop3: Added rawlog_dir setting to store IMAP/POP3 traffic logs.
   This replaces at least partially the rawlog plugin.
 + dsync: Added dsync_features=empty-header-workaround setting. This
   makes incremental dsyncs work better for servers that randomly return
   empty headers for mails. When an empty header is seen for an existing
   mail, dsync assumes that it matches the local mail.
 + doveadm sync/backup: Added -I <max size> parameter to skip too
   large mails.
 + doveadm sync/backup: Fixed -t parameter and added -e for "end date".
 + doveadm mailbox metadata: Added -s parameter to allow accessing
   server metadata by using empty mailbox name.
 + Added "doveadm service status" and "doveadm process status" commands.
 + director: Added director_flush_socket. See
   http://wiki2.dovecot.org/Director#Flush_socket
 + doveadm director flush: Users are now moved only max 100 at a time to
   avoid load spikes. --max-parallel parameter overrides this.
 + Added FILE_LOCK_SLOW_WARNING_MSECS environment, which logs a warning
   if any lock is waited on or kept for this many milliseconds.

 - master process's listener socket was leaked to all child processes.
   This might have allowed untrusted processes to capture and prevent
   "doveadm service stop" comands from working.
 - login proxy: Fixed crash when outgoing SSL connections were hanging.
 - auth: userdb fields weren't passed to auth-workers, so %{userdb:*}
   from previous userdbs didn't work there.
 - auth: Each userdb lookup from cache reset its TTL.
 - auth: Fixed auth_bind=yes + sasl_bind=yes to work together
 - auth: Blocking userdb lookups reset extra fields set by previous
   userdbs.
 - auth: Cache keys didn't include %{passdb:*} and %{userdb:*}
 - auth-policy: Fixed crash due to using already-freed memory if policy
   lookup takes longer than auth request exists.
 - lib-auth: Unescape passdb/userdb extra fields. Mainly affected
   returning extra fields with LFs or TABs.
 - lmtp_user_concurrency_limit>0 setting was logging unnecessary
   anvil errors.
 - lmtp_user_concurrency_limit is now checked before quota check with
   lmtp_rcpt_check_quota=yes to avoid unnecessary quota work.
 - lmtp: %{userdb:*} variables didn't work in mail_log_prefix
 - autoexpunge settings for mailboxes with wildcards didn't work when
   namespace prefix was non-empty.
 - Fixed writing >2GB to iostream-temp files (used by fs-compress,
   fs-metawrap, doveadm-http)
 - director: Ignore duplicates in director_servers setting.
 - director: Many fixes related to connection handshaking, user moving
   and error handling.
 - director: Don't break with shutdown_clients=no
 - zlib, IMAP BINARY: Fixed internal caching when accessing multiple
   newly created mails. They all had UID=0 and the next mail could have
   wrongly used the previously cached mail.
 - doveadm stats reset wasn't reseting all the stats.
 - auth_stats=yes: Don't update num_logins, since it doubles them when
   using with mail stats.
 - quota count: Fixed deadlocks when updating vsize header.
 - dict-quota: Fixed crashes happening due to memory corruption.
 - dict proxy: Fixed various timeout-related bugs.
 - doveadm proxying: Fixed -A and -u wildcard handling.
 - doveadm proxying: Fixed hangs and bugs related to printing.
 - imap: Fixed wrongly triggering assert-crash in
   client_check_command_hangs.
 - imap proxy: Don't send ID command pipelined with nopipelining=yes
 - imap-hibernate: Don't execute quota_over_script or last_login after
   un-hibernation.
 - imap-hibernate: Don't un-hibernate if client sends DONE+IDLE in one
   IP packet.
 - imap-hibernate: Fixed various failures when un-hibernating.
 - fts: fts_autoindex=yes was broken in 2.2.25 unless
   fts_autoindex_exclude settings existed.
 - fts-solr: Fixed searching multiple mailboxes (patch by x16a0)
 - doveadm fetch body.snippet wasn't working in 2.2.25. Also fixed a
   crash with certain emails.
 - pop3-migration + dbox: Various fixes related to POP3 UIDL
   optimization in 2.2.25.
 - pop3-migration: Fixed "truncated email header" workaround.

v2.2.26 had a couple of nasty bugs left in it, so here's a fixup release. The version number is also a little bit weird, but had to be done this way (although 2.2.26.0.1 could have been another possibility).
 - Fixed some compiling issues.
 - auth: Fixed assert-crash when using NTLM or SKEY mechanisms and
   multiple passdbs.
 - auth: Fixed crash when exporting to auth-worker passdb extra fields
   that had empty values.
 - dsync: Fixed assert-crash in dsync_brain_sync_mailbox_deinit

7 files changed, 16 insertions, 85 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index d55bbcafd7e..1a63962dcb7 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.92 2016/10/08 11:03:26 fhajny Exp $
-#
+# $NetBSD: Makefile,v 1.93 2016/11/12 11:21:45 adam Exp $
 
 .include "../../mail/dovecot2/Makefile.common"
 
-PKGREVISION=		4
-
 RCD_SCRIPTS=		dovecot
 SMF_NAME=		dovecot
 
diff --git a/mail/dovecot2/Makefile.common b/mail/dovecot2/Makefile.common
index 814d3195816..37eb92b52b7 100644
--- a/mail/dovecot2/Makefile.common
+++ b/mail/dovecot2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2016/10/08 11:03:26 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.3 2016/11/12 11:21:45 adam Exp $
 #
 # when updating to a new release, update ABI depends in
 # the buildlink3.mk file as well, since the plugins' version
@@ -9,9 +9,9 @@
 # used by mail/dovecot2-mysql/Makefile
 # used by mail/dovecot2-pgsql/Makefile
 
-DISTNAME=	dovecot-2.2.25
+DISTNAME=	dovecot-2.2.26.0
 CATEGORIES=	mail
-MASTER_SITES=	http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
+MASTER_SITES=	http://www.dovecot.org/releases/${PKGVERSION_NOREV:R:R}/
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.dovecot.org/
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index a953a54c23f..d2588f800a0 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2016/07/18 15:03:05 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.49 2016/11/12 11:21:45 adam Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -71,7 +71,7 @@ include/dovecot/dbox-file.h
 include/dovecot/dbox-mail.h
 include/dovecot/dbox-save.h
 include/dovecot/dbox-storage.h
-include/dovecot/dcrypt-iostream-private.h
+include/dovecot/dcrypt-iostream.h
 include/dovecot/dcrypt-private.h
 include/dovecot/dcrypt.h
 include/dovecot/dict-client.h
@@ -117,11 +117,13 @@ include/dovecot/fs-api-private.h
 include/dovecot/fs-api.h
 include/dovecot/fs-sis-common.h
 include/dovecot/fs-test.h
+include/dovecot/fs-wrapper.h
 include/dovecot/fsync-mode.h
 include/dovecot/fts-api-private.h
 include/dovecot/fts-api.h
 include/dovecot/fts-common.h
 include/dovecot/fts-expunge-log.h
+include/dovecot/fts-filter-common.h
 include/dovecot/fts-filter-private.h
 include/dovecot/fts-filter.h
 include/dovecot/fts-icu.h
@@ -283,6 +285,7 @@ include/dovecot/lib-signals.h
 include/dovecot/lib.h
 include/dovecot/llist.h
 include/dovecot/lmtp-client.h
+include/dovecot/log-throttle.h
 include/dovecot/login-common.h
 include/dovecot/login-proxy-state.h
 include/dovecot/login-proxy.h
@@ -415,6 +418,7 @@ include/dovecot/ostream-dot.h
 include/dovecot/ostream-encrypt.h
 include/dovecot/ostream-escaped.h
 include/dovecot/ostream-failure-at.h
+include/dovecot/ostream-file-private.h
 include/dovecot/ostream-hash.h
 include/dovecot/ostream-metawrap.h
 include/dovecot/ostream-null.h
@@ -441,6 +445,7 @@ include/dovecot/primes.h
 include/dovecot/printf-format-fix.h
 include/dovecot/priorityq.h
 include/dovecot/process-title.h
+include/dovecot/program-client.h
 include/dovecot/push-notification-drivers.h
 include/dovecot/push-notification-event-flagsclear.h
 include/dovecot/push-notification-event-flagsset.h
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 9a38e49edea..c579062e265 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.66 2016/10/05 12:39:57 sborrill Exp $
+$NetBSD: distinfo,v 1.67 2016/11/12 11:21:45 adam Exp $
 
-SHA1 (dovecot-2.2.25.tar.gz) = 7fd23e4fef4f6f25a43196d36686449d6515f2b8
-RMD160 (dovecot-2.2.25.tar.gz) = 4e6494326b15bb1205e927ac227974575707808d
-SHA512 (dovecot-2.2.25.tar.gz) = b38d815a727723dbeccf844be4bf05509fc4808ac1a25ba482da7ca25f30c5c57107b6064791326b39aa80bd45b61043266b451ee33ece3521bdbffca57fdecf
-Size (dovecot-2.2.25.tar.gz) = 5576235 bytes
+SHA1 (dovecot-2.2.26.0.tar.gz) = b2b555473ce9099b3e13e5c61c234ad16549b93c
+RMD160 (dovecot-2.2.26.0.tar.gz) = 7f5ca42490e67a4e908d98cf8eac7a05c86c7373
+SHA512 (dovecot-2.2.26.0.tar.gz) = 7b4c170efd964eabbd9a0166164e53b7964b90fc245bab1c3328bf199c4880288c89811dcfd9833f899057921eefb4451c561f3b3d725df9ea346df8fde82a3d
+Size (dovecot-2.2.26.0.tar.gz) = 5687576 bytes
 SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
 SHA1 (patch-ab) = d637a64feec8e4eafacda149cf0193aa1b70a054
 SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
diff --git a/mail/dovecot2/patches/patch-configure b/mail/dovecot2/patches/patch-configure
deleted file mode 100644
index bbdd60faea2..00000000000
--- a/mail/dovecot2/patches/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-configure,v 1.4 2016/10/05 12:39:57 sborrill Exp $
-
-configure: Fix static array check
-
-https://github.com/dovecot/core/commit/d9c865ce774aae9f2f17b89e7e94c3cfca29dea7
-
---- configure.orig	2016-10-05 12:03:18.000000000 +0100
-+++ configure	2016-10-05 12:03:30.000000000 +0100
-@@ -21188,7 +21188,7 @@
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--    void foo(int arr[static 20]);
-+    void foo(unsigned char[static 20]);
- 
- int
- main ()
diff --git a/mail/dovecot2/patches/patch-src_master_service-listen.c b/mail/dovecot2/patches/patch-src_master_service-listen.c
deleted file mode 100644
index 0a4ab4191ba..00000000000
--- a/mail/dovecot2/patches/patch-src_master_service-listen.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_master_service-listen.c,v 1.1 2016/07/06 10:39:22 adam Exp $
-
-Most importantly this fixes startup failure with kqueue.
-https://github.com/dovecot/core/commit/ffd8dc932516bc55bf01d91355540daab365e5e9?diff=unified
-
---- src/master/service-listen.c.orig	2016-07-06 09:34:27.000000000 +0000
-+++ src/master/service-listen.c
-@@ -6,7 +6,6 @@
- #include "fd-close-on-exec.h"
- #include "ioloop.h"
- #include "net.h"
--#include "master-client.h"
- #ifdef HAVE_SYSTEMD
- #include "sd-daemon.h"
- #endif
-@@ -357,10 +356,6 @@ static int services_listen_master(struct
- 
- 	if (service_list->master_fd == -1)
- 		return 0;
--
--	service_list->io_master =
--		io_add(service_list->master_fd, IO_READ,
--		       master_client_connected, service_list);
- 	return 1;
- }
- 
diff --git a/mail/dovecot2/patches/patch-src_master_service-monitor.c b/mail/dovecot2/patches/patch-src_master_service-monitor.c
deleted file mode 100644
index 9470bd74f8c..00000000000
--- a/mail/dovecot2/patches/patch-src_master_service-monitor.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_master_service-monitor.c,v 1.1 2016/07/06 10:39:22 adam Exp $
-
-Most importantly this fixes startup failure with kqueue.
-https://github.com/dovecot/core/commit/ffd8dc932516bc55bf01d91355540daab365e5e9?diff=unified
-
---- src/master/service-monitor.c.orig	2016-07-06 09:36:27.000000000 +0000
-+++ src/master/service-monitor.c
-@@ -7,6 +7,7 @@
- #include "hash.h"
- #include "str.h"
- #include "safe-mkstemp.h"
-+#include "master-client.h"
- #include "service.h"
- #include "service-process.h"
- #include "service-process-notify.h"
-@@ -452,6 +453,12 @@ void services_monitor_start(struct servi
- 		return;
- 	service_anvil_monitor_start(service_list);
- 
-+	if (service_list->io_master == NULL) {
-+		service_list->io_master =
-+			io_add(service_list->master_fd, IO_READ,
-+			       master_client_connected, service_list);
-+	}
-+
- 	array_foreach(&service_list->services, services) {
- 		struct service *service = *services;
-