Mon Oct 5 12:17:20 2020 UTC ()
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.


(schmonz)
diff -r1.75 -r1.76 pkgsrc/mail/qmail-run/Makefile
diff -r1.5 -r1.6 pkgsrc/mail/qmail-run/files/qmail-qread-client.sh
diff -r1.9 -r1.10 pkgsrc/mail/qmail-run/files/qmail.sh
cvs diff -r1.75 -r1.76 pkgsrc/mail/qmail-run/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmail-run/Makefile 2020/05/19 19:45:58 1.75
+++ pkgsrc/mail/qmail-run/Makefile 2020/10/05 12:17:20 1.76
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.75 2020/05/19 19:45:58 schmonz Exp $ 1# $NetBSD: Makefile,v 1.76 2020/10/05 12:17:20 schmonz Exp $
2# 2#
3 3
4DISTNAME= qmail-run-20200519 4DISTNAME= qmail-run-20201005
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10COMMENT= Configures qmail to receive and deliver mail 10COMMENT= Configures qmail to receive and deliver mail
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13DEPENDS+= greetdelay-[0-9]*:../../mail/greetdelay 13DEPENDS+= greetdelay-[0-9]*:../../mail/greetdelay
14DEPENDS+= greylisting-spp-[0-9]*:../../mail/greylisting-spp 14DEPENDS+= greylisting-spp-[0-9]*:../../mail/greylisting-spp
15DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives 15DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
16DEPENDS+= qmail>=1.03nb42:../../mail/qmail 16DEPENDS+= qmail>=1.03nb42:../../mail/qmail
17DEPENDS+= qmail-acceptutils>=20181228:../../mail/qmail-acceptutils 17DEPENDS+= qmail-acceptutils>=20181228:../../mail/qmail-acceptutils
cvs diff -r1.5 -r1.6 pkgsrc/mail/qmail-run/files/qmail-qread-client.sh (expand / switch to unified diff)

--- pkgsrc/mail/qmail-run/files/qmail-qread-client.sh 2017/04/11 14:04:37 1.5
+++ pkgsrc/mail/qmail-run/files/qmail-qread-client.sh 2020/10/05 12:17:20 1.6
@@ -1,18 +1,23 @@ @@ -1,18 +1,23 @@
1#!@SH@ 1#!@SH@
2# 2#
3# $NetBSD: qmail-qread-client.sh,v 1.5 2017/04/11 14:04:37 schmonz Exp $ 3# $NetBSD: qmail-qread-client.sh,v 1.6 2020/10/05 12:17:20 schmonz Exp $
4# 4#
5# @PKGNAME@ client program to allow local non-root users to see 5# @PKGNAME@ client program to allow local non-root users to see
6# the queue. Requires that the corresponding server program be running. 6# the queue. Requires that the corresponding server program be running.
7# From Steinar Haug. 7# From Steinar Haug.
8# 8#
9 9
10if [ -f /etc/rc.subr ]; then 10if [ -f /etc/rc.subr ]; then
11 . /etc/rc.subr 11 . /etc/rc.subr
12 load_rc_config qmailqread 
13fi 12fi
14 13
 14# User-settable rc.conf variables and their default values
 15# (shared with the qmailqread service):
15: ${qmailqread_tcphost:="127.0.0.1"} 16: ${qmailqread_tcphost:="127.0.0.1"}
16: ${qmailqread_tcpport:="20025"} 17: ${qmailqread_tcpport:="20025"}
17 18
 19if [ -f /etc/rc.subr ]; then
 20 load_rc_config qmailqread
 21fi
 22
18exec @PREFIX@/bin/tcpclient -RHl0 -- ${qmailqread_tcphost} ${qmailqread_tcpport} @SH@ -c 'exec @CAT@ <&6' 23exec @PREFIX@/bin/tcpclient -RHl0 -- ${qmailqread_tcphost} ${qmailqread_tcpport} @SH@ -c 'exec @CAT@ <&6'
cvs diff -r1.9 -r1.10 pkgsrc/mail/qmail-run/files/qmail.sh (expand / switch to unified diff)

--- pkgsrc/mail/qmail-run/files/qmail.sh 2018/12/30 19:09:05 1.9
+++ pkgsrc/mail/qmail-run/files/qmail.sh 2020/10/05 12:17:20 1.10
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: qmail.sh,v 1.9 2018/12/30 19:09:05 schmonz Exp $ 3# $NetBSD: qmail.sh,v 1.10 2020/10/05 12:17:20 schmonz Exp $
4# 4#
5# @PKGNAME@ master script for administrators to control qmail 5# @PKGNAME@ master script for administrators to control qmail
6# services. Usage resembles the qmailctl script from "Life with qmail". 6# services. Usage resembles the qmailctl script from "Life with qmail".
7# 7#
8 8
9# KEYWORD: nostart 9# KEYWORD: nostart
10 10
11if [ -f /etc/rc.subr ]; then 11if [ -f /etc/rc.subr ]; then
12 . /etc/rc.subr 12 . /etc/rc.subr
13fi 13fi
14 14
15rcd_dir=`@DIRNAME@ $0` 15rcd_dir=`@DIRNAME@ $0`
16 16
@@ -26,27 +26,29 @@ reverse_commands() { @@ -26,27 +26,29 @@ reverse_commands() {
26 REVCOMMAND_LIST="$file $REVCOMMAND_LIST" 26 REVCOMMAND_LIST="$file $REVCOMMAND_LIST"
27 done 27 done
28 28
29 qmailrcd $REVCOMMAND_LIST 29 qmailrcd $REVCOMMAND_LIST
30} 30}
31 31
32qmailrcd() { 32qmailrcd() {
33 # Backward compat with NetBSD <1.6: 33 # Backward compat with NetBSD <1.6:
34 [ -z "$rc_arg" ] && rc_arg=$_arg 34 [ -z "$rc_arg" ] && rc_arg=$_arg
35 35
36 for service in "$@"; do 36 for service in "$@"; do
37 if [ -f /etc/rc.subr ]; then 37 if [ -f /etc/rc.subr ]; then
38 load_rc_config $service 38 load_rc_config $service
39 checkyesno $service && $rcd_dir/${service} $rc_arg 39 if checkyesno $service; then
 40 $rcd_dir/${service} $rc_arg
 41 fi
40 else 42 else
41 $rcd_dir/${service} $rc_arg 43 $rcd_dir/${service} $rc_arg
42 fi 44 fi
43 done 45 done
44} 46}
45 47
46qmail_help() { 48qmail_help() {
47 @CAT@ <<HELP 49 @CAT@ <<HELP
48 stop -- stops mail service (smtp connections refused, nothing goes out) 50 stop -- stops mail service (smtp connections refused, nothing goes out)
49 start -- starts mail service (smtp connection accepted, mail can go out) 51 start -- starts mail service (smtp connection accepted, mail can go out)
50 pause -- temporarily stops mail service (connections accepted, nothing leaves) 52 pause -- temporarily stops mail service (connections accepted, nothing leaves)
51 cont -- continues paused mail service 53 cont -- continues paused mail service
52 stat -- displays status of mail service 54 stat -- displays status of mail service