Most importantly this fixes startup failure with kqueue.

https://github.com/dovecot/core/commit/ffd8dc932516bc55bf01d91355540daab365e5e9?diff=unified
Fix for PR 51314.

5 files changed, 61 insertions, 4 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index acdcd323a76..a8d5d70762c 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.88 2016/07/02 19:32:09 adam Exp $
+# $NetBSD: Makefile,v 1.89 2016/07/06 10:39:22 adam 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.25
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
 
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
index 402602f495c..69fd9c7c5d5 100644
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2016/04/08 07:55:16 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2016/07/06 10:39:22 adam Exp $
 
 BUILDLINK_TREE+=	dovecot
 
@@ -7,7 +7,7 @@ DOVECOT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.dovecot+=		dovecot>=2.2.0
 # must match current package version for plugins to load
-BUILDLINK_ABI_DEPENDS.dovecot+=		dovecot>=2.2.23
+BUILDLINK_ABI_DEPENDS.dovecot+=		dovecot>=2.2.25
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot2
 
 pkgbase:=	dovecot
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 807fe1f27c7..d3420ca2d14 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2016/07/02 19:32:09 adam Exp $
+$NetBSD: distinfo,v 1.65 2016/07/06 10:39:22 adam Exp $
 
 SHA1 (dovecot-2.2.25.tar.gz) = 7fd23e4fef4f6f25a43196d36686449d6515f2b8
 RMD160 (dovecot-2.2.25.tar.gz) = 4e6494326b15bb1205e927ac227974575707808d
@@ -10,5 +10,7 @@ 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_master_service-listen.c) = 58351083d928206e67bff3ae88a67556d6b43711
+SHA1 (patch-src_master_service-monitor.c) = e6b95755a99fc631bd4fd3017b6f01f022a3192d
 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_master_service-listen.c b/mail/dovecot2/patches/patch-src_master_service-listen.c
new file mode 100644
index 00000000000..0a4ab4191ba
--- /dev/null
+++ b/mail/dovecot2/patches/patch-src_master_service-listen.c
@@ -0,0 +1,26 @@
+$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
new file mode 100644
index 00000000000..9470bd74f8c
--- /dev/null
+++ b/mail/dovecot2/patches/patch-src_master_service-monitor.c
@@ -0,0 +1,28 @@
+$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;
+