CVS commit: pkgsrc/mail/dbmail

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Mar  3 20:07:00 UTC 2026

Modified Files:
        pkgsrc/mail/dbmail: Makefile
        pkgsrc/mail/dbmail/files: dbmailhttpd.sh dbmailimapd.sh dbmaillmtpd.sh
            dbmailpop3d.sh dbmailsieved.sh

Log Message:
dbmail: ensure pidfile directory exists. Bump


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/mail/dbmail/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/dbmail/files/dbmailhttpd.sh \
    pkgsrc/mail/dbmail/files/dbmailsieved.sh
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/dbmail/files/dbmailimapd.sh \
    pkgsrc/mail/dbmail/files/dbmaillmtpd.sh \
    pkgsrc/mail/dbmail/files/dbmailpop3d.sh

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.90 pkgsrc/mail/dbmail/Makefile:1.91
--- pkgsrc/mail/dbmail/Makefile:1.90    Fri Feb  6 10:05:11 2026
+++ pkgsrc/mail/dbmail/Makefile Tue Mar  3 20:07:00 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2026/02/06 10:05:11 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2026/03/03 20:07:00 tnn Exp $
 
 DISTNAME=      dbmail-3.5.5
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dbmail/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -31,7 +31,6 @@ EGDIR=                        ${PREFIX}/share/examples/dbmail
 CONF_FILES_PERMS+=     ${EGDIR}/dbmail.conf ${PKG_SYSCONFDIR}/dbmail.conf \
                          ${DBMAIL_USER} ${DBMAIL_GROUP} 0640
 OWN_DIRS_PERMS+=       ${VARBASE}/log/dbmail ${DBMAIL_USER} ${DBMAIL_GROUP} 0750
-OWN_DIRS_PERMS+=       ${VARBASE}/run/dbmail ${DBMAIL_USER} ${DBMAIL_GROUP} 0750
 RCD_SCRIPTS=           dbmail dbmailhttpd dbmailimapd dbmaillmtpd dbmailpop3d
 DATADIR=               ${PREFIX}/share/dbmail
 
@@ -41,6 +40,8 @@ PKG_USERS_VARS=               DBMAIL_USER
 PKG_GROUPS_VARS=       DBMAIL_GROUP
 PKG_GROUPS=            ${DBMAIL_GROUP}
 PKG_USERS=             ${DBMAIL_USER}:${DBMAIL_GROUP}
+FILES_SUBST+=          DBMAIL_USER=${DBMAIL_USER}
+FILES_SUBST+=          DBMAIL_GROUP=${DBMAIL_GROUP}
 
 SUBST_CLASSES+=                fix-cfg
 SUBST_STAGE.fix-cfg=   pre-configure

Index: pkgsrc/mail/dbmail/files/dbmailhttpd.sh
diff -u pkgsrc/mail/dbmail/files/dbmailhttpd.sh:1.1 pkgsrc/mail/dbmail/files/dbmailhttpd.sh:1.2
--- pkgsrc/mail/dbmail/files/dbmailhttpd.sh:1.1 Fri Jan  2 17:57:31 2026
+++ pkgsrc/mail/dbmail/files/dbmailhttpd.sh     Tue Mar  3 20:07:00 2026
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmailhttpd.sh,v 1.1 2026/01/02 17:57:31 tnn Exp $
+# $NetBSD: dbmailhttpd.sh,v 1.2 2026/03/03 20:07:00 tnn Exp $
 #
 
 # PROVIDE: dbmailhttp mail
@@ -13,6 +13,16 @@ rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/dbmail.conf"
 command="@PREFIX@/sbin/dbmail-httpd"
 pidfile="@VARBASE@/run/dbmail/dbmail-httpd.pid"
+start_precmd="dbmailhttpd_precmd"
+
+dbmailhttpd_precmd()
+{
+       if [ ! -d @VARBASE@/run/dbmail ]; then
+               @MKDIR@ @VARBASE@/run/dbmail
+               @CHMOD@ 0750 @VARBASE@/run/dbmail
+               @CHOWN@ @DBMAIL_USER@:@DBMAIL_GROUP@ @VARBASE@/run/dbmail
+       fi
+}
 
 load_rc_config $name
 run_rc_command "$1"
Index: pkgsrc/mail/dbmail/files/dbmailsieved.sh
diff -u pkgsrc/mail/dbmail/files/dbmailsieved.sh:1.1 pkgsrc/mail/dbmail/files/dbmailsieved.sh:1.2
--- pkgsrc/mail/dbmail/files/dbmailsieved.sh:1.1        Fri Jan  2 17:57:31 2026
+++ pkgsrc/mail/dbmail/files/dbmailsieved.sh    Tue Mar  3 20:07:00 2026
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmailsieved.sh,v 1.1 2026/01/02 17:57:31 tnn Exp $
+# $NetBSD: dbmailsieved.sh,v 1.2 2026/03/03 20:07:00 tnn Exp $
 #
 
 # PROVIDE: dbmailieved mail
@@ -13,6 +13,16 @@ rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/dbmail.conf"
 command="@PREFIX@/sbin/dbmail-sieved"
 pidfile="@VARBASE@/run/dbmail/dbmail-sieved.pid"
+start_precmd="dbmailsieved_precmd"
+
+dbmailsieved_precmd()
+{
+       if [ ! -d @VARBASE@/run/dbmail ]; then
+               @MKDIR@ @VARBASE@/run/dbmail
+               @CHMOD@ 0750 @VARBASE@/run/dbmail
+               @CHOWN@ @DBMAIL_USER@:@DBMAIL_GROUP@ @VARBASE@/run/dbmail
+       fi
+}
 
 load_rc_config $name
 run_rc_command "$1"

Index: pkgsrc/mail/dbmail/files/dbmailimapd.sh
diff -u pkgsrc/mail/dbmail/files/dbmailimapd.sh:1.3 pkgsrc/mail/dbmail/files/dbmailimapd.sh:1.4
--- pkgsrc/mail/dbmail/files/dbmailimapd.sh:1.3 Fri Jan  2 17:57:31 2026
+++ pkgsrc/mail/dbmail/files/dbmailimapd.sh     Tue Mar  3 20:07:00 2026
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmailimapd.sh,v 1.3 2026/01/02 17:57:31 tnn Exp $
+# $NetBSD: dbmailimapd.sh,v 1.4 2026/03/03 20:07:00 tnn Exp $
 #
 
 # PROVIDE: dbmailimap mail
@@ -13,6 +13,16 @@ rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/dbmail.conf"
 command="@PREFIX@/sbin/dbmail-imapd"
 pidfile="@VARBASE@/run/dbmail/dbmail-imapd.pid"
+start_precmd="dbmailimapd_precmd"
+
+dbmailimapd_precmd()
+{
+       if [ ! -d @VARBASE@/run/dbmail ]; then
+               @MKDIR@ @VARBASE@/run/dbmail
+               @CHMOD@ 0750 @VARBASE@/run/dbmail
+               @CHOWN@ @DBMAIL_USER@:@DBMAIL_GROUP@ @VARBASE@/run/dbmail
+       fi
+}
 
 load_rc_config $name
 run_rc_command "$1"
Index: pkgsrc/mail/dbmail/files/dbmaillmtpd.sh
diff -u pkgsrc/mail/dbmail/files/dbmaillmtpd.sh:1.3 pkgsrc/mail/dbmail/files/dbmaillmtpd.sh:1.4
--- pkgsrc/mail/dbmail/files/dbmaillmtpd.sh:1.3 Fri Jan  2 17:57:31 2026
+++ pkgsrc/mail/dbmail/files/dbmaillmtpd.sh     Tue Mar  3 20:07:00 2026
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmaillmtpd.sh,v 1.3 2026/01/02 17:57:31 tnn Exp $
+# $NetBSD: dbmaillmtpd.sh,v 1.4 2026/03/03 20:07:00 tnn Exp $
 #
 
 # PROVIDE: dbmaillmtp mail
@@ -13,6 +13,16 @@ rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/dbmail.conf"
 command="@PREFIX@/sbin/dbmail-lmtpd"
 pidfile="@VARBASE@/run/dbmail/dbmail-lmtpd.pid"
+start_precmd="dbmaillmtpd_precmd"
+
+dbmaillmtpd_precmd()
+{
+       if [ ! -d @VARBASE@/run/dbmail ]; then
+               @MKDIR@ @VARBASE@/run/dbmail
+               @CHMOD@ 0750 @VARBASE@/run/dbmail
+               @CHOWN@ @DBMAIL_USER@:@DBMAIL_GROUP@ @VARBASE@/run/dbmail
+       fi
+}
 
 load_rc_config $name
 run_rc_command "$1"
Index: pkgsrc/mail/dbmail/files/dbmailpop3d.sh
diff -u pkgsrc/mail/dbmail/files/dbmailpop3d.sh:1.3 pkgsrc/mail/dbmail/files/dbmailpop3d.sh:1.4
--- pkgsrc/mail/dbmail/files/dbmailpop3d.sh:1.3 Fri Jan  2 17:57:31 2026
+++ pkgsrc/mail/dbmail/files/dbmailpop3d.sh     Tue Mar  3 20:07:00 2026
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmailpop3d.sh,v 1.3 2026/01/02 17:57:31 tnn Exp $
+# $NetBSD: dbmailpop3d.sh,v 1.4 2026/03/03 20:07:00 tnn Exp $
 #
 
 # PROVIDE: dbmailpop3 mail
@@ -13,6 +13,16 @@ rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/dbmail.conf"
 command="@PREFIX@/sbin/dbmail-pop3d"
 pidfile="@VARBASE@/run/dbmail/dbmail-pop3d.pid"
+start_precmd="dbmailpop3d_precmd"
+
+dbmailpop3d_precmd()
+{
+       if [ ! -d @VARBASE@/run/dbmail ]; then
+               @MKDIR@ @VARBASE@/run/dbmail
+               @CHMOD@ 0750 @VARBASE@/run/dbmail
+               @CHOWN@ @DBMAIL_USER@:@DBMAIL_GROUP@ @VARBASE@/run/dbmail
+       fi
+}
 
 load_rc_config $name
 run_rc_command "$1"