CVS commit: pkgsrc/mail/dbmail

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Sep  7 21:26:43 UTC 2026

Modified Files:
        pkgsrc/mail/dbmail: Makefile distinfo
Added Files:
        pkgsrc/mail/dbmail/patches: patch-src_server.c

Log Message:
dbmail: fix an I/O stall issue. Bump.

Patch accepted by upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/mail/dbmail/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/dbmail/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/dbmail/patches/patch-src_server.c

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

Modified files:

Index: pkgsrc/mail/dbmail/Makefile
diff -u pkgsrc/mail/dbmail/Makefile:1.93 pkgsrc/mail/dbmail/Makefile:1.94
--- pkgsrc/mail/dbmail/Makefile:1.93    Wed Sep  2 19:03:16 2026
+++ pkgsrc/mail/dbmail/Makefile Mon Sep  7 21:26:43 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2026/09/02 19:03:16 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2026/09/07 21:26:43 tnn Exp $
 
 DISTNAME=      dbmail-3.5.5
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dbmail/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/mail/dbmail/distinfo
diff -u pkgsrc/mail/dbmail/distinfo:1.22 pkgsrc/mail/dbmail/distinfo:1.23
--- pkgsrc/mail/dbmail/distinfo:1.22    Fri Jan  2 17:57:31 2026
+++ pkgsrc/mail/dbmail/distinfo Mon Sep  7 21:26:43 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.22 2026/01/02 17:57:31 tnn Exp $
+$NetBSD: distinfo,v 1.23 2026/09/07 21:26:43 tnn Exp $
 
 BLAKE2s (dbmail-3.5.5.tar.gz) = 27c6f8c250c2d50975cd64f9dce085c00224394fc0c1a0fd4552c9213de92bfa
 SHA512 (dbmail-3.5.5.tar.gz) = e852b695e5dfb717ca18821855de3ec8c38017a834a4a898f0d8c659eedcd133101cf87b566d1e6dc92b69c0c78715f77b74a550e70023a57044aa4472bcb86b
 Size (dbmail-3.5.5.tar.gz) = 2553083 bytes
 SHA1 (patch-src_dbmail.h.in) = 04feedc90991b5080c6528b01223f190813941a4
+SHA1 (patch-src_server.c) = 437d4123c1ae4bc6fd90515957d612f2209709d1

Added files:

Index: pkgsrc/mail/dbmail/patches/patch-src_server.c
diff -u /dev/null pkgsrc/mail/dbmail/patches/patch-src_server.c:1.1
--- /dev/null   Mon Sep  7 21:26:43 2026
+++ pkgsrc/mail/dbmail/patches/patch-src_server.c       Mon Sep  7 21:26:43 2026
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_server.c,v 1.1 2026/09/07 21:26:43 tnn Exp $
+
+https://github.com/dbmail/dbmail/commit/0ea3c1aff8d9af22a1f5f39d4f825ffb4b071908
+
+--- src/server.c.orig  2026-08-22 19:36:08.156416568 +0000
++++ src/server.c
+@@ -81,12 +81,13 @@ static void cb_queue_drain(int fd, short what UNUSED, 
+ static void cb_queue_drain(int fd, short what UNUSED, void *arg UNUSED)
+ {
+       char buf[1024];
+-      event_del(heartbeat);
+-      dm_queue_drain();
++      ssize_t r;
+       PLOCK(selfpipe_lock);
+-      if (read(fd, buf, sizeof(buf))) { /* ignore */ }
++      do {
++              r = read(fd, buf, sizeof(buf));
++      } while (r == sizeof(buf));
+       PUNLOCK(selfpipe_lock);
+-      event_add(heartbeat, NULL);
++      dm_queue_drain();
+ }
+ 
+ 
+@@ -100,7 +101,7 @@ void dm_queue_heartbeat(void)
+ 
+       pthread_mutex_init(&selfpipe_lock, NULL);
+ 
+-      heartbeat = event_new(evbase, selfpipe[0], EV_READ, cb_queue_drain, NULL);
++      heartbeat = event_new(evbase, selfpipe[0], EV_READ|EV_PERSIST, cb_queue_drain, NULL);
+       event_add(heartbeat, NULL);
+ }
+