CVS commit: pkgsrc/mail/qmail-run

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Oct  5 12:17:20 UTC 2020

Modified Files:
        pkgsrc/mail/qmail-run: Makefile
        pkgsrc/mail/qmail-run/files: qmail-qread-client.sh qmail.sh

Log Message:
If any of our several rcvars aren't YES, that's fine: don't exit
nonzero. Bump version.

While here, document in qmail-qread-client that its rc.conf vars are
shared with the qmailqread service.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/qmail-run/files/qmail-qread-client.sh
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/qmail-run/files/qmail.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/qmail-run/Makefile
diff -u pkgsrc/mail/qmail-run/Makefile:1.75 pkgsrc/mail/qmail-run/Makefile:1.76
--- pkgsrc/mail/qmail-run/Makefile:1.75 Tue May 19 19:45:58 2020
+++ pkgsrc/mail/qmail-run/Makefile      Mon Oct  5 12:17:20 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2020/05/19 19:45:58 schmonz Exp $
+# $NetBSD: Makefile,v 1.76 2020/10/05 12:17:20 schmonz Exp $
 #
 
-DISTNAME=              qmail-run-20200519
+DISTNAME=              qmail-run-20201005
 CATEGORIES=            mail
 MASTER_SITES=          # empty
 DISTFILES=             # empty

Index: pkgsrc/mail/qmail-run/files/qmail-qread-client.sh
diff -u pkgsrc/mail/qmail-run/files/qmail-qread-client.sh:1.5 pkgsrc/mail/qmail-run/files/qmail-qread-client.sh:1.6
--- pkgsrc/mail/qmail-run/files/qmail-qread-client.sh:1.5       Tue Apr 11 14:04:37 2017
+++ pkgsrc/mail/qmail-run/files/qmail-qread-client.sh   Mon Oct  5 12:17:20 2020
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: qmail-qread-client.sh,v 1.5 2017/04/11 14:04:37 schmonz Exp $
+# $NetBSD: qmail-qread-client.sh,v 1.6 2020/10/05 12:17:20 schmonz Exp $
 #
 # @PKGNAME@ client program to allow local non-root users to see
 # the queue. Requires that the corresponding server program be running.
@@ -9,10 +9,15 @@
 
 if [ -f /etc/rc.subr ]; then
        . /etc/rc.subr
-       load_rc_config qmailqread
 fi
 
+# User-settable rc.conf variables and their default values
+# (shared with the qmailqread service):
 : ${qmailqread_tcphost:="127.0.0.1"}
 : ${qmailqread_tcpport:="20025"}
 
+if [ -f /etc/rc.subr ]; then
+       load_rc_config qmailqread
+fi
+
 exec @PREFIX@/bin/tcpclient -RHl0 -- ${qmailqread_tcphost} ${qmailqread_tcpport} @SH@ -c 'exec @CAT@ <&6'

Index: pkgsrc/mail/qmail-run/files/qmail.sh
diff -u pkgsrc/mail/qmail-run/files/qmail.sh:1.9 pkgsrc/mail/qmail-run/files/qmail.sh:1.10
--- pkgsrc/mail/qmail-run/files/qmail.sh:1.9    Sun Dec 30 19:09:05 2018
+++ pkgsrc/mail/qmail-run/files/qmail.sh        Mon Oct  5 12:17:20 2020
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmail.sh,v 1.9 2018/12/30 19:09:05 schmonz Exp $
+# $NetBSD: qmail.sh,v 1.10 2020/10/05 12:17:20 schmonz Exp $
 #
 # @PKGNAME@ master script for administrators to control qmail
 # services. Usage resembles the qmailctl script from "Life with qmail".
@@ -36,7 +36,9 @@ qmailrcd() {
        for service in "$@"; do
                if [ -f /etc/rc.subr ]; then
                        load_rc_config $service
-                       checkyesno $service && $rcd_dir/${service} $rc_arg
+                       if checkyesno $service; then
+                               $rcd_dir/${service} $rc_arg
+                       fi
                else
                        $rcd_dir/${service} $rc_arg
                fi