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 (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,110 +1,110 @@ @@ -1,110 +1,110 @@
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
18DEPENDS+= qmail-qfilter>1.5nb1:../../mail/qmail-qfilter 18DEPENDS+= qmail-qfilter>1.5nb1:../../mail/qmail-qfilter
19DEPENDS+= qmail-rejectutils>=20181230:../../mail/qmail-rejectutils 19DEPENDS+= qmail-rejectutils>=20181230:../../mail/qmail-rejectutils
20DEPENDS+= qmail-spp-spf-[0-9]*:../../mail/qmail-spp-spf 20DEPENDS+= qmail-spp-spf-[0-9]*:../../mail/qmail-spp-spf
21 21
22WRKSRC= ${WRKDIR} 22WRKSRC= ${WRKDIR}
23NO_BUILD= yes 23NO_BUILD= yes
24NO_CHECKSUM= yes 24NO_CHECKSUM= yes
25 25
26FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q} 26FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}
27FILES_SUBST+= QMAIL_LOG_USER=${QMAIL_LOG_USER:Q} 27FILES_SUBST+= QMAIL_LOG_USER=${QMAIL_LOG_USER:Q}
28FILES_SUBST+= QMAIL_SEND_USER=${QMAIL_SEND_USER:Q} 28FILES_SUBST+= QMAIL_SEND_USER=${QMAIL_SEND_USER:Q}
29FILES_SUBST+= PKGNAME=${PKGNAME:Q} 29FILES_SUBST+= PKGNAME=${PKGNAME:Q}
30FILES_SUBST+= UCSPI_SSL_USER=${UCSPI_SSL_USER:Q} 30FILES_SUBST+= UCSPI_SSL_USER=${UCSPI_SSL_USER:Q}
31FILES_SUBST+= UCSPI_SSL_GROUP=${UCSPI_SSL_GROUP:Q} 31FILES_SUBST+= UCSPI_SSL_GROUP=${UCSPI_SSL_GROUP:Q}
32MESSAGE_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q} 32MESSAGE_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q}
33RCD_SCRIPTS= qmail qmailofmipd qmailpop3d qmailqread qmailsend qmailsmtpd 33RCD_SCRIPTS= qmail qmailofmipd qmailpop3d qmailqread qmailsend qmailsmtpd
34 34
35PKG_SYSCONFSUBDIR= qmail 35PKG_SYSCONFSUBDIR= qmail
36 36
37EGDIR= share/examples/qmail-run 37EGDIR= share/examples/qmail-run
38.for f in defaultdelivery fixsmtpio signatures rcptchecks \ 38.for f in defaultdelivery fixsmtpio signatures rcptchecks \
39 ofmipfilters smtpfilters \ 39 ofmipfilters smtpfilters \
40 pop3capabilities smtpcapabilities smtpplugins \ 40 pop3capabilities smtpcapabilities smtpplugins \
41 concurrencyincoming concurrencypop3 concurrencysubmission 41 concurrencyincoming concurrencypop3 concurrencysubmission
42CONF_FILES+= ${PREFIX}/${EGDIR}/${f} \ 42CONF_FILES+= ${PREFIX}/${EGDIR}/${f} \
43 ${PKG_SYSCONFDIR}/control/${f} 43 ${PKG_SYSCONFDIR}/control/${f}
44.endfor 44.endfor
45TCPRULESDIR= ${PKG_SYSCONFDIR}/control/tcprules 45TCPRULESDIR= ${PKG_SYSCONFDIR}/control/tcprules
46OWN_DIRS+= ${TCPRULESDIR} 46OWN_DIRS+= ${TCPRULESDIR}
47.for f in ofmip pop3 smtp 47.for f in ofmip pop3 smtp
48CONF_FILES+= ${PREFIX}/${EGDIR}/tcprules-${f} \ 48CONF_FILES+= ${PREFIX}/${EGDIR}/tcprules-${f} \
49 ${TCPRULESDIR}/${f} 49 ${TCPRULESDIR}/${f}
50.endfor 50.endfor
51GREYLISTDIR= ${PKG_SYSCONFDIR}/control/greylist 51GREYLISTDIR= ${PKG_SYSCONFDIR}/control/greylist
52OWN_DIRS_PERMS+= ${GREYLISTDIR} ${QMAIL_DAEMON_USER} ${QMAIL_QMAIL_GROUP} 775 52OWN_DIRS_PERMS+= ${GREYLISTDIR} ${QMAIL_DAEMON_USER} ${QMAIL_QMAIL_GROUP} 775
53CONF_FILES_PERMS+= ${PREFIX}/${EGDIR}/greylist-database ${GREYLISTDIR}/database ${QMAIL_DAEMON_USER} ${QMAIL_QMAIL_GROUP} 664 53CONF_FILES_PERMS+= ${PREFIX}/${EGDIR}/greylist-database ${GREYLISTDIR}/database ${QMAIL_DAEMON_USER} ${QMAIL_QMAIL_GROUP} 664
54.for f in exemptrcpthosts exemptrcpts 54.for f in exemptrcpthosts exemptrcpts
55CONF_FILES+= ${PREFIX}/${EGDIR}/greylist-${f} \ 55CONF_FILES+= ${PREFIX}/${EGDIR}/greylist-${f} \
56 ${GREYLISTDIR}/${f} 56 ${GREYLISTDIR}/${f}
57.endfor 57.endfor
58 58
59INSTALLATION_DIRS= bin share/doc/qmail-run ${EGDIR} 59INSTALLATION_DIRS= bin share/doc/qmail-run ${EGDIR}
60BUILD_DEFS+= QMAIL_DAEMON_USER QMAIL_LOG_USER QMAIL_SEND_USER 60BUILD_DEFS+= QMAIL_DAEMON_USER QMAIL_LOG_USER QMAIL_SEND_USER
61BUILD_DEFS+= QMAIL_QMAIL_GROUP PKG_SYSCONFBASE 61BUILD_DEFS+= QMAIL_QMAIL_GROUP PKG_SYSCONFBASE
62BUILD_DEFS+= UCSPI_SSL_USER UCSPI_SSL_GROUP 62BUILD_DEFS+= UCSPI_SSL_USER UCSPI_SSL_GROUP
63 63
64SUBST_CLASSES+= paths 64SUBST_CLASSES+= paths
65SUBST_STAGE.paths= pre-configure 65SUBST_STAGE.paths= pre-configure
66SUBST_FILES.paths= mailer.conf README.pkgsrc 66SUBST_FILES.paths= mailer.conf README.pkgsrc
67SUBST_FILES.paths+= greylisting-spp-wrapper ofmipd-with-user-cdb 67SUBST_FILES.paths+= greylisting-spp-wrapper ofmipd-with-user-cdb
68SUBST_FILES.paths+= qmail-isspam-* qmail-procmail qmail-qread-client 68SUBST_FILES.paths+= qmail-isspam-* qmail-procmail qmail-qread-client
69SUBST_FILES.paths+= rcptchecks ofmipfilters smtpfilters smtpplugins tcprules-* 69SUBST_FILES.paths+= rcptchecks ofmipfilters smtpfilters smtpplugins tcprules-*
70SUBST_VARS.paths= PKGNAME PKG_SYSCONFDIR PREFIX RCD_SCRIPTS_DIR 70SUBST_VARS.paths= PKGNAME PKG_SYSCONFDIR PREFIX RCD_SCRIPTS_DIR
71SUBST_VARS.paths+= CAT ECHO GREP SED SH SORT TRUE 71SUBST_VARS.paths+= CAT ECHO GREP SED SH SORT TRUE
72 72
73post-extract: 73post-extract:
74 for f in README.pkgsrc mailer.conf \ 74 for f in README.pkgsrc mailer.conf \
75 defaultdelivery fixsmtpio signatures rcptchecks \ 75 defaultdelivery fixsmtpio signatures rcptchecks \
76 ofmipfilters smtpfilters \ 76 ofmipfilters smtpfilters \
77 pop3capabilities smtpcapabilities smtpplugins \ 77 pop3capabilities smtpcapabilities smtpplugins \
78 concurrencyincoming concurrencypop3 concurrencysubmission \ 78 concurrencyincoming concurrencypop3 concurrencysubmission \
79 tcprules-ofmip tcprules-pop3 tcprules-smtp; do \ 79 tcprules-ofmip tcprules-pop3 tcprules-smtp; do \
80 ${CP} ${FILESDIR}/$$f ${WRKDIR}/$$f; \ 80 ${CP} ${FILESDIR}/$$f ${WRKDIR}/$$f; \
81 done; \ 81 done; \
82 for f in greylisting-spp-wrapper ofmipd-with-user-cdb \ 82 for f in greylisting-spp-wrapper ofmipd-with-user-cdb \
83 qmail-isspam-rspamd qmail-isspam-spamassassin \ 83 qmail-isspam-rspamd qmail-isspam-spamassassin \
84 qmail-procmail qmail-qread-client; do \ 84 qmail-procmail qmail-qread-client; do \
85 ${CP} ${FILESDIR}/$$f.sh ${WRKDIR}/$$f; \ 85 ${CP} ${FILESDIR}/$$f.sh ${WRKDIR}/$$f; \
86 done 86 done
87 87
88do-install: 88do-install:
89 for f in greylisting-spp-wrapper ofmipd-with-user-cdb \ 89 for f in greylisting-spp-wrapper ofmipd-with-user-cdb \
90 qmail-isspam-rspamd qmail-isspam-spamassassin \ 90 qmail-isspam-rspamd qmail-isspam-spamassassin \
91 qmail-procmail qmail-qread-client; do \ 91 qmail-procmail qmail-qread-client; do \
92 ${INSTALL_SCRIPT} ${WRKDIR}/$$f ${DESTDIR}${PREFIX}/bin; \ 92 ${INSTALL_SCRIPT} ${WRKDIR}/$$f ${DESTDIR}${PREFIX}/bin; \
93 done 93 done
94 ${INSTALL_DATA} ${WRKDIR}/README.pkgsrc \ 94 ${INSTALL_DATA} ${WRKDIR}/README.pkgsrc \
95 ${DESTDIR}${PREFIX}/share/doc/qmail-run 95 ${DESTDIR}${PREFIX}/share/doc/qmail-run
96 for f in defaultdelivery fixsmtpio signatures rcptchecks \ 96 for f in defaultdelivery fixsmtpio signatures rcptchecks \
97 ofmipfilters smtpfilters \ 97 ofmipfilters smtpfilters \
98 pop3capabilities smtpcapabilities smtpplugins \ 98 pop3capabilities smtpcapabilities smtpplugins \
99 concurrencyincoming concurrencypop3 concurrencysubmission \ 99 concurrencyincoming concurrencypop3 concurrencysubmission \
100 tcprules-ofmip tcprules-pop3 tcprules-smtp; do \ 100 tcprules-ofmip tcprules-pop3 tcprules-smtp; do \
101 ${INSTALL_DATA} ${WRKDIR}/$${f} \ 101 ${INSTALL_DATA} ${WRKDIR}/$${f} \
102 ${DESTDIR}${PREFIX}/${EGDIR}; \ 102 ${DESTDIR}${PREFIX}/${EGDIR}; \
103 done; \ 103 done; \
104 for f in database exemptrcpthosts exemptrcpts; do \ 104 for f in database exemptrcpthosts exemptrcpts; do \
105 ${TOUCH} ${DESTDIR}${PREFIX}/${EGDIR}/greylist-$${f}; \ 105 ${TOUCH} ${DESTDIR}${PREFIX}/${EGDIR}/greylist-$${f}; \
106 done; \ 106 done; \
107 ${INSTALL_DATA} ${WRKDIR}/mailer.conf \ 107 ${INSTALL_DATA} ${WRKDIR}/mailer.conf \
108 ${DESTDIR}${PREFIX}/${EGDIR} 108 ${DESTDIR}${PREFIX}/${EGDIR}
109 109
110.include "../../mk/bsd.pkg.mk" 110.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/mail/qmail-run/files/qmail-qread-client.sh (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 (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,84 +1,86 @@ @@ -1,84 +1,86 @@
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
17# NOTE: run_rc_command sets $rc_arg 17# NOTE: run_rc_command sets $rc_arg
18# 18#
19forward_commands() { 19forward_commands() {
20 qmailrcd $COMMAND_LIST 20 qmailrcd $COMMAND_LIST
21} 21}
22 22
23reverse_commands() { 23reverse_commands() {
24 REVCOMMAND_LIST= 24 REVCOMMAND_LIST=
25 for file in $COMMAND_LIST; do 25 for file in $COMMAND_LIST; do
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
53 cdb -- rebuild the tcpserver cdb file for smtp, ofmip, and/or pop3 55 cdb -- rebuild the tcpserver cdb file for smtp, ofmip, and/or pop3
54restart -- stops and restarts smtp, sends qmail-send a TERM & restarts it 56restart -- stops and restarts smtp, sends qmail-send a TERM & restarts it
55doqueue -- schedules queued messages for immediate delivery 57doqueue -- schedules queued messages for immediate delivery
56 reload -- sends qmail-send HUP, rereading locals and virtualdomains 58 reload -- sends qmail-send HUP, rereading locals and virtualdomains
57 queue -- shows status of queue 59 queue -- shows status of queue
58 alrm -- same as doqueue 60 alrm -- same as doqueue
59 flush -- same as doqueue 61 flush -- same as doqueue
60 hup -- same as reload 62 hup -- same as reload
61HELP 63HELP
62} 64}
63 65
64COMMAND_LIST="qmailsend qmailqread qmailsmtpd qmailofmipd qmailpop3d" 66COMMAND_LIST="qmailsend qmailqread qmailsmtpd qmailofmipd qmailpop3d"
65 67
66name="qmail" 68name="qmail"
67start_cmd="forward_commands" 69start_cmd="forward_commands"
68stop_cmd="reverse_commands" 70stop_cmd="reverse_commands"
69doqueue_cmd="qmailrcd qmailsend"; alrm_cmd=${doqueue_cmd}; flush_cmd=${doqueue_cmd} 71doqueue_cmd="qmailrcd qmailsend"; alrm_cmd=${doqueue_cmd}; flush_cmd=${doqueue_cmd}
70reload_cmd="qmailrcd qmailsend"; hup_cmd=${reload_cmd} 72reload_cmd="qmailrcd qmailsend"; hup_cmd=${reload_cmd}
71status_cmd="forward_commands"; stat_cmd=${status_cmd} 73status_cmd="forward_commands"; stat_cmd=${status_cmd}
72pause_cmd="reverse_commands" 74pause_cmd="reverse_commands"
73cont_cmd="forward_commands" 75cont_cmd="forward_commands"
74cdb_cmd="qmailrcd qmailsmtpd qmailofmipd qmailpop3d" 76cdb_cmd="qmailrcd qmailsmtpd qmailofmipd qmailpop3d"
75queue_cmd="qmailrcd qmailsend" 77queue_cmd="qmailrcd qmailsend"
76help_cmd="qmail_help" 78help_cmd="qmail_help"
77extra_commands="pause cont stat status cdb doqueue reload queue alrm flush hup help" 79extra_commands="pause cont stat status cdb doqueue reload queue alrm flush hup help"
78 80
79if [ -f /etc/rc.subr ]; then 81if [ -f /etc/rc.subr ]; then
80 run_rc_command "$1" 82 run_rc_command "$1"
81else 83else
82 _arg="$1" 84 _arg="$1"
83 ${start_cmd} 85 ${start_cmd}
84fi 86fi