dovecot24: imap-hibernate works halfway

[Olaf Seibert (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Thu Feb 12 18:41:53 2026 +0100
Changeset:	fb71b7730f033d71064ba3b0a215dfb3baf0582d

Modified Files:
	dovecot24/Makefile
	dovecot24/TODO
	dovecot24/distinfo
Removed Files:
	dovecot24/patches/patch-configure

Log Message:
dovecot24: imap-hibernate works halfway

(the un-hibernating fails; see TODO file)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fb71b7730f033d71064ba3b0a215dfb3baf0582d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 dovecot24/Makefile                |  6 ++++++
 dovecot24/TODO                    | 15 +++++++++++++++
 dovecot24/distinfo                |  1 -
 dovecot24/patches/patch-configure | 19 -------------------
 4 files changed, 21 insertions(+), 20 deletions(-)

diffs:
diff --git a/dovecot24/Makefile b/dovecot24/Makefile
index 0c46f67942..332610c12a 100644
--- a/dovecot24/Makefile
+++ b/dovecot24/Makefile
@@ -49,6 +49,12 @@ post-install: enable-manz-by-replacing-roff-includes-with-symlinks
 	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DESTDIR}${EGDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DESTDIR}${EGDIR}
 
+# The "hibernate" functionality only works with inotify, not kqueue.
+CONFIGURE_ARGS+=	--with-notify=inotify
+LDFLAGS.NetBSD+=	-linotify
+LDFLAGS.FreeBSD+=	-linotify
+.include "../../devel/libinotify/buildlink3.mk"
+
 # \todo Decide if dovecot should depend on python, and explain whether
 # settings-history.py is important enough to warrant a python
 # dependency.
diff --git a/dovecot24/TODO b/dovecot24/TODO
index ea28bdf9a5..f7316fbb68 100644
--- a/dovecot24/TODO
+++ b/dovecot24/TODO
@@ -49,3 +49,18 @@ is welcome to steal from examples.
     Currently it doesn't install a whole conf.d directory of config file
     fragements any more. This difference is actually annoying when upgrading
     from the previous version, which did do that.
+
+Get libinotify to work.
+=======================
+
+With current patches, it will be used, but the un-hibernating will fail with a
+permission error.
+
+1. In dovecot.conf: imap_hibernate_timeout = 10 secs
+2. In mutt:         :set imap_idle=yes
+
+With this, the hibernation step appears to work (at least no error is logged)
+but the un-hibernating fails:
+
+Feb 12 18:31:42 murthe dovecot: imap-hibernate(rhialto)<3278><b0YR26NK0PsAAAAAAAAAAAAAAAAAAAAB>: Error: Failed to unhibernate client: net_connect_unix(/var/run/dovecot/imap-master) failed: Permission denied
+Feb 12 18:31:42 murthe dovecot: imap-hibernate(rhialto)<3278><b0YR26NK0PsAAAAAAAAAAAAAAAAAAAAB>: Disconnected: Failed to unhibernate client in=133 out=290740 deleted=0 expunged=0 trashed=0 hdr_count=0 hdr_bytes=0 body_count=0 body_bytes=0
diff --git a/dovecot24/distinfo b/dovecot24/distinfo
index 6fd238d78d..81893e0957 100644
--- a/dovecot24/distinfo
+++ b/dovecot24/distinfo
@@ -3,7 +3,6 @@ $NetBSD$
 BLAKE2s (dovecot-2.4.2.tar.gz) = a8356102681d217d8f51c72a366ac0596341cfefe2c630464865322f58b7b2fb
 SHA512 (dovecot-2.4.2.tar.gz) = 0524695341abe711d3a811c56156889d6fef7a09becc684c6f1dc1e5add605969ca8794eb7d44bfbc49f70515f22e8640b5828443addecfe4798fb8b174670ae
 Size (dovecot-2.4.2.tar.gz) = 7807240 bytes
-SHA1 (patch-configure) = 6adc141ed30241300c4e51b07488c3d65ceacfca
 SHA1 (patch-doc_dovecot.conf.in) = cad98a01a577b1f253b8d783e5105c22bfd964cd
 SHA1 (patch-src_lib-storage_mail-storage.c) = ef9d6ad2198be3fbe274f860a00d2dcb4f4beeaa
 SHA1 (patch-src_lib-var-expand-crypt_Makefile.in) = 5e7a03ea899bf81e70431f64cf21289cf33ea357
diff --git a/dovecot24/patches/patch-configure b/dovecot24/patches/patch-configure
deleted file mode 100644
index 88d04ccde3..0000000000
--- a/dovecot24/patches/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-If imap-hibernate executable is not built, dovecot fails to start with:
-Fatal: service(imap-hibernate) access(/usr/pkg/libexec/dovecot/imap-hibernate) failed: No such file or directory
-
---- configure.orig	2026-02-03 16:30:19.646993359 +0000
-+++ configure
-@@ -22860,9 +22860,9 @@ fi
- 
- case "$notify" in #(
-   none) :
--    BUILD_IMAP_HIBERNATE=0 ;; #(
-+    BUILD_IMAP_HIBERNATE=1 ;; #(
-   kqueue) :
--    BUILD_IMAP_HIBERNATE=0 ;; #(
-+    BUILD_IMAP_HIBERNATE=1 ;; #(
-   *) :
-     BUILD_IMAP_HIBERNATE=1 ;;
- esac