vmailmgr-base: deliver more than once per second to same Maildir.

From GitHub PR #1. Ride recent import.
TritonDataCenter · Feb 25, 2024 · 526c4b9 · 526c4b9
1 parent 79e8f5a
commit 526c4b9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/mail/vmailmgr-base/distinfo b/mail/vmailmgr-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2024/02/25 12:09:21 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2024/02/25 12:44:44 schmonz Exp $
 
 BLAKE2s (vmailmgr-526d53c1d0e604ec29ada61b79485ceeb8b978cd-526d53c1d0e604ec29ada61b79485ceeb8b978cd.tar.gz) = 6e83ecea2a0defebd20323fbe9833dc1d4e63e8e2d4c6d904c9558ba32cc9a59
 SHA512 (vmailmgr-526d53c1d0e604ec29ada61b79485ceeb8b978cd-526d53c1d0e604ec29ada61b79485ceeb8b978cd.tar.gz) = 9d717b4b9ae763509d8192c40167606acdc56622d8f9351c763140f5b2573d6c2c1364c33003e1649d2b0d628aadab03690ade20f9e3210c5b44a89237bdd62b
@@ -8,7 +8,7 @@ SHA1 (patch-acinclude.m4) = 950092d07a7021fb92e4fd4716107a7988a21d22
 SHA1 (patch-authenticate_Makefile.am) = 3529853104846d64882d64be39597cacb0bc6e98
 SHA1 (patch-commands_Makefile.am) = 0fc9881f76fefad7648ecde4bb230278237e33b5
 SHA1 (patch-commands_vadduser.cc) = 425ff956c716b443af4749412dd87e72e9be8af6
-SHA1 (patch-commands_vdeliver.cc) = ddf90a5adefd646872d59591e03f0feeb7f72167
+SHA1 (patch-commands_vdeliver.cc) = 0b0217839a0edab2dd070bd4377b8b273f44e836
 SHA1 (patch-configure.ac) = d1a9fad59f076debcdeb6fd352a9b691aad9eec6
 SHA1 (patch-daemon_Makefile.am) = 4a0a2bbcc25371ae412c5b64b577a2194a84f2e4
 SHA1 (patch-daemon_main.cc) = e93f2b06b26920ec9dd8aaf8e4029792b9042284

diff --git a/mail/vmailmgr-base/patches/patch-commands_vdeliver.cc b/mail/vmailmgr-base/patches/patch-commands_vdeliver.cc
@@ -1,9 +1,18 @@
-$NetBSD: patch-commands_vdeliver.cc,v 1.1 2024/02/25 12:09:22 schmonz Exp $
+$NetBSD: patch-commands_vdeliver.cc,v 1.2 2024/02/25 12:44:44 schmonz Exp $
 
-Patch from FreeBSD ports.
+Patches from FreeBSD ports and GitHub PR #1.
 
 --- commands/vdeliver.cc.orig	2015-09-01 16:03:21.000000000 +0000
 +++ commands/vdeliver.cc
+@@ -176,7 +176,7 @@ void deliver_partial()
+   const mystring hostname = make_hostname();
+   pid_t pid = getpid();
+   for(;; sleep(2)) {
+-    partname = "/" + mystring(itoa(time(0))) + "." + itoa(pid)
++    partname = "/" + mystring(itoa(time(0))) + "." + mystring(itoa(pid))
+       + "." + hostname;
+
+     mystring newfile = newdir + partname;
 @@ -262,7 +262,7 @@ void inject(mystring sender, mystring re
      close(pipe2[1]);
      if((dup2(pipe1[0], 0) != 0) || (dup2(pipe2[0], 1) != 1))