dovecot24: carry over some patches from prev version

[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:		Sat Feb 7 16:08:34 2026 +0100
Changeset:	9ab662367faf82d5321b0c58826f38c270d2f040

Modified Files:
	dovecot24/TODO
	dovecot24/distinfo
	dovecot24/patches/patch-src_lib-var-expand-crypt_Makefile.in
Added Files:
	dovecot24/patches/patch-doc_dovecot.conf.in
	dovecot24/patches/patch-src_lib-storage_mail-storage.c

Log Message:
dovecot24: carry over some patches from prev version

including a private patch of mine.

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

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

diffstat:
 dovecot24/TODO                                     | 10 +++++++++
 dovecot24/distinfo                                 |  4 +++-
 dovecot24/patches/patch-doc_dovecot.conf.in        | 15 +++++++++++++
 .../patches/patch-src_lib-storage_mail-storage.c   | 26 ++++++++++++++++++++++
 .../patch-src_lib-var-expand-crypt_Makefile.in     |  2 +-
 5 files changed, 55 insertions(+), 2 deletions(-)

diffs:
diff --git a/dovecot24/TODO b/dovecot24/TODO
index 17e72d257f..e41e30c346 100644
--- a/dovecot24/TODO
+++ b/dovecot24/TODO
@@ -3,6 +3,10 @@ Prepare COMMIT_MSG.
 Reduce diffs to mail/dovecot to ease review:
   $NetBSD$ lines
   Check and maybe reduce all other diffs
+    
+    I checked all other diffs, and most of them seem to be applied already.
+    Except for several additions of #include <sys/time.h>, but that doesn't
+    seem to break the build, so I'll assume those patches are no longer needed.
 
 --with-ssl seems to be an non-existing option for configure.
 It looks like dovecot-2.4.2/m4/ssl.m4 says ssl is not optional, and it has to
@@ -10,6 +14,8 @@ be OpenSSL.
 
 --with-libwrap seems to be an non-existing option for configure.
 
+    I wonder if adding libwrap support back is easy?
+
 Add comments to both patches, and upstream URL or argument that the
 patch does not belong upstream.
 
@@ -23,3 +29,7 @@ and/or patching, and filing upstream.
 Address the strategy of a lot of config files.  Does dovecot really
 need all those files?  Installed config should be minimal and the user
 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.
diff --git a/dovecot24/distinfo b/dovecot24/distinfo
index cab716c2d5..b139f978d8 100644
--- a/dovecot24/distinfo
+++ b/dovecot24/distinfo
@@ -4,5 +4,7 @@ BLAKE2s (dovecot-2.4.2.tar.gz) = a8356102681d217d8f51c72a366ac0596341cfefe2c6304
 SHA512 (dovecot-2.4.2.tar.gz) = 0524695341abe711d3a811c56156889d6fef7a09becc684c6f1dc1e5add605969ca8794eb7d44bfbc49f70515f22e8640b5828443addecfe4798fb8b174670ae
 Size (dovecot-2.4.2.tar.gz) = 7807240 bytes
 SHA1 (patch-configure) = 6adc141ed30241300c4e51b07488c3d65ceacfca
-SHA1 (patch-src_lib-var-expand-crypt_Makefile.in) = 439b5be956aa049bc7d1f9bcbaeeea7975a728b7
+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) = 5fe989b91828fd9d7589db94b6ca6030bc574b29
 SHA1 (patch-src_lib_lib.h) = cac10ddeb45cf4de4f1d3d15d568ae72f403dc7b
diff --git a/dovecot24/patches/patch-doc_dovecot.conf.in b/dovecot24/patches/patch-doc_dovecot.conf.in
new file mode 100644
index 0000000000..0e58756e3c
--- /dev/null
+++ b/dovecot24/patches/patch-doc_dovecot.conf.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Default to passwd, not pam, for passdb. (NEEDS CHECKING!)
+
+--- doc/dovecot.conf.in.orig	2026-02-07 14:16:52.447076681 +0000
++++ doc/dovecot.conf.in
+@@ -41,7 +41,7 @@ namespace inbox {
+ }
+ 
+ # Authenticate as system users:
+-passdb pam {
++passdb passwd {
+ }
+ 
+ ssl_server {
diff --git a/dovecot24/patches/patch-src_lib-storage_mail-storage.c b/dovecot24/patches/patch-src_lib-storage_mail-storage.c
new file mode 100644
index 0000000000..8d3d255c47
--- /dev/null
+++ b/dovecot24/patches/patch-src_lib-storage_mail-storage.c
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Don't drop the "RECENT" flag from messages automatically.
+In terms of Mutt, this prevents that mails change from N to O state.
+(Rhialto local patch)
+
+--- src/lib-storage/mail-storage.c.orig	2026-02-07 14:20:14.590842703 +0000
++++ src/lib-storage/mail-storage.c
+@@ -1109,6 +1109,8 @@ struct mailbox *mailbox_alloc(struct mai
+ 
+ 	i_assert(uni_utf8_str_is_valid(vname));
+ 
++	flags &= ~MAILBOX_FLAG_DROP_RECENT;
++
+ 	if (str_begins_icase(vname, "INBOX", &suffix) &&
+ 	    !str_begins_with(vname, "INBOX")) {
+ 		/* make sure INBOX shows up in uppercase everywhere. do this
+@@ -1197,6 +1199,8 @@ struct mailbox *mailbox_alloc_guid(struc
+ 	enum mail_error open_error = MAIL_ERROR_TEMP;
+ 	const char *vname;
+ 
++	flags &= ~MAILBOX_FLAG_DROP_RECENT;
++
+ 	if (mailbox_guid_cache_find(list, guid, &vname) < 0) {
+ 		vname = NULL;
+ 	} else if (vname != NULL) {
diff --git a/dovecot24/patches/patch-src_lib-var-expand-crypt_Makefile.in b/dovecot24/patches/patch-src_lib-var-expand-crypt_Makefile.in
index a7ed33150d..e05a6dd467 100644
--- a/dovecot24/patches/patch-src_lib-var-expand-crypt_Makefile.in
+++ b/dovecot24/patches/patch-src_lib-var-expand-crypt_Makefile.in
@@ -2,7 +2,7 @@ $NetBSD$
 
 Fix linking errors on non-Linux platforms for a test binary
 
---- src/lib-var-expand-crypt/Makefile.in.orig	2026-02-01 12:39:47.838422302 +0000
+--- src/lib-var-expand-crypt/Makefile.in.orig	2025-10-29 06:58:58.000000000 +0000
 +++ src/lib-var-expand-crypt/Makefile.in
 @@ -545,7 +545,7 @@ test_libs = \
  test_var_expand_crypt_SOURCES = test-var-expand-crypt.c