CVS commit: pkgsrc/mail/sendmail

["John Nemeth" <jnemeth%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jnemeth
Date:           Mon Mar 18 02:46:47 UTC 2024

Modified Files:
        pkgsrc/mail/sendmail: Makefile
        pkgsrc/mail/sendmail/files: sendmail.sh smmsp.sh

Log Message:
Add rcvars for sendmail_queuetime/smmsp_queuetime to set the queue time for sendmail/smmsp.


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 pkgsrc/mail/sendmail/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/sendmail/files/sendmail.sh \
    pkgsrc/mail/sendmail/files/smmsp.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/sendmail/Makefile
diff -u pkgsrc/mail/sendmail/Makefile:1.144 pkgsrc/mail/sendmail/Makefile:1.145
--- pkgsrc/mail/sendmail/Makefile:1.144 Mon Feb 19 04:12:36 2024
+++ pkgsrc/mail/sendmail/Makefile       Mon Mar 18 02:46:47 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.144 2024/02/19 04:12:36 jnemeth Exp $
+# $NetBSD: Makefile,v 1.145 2024/03/18 02:46:47 jnemeth Exp $
 
 PKGNAME=       sendmail-${DIST_VERS}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       The well known Mail Transport Agent
 
 CONFLICTS+=    courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*

Index: pkgsrc/mail/sendmail/files/sendmail.sh
diff -u pkgsrc/mail/sendmail/files/sendmail.sh:1.3 pkgsrc/mail/sendmail/files/sendmail.sh:1.4
--- pkgsrc/mail/sendmail/files/sendmail.sh:1.3  Sun Jun 15 20:48:49 2014
+++ pkgsrc/mail/sendmail/files/sendmail.sh      Mon Mar 18 02:46:47 2024
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: sendmail.sh,v 1.3 2014/06/15 20:48:49 jnemeth Exp $
+# $NetBSD: sendmail.sh,v 1.4 2024/03/18 02:46:47 jnemeth Exp $
 #
 
 # PROVIDE: mail
@@ -22,9 +22,13 @@ makemap="@PREFIX@/sbin/makemap"
 newaliases="@PREFIX@/bin/newaliases"
 smbin="@PREFIX@/libexec/sendmail/sendmail"
 check_files="aliases access genericstable virtusertable domaintable mailertable"
-sendmail_flags="-Lsm-mta -bd -q30m"
 command=$smbin
 
+load_rc_config $name
+
+sendmail_queuetime=${sendmail_queuetime-"30m"}
+command_args="-Lsm-mta -bd -q${sendmail_queuetime}"
+
 sendmail_precmd()
 {
        # check modifications on /etc/mail/ databases
@@ -56,5 +60,4 @@ sendmail_precmd()
        done
 }
 
-load_rc_config $name
 run_rc_command "$1"
Index: pkgsrc/mail/sendmail/files/smmsp.sh
diff -u pkgsrc/mail/sendmail/files/smmsp.sh:1.3 pkgsrc/mail/sendmail/files/smmsp.sh:1.4
--- pkgsrc/mail/sendmail/files/smmsp.sh:1.3     Sun Jun 15 20:48:49 2014
+++ pkgsrc/mail/sendmail/files/smmsp.sh Mon Mar 18 02:46:47 2024
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: smmsp.sh,v 1.3 2014/06/15 20:48:49 jnemeth Exp $
+# $NetBSD: smmsp.sh,v 1.4 2024/03/18 02:46:47 jnemeth Exp $
 #
 
 # REQUIRE: mail
@@ -23,8 +23,11 @@ required_files="/etc/mail/submit.cf"
 extra_commands="reload"
 
 smbin="@PREFIX@/libexec/sendmail/sendmail"
-smmsp_flags="-Lsm-msp-queue -Ac -q30m"
 command=$smbin
 
 load_rc_config $name
+
+smmsp_queuetime=${smmsp_queuetime-"30m"}
+command_args="-Lsm-msp-queue -Ac -q${smmsp_queuetime}"
+
 run_rc_command "$1"