 @@ -1,124 +1,124 @@
-# $NetBSD: Makefile,v 1.65 2018/12/14 06:49:30 schmonz Exp $
+# $NetBSD: Makefile,v 1.66 2018/12/15 06:31:34 schmonz Exp $
+#
-DISTNAME=		qmail-run-20181214
+DISTNAME=		qmail-run-20181215
 CATEGORIES=		mail
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 MAINTAINER=		schmonz@NetBSD.org
 COMMENT=		Configures qmail to receive and deliver mail
 LICENSE=		2-clause-bsd
 DEPENDS+=		greetdelay-[0-9]*:../../mail/greetdelay
 DEPENDS+=		greylisting-spp-[0-9]*:../../mail/greylisting-spp
 DEPENDS+=		pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
 DEPENDS_QMAIL=		qmail>=1.03nb42:../../mail/qmail
 DEPENDS+=		${DEPENDS_QMAIL}
 DEPENDS+=		qmail-acceptutils>=20181128:../../mail/qmail-acceptutils
 DEPENDS+=		qmail-qfilter>1.5nb1:../../mail/qmail-qfilter
 DEPENDS+=		qmail-rejectutils>=20181128:../../mail/qmail-rejectutils
 DEPENDS+=		qmail-spp-spf-[0-9]*:../../mail/qmail-spp-spf
 WRKSRC=			${WRKDIR}
 NO_BUILD=		yes
 NO_CHECKSUM=		yes
 FILES_SUBST+=		QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}
 FILES_SUBST+=		QMAIL_LOG_USER=${QMAIL_LOG_USER:Q}
 FILES_SUBST+=		QMAIL_SEND_USER=${QMAIL_SEND_USER:Q}
 FILES_SUBST+=		PKGNAME=${PKGNAME:Q}
 FILES_SUBST+=		UCSPI_SSL_USER=${UCSPI_SSL_USER:Q}
 FILES_SUBST+=		UCSPI_SSL_GROUP=${UCSPI_SSL_GROUP:Q}
 MESSAGE_SUBST+=		PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q}
 RCD_SCRIPTS=		qmail qmailofmipd qmailpop3d qmailqread qmailsend qmailsmtpd
 EGDIR=			share/examples/qmail-run
 .for f in defaultdelivery fixsmtpio signatures rcptchecks \
 	ofmipfilters smtpfilters \
 	pop3capabilities smtpcapabilities smtpplugins \
 	concurrencyincoming concurrencypop3 concurrencysubmission
 CONF_FILES+=		${PREFIX}/${EGDIR}/${f} \
 			${PKG_SYSCONFDIR}/control/${f}
 .endfor
 TCPRULESDIR=		${PKG_SYSCONFDIR}/control/tcprules
 OWN_DIRS+=		${TCPRULESDIR}
 .for f in ofmip pop3 smtp
 CONF_FILES+=		${PREFIX}/${EGDIR}/tcprules-${f} \
 			${TCPRULESDIR}/${f}
 .endfor
 GREYLISTDIR=		${PKG_SYSCONFDIR}/control/greylist
 OWN_DIRS_PERMS+=	${GREYLISTDIR} ${QMAIL_DAEMON_USER} ${QMAIL_QMAIL_GROUP} 775
 CONF_FILES_PERMS+=	${PREFIX}/${EGDIR}/greylist-database ${GREYLISTDIR}/database ${QMAIL_DAEMON_USER} ${QMAIL_QMAIL_GROUP} 664
 .for f in exemptrcpthosts exemptrcpts
 CONF_FILES+=		${PREFIX}/${EGDIR}/greylist-${f} \
 			${GREYLISTDIR}/${f}
 .endfor
 INSTALLATION_DIRS=	bin share/doc/qmail-run ${EGDIR}
 BUILD_DEFS+=		QMAIL_DAEMON_USER QMAIL_LOG_USER QMAIL_SEND_USER
 BUILD_DEFS+=		QMAIL_QMAIL_GROUP PKG_SYSCONFBASE
 BUILD_DEFS+=		UCSPI_SSL_USER UCSPI_SSL_GROUP
 .include "../../mk/bsd.prefs.mk"
 # Detect the PKG_SYSCONFDIR of the installed qmail, so we can create
 # config files there and refer to them from rc.d scripts.
+#
 .if !defined(PKG_SYSCONFDIR.qmail-run)
 PKG_SYSCONFDIR.qmail-run!=						\
 	${PKG_INFO} -Q PKG_SYSCONFDIR					\
 		${DEPENDS_QMAIL:C/:.*$//:Q} 2>/dev/null ||		\
 	${ECHO} "PKG_SYSCONFDIR.qmail-run_not_set"
 .  if empty(PKG_SYSCONFDIR.qmail-run:M*not_set)
 MAKEVARS+=	PKG_SYSCONFDIR.qmail-run
 .  endif
 .endif
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	mailer.conf
 SUBST_FILES.paths+=	greylisting-spp-wrapper ofmipd-with-user-cdb
 SUBST_FILES.paths+=	qmail-isspam-* qmail-procmail qmail-qread-client
 SUBST_FILES.paths+=	rcptchecks ofmipfilters smtpfilters smtpplugins tcprules-*
 SUBST_VARS.paths=	PKGNAME PKG_SYSCONFDIR PREFIX
 SUBST_VARS.paths+=	CAT ECHO GREP SED SH SORT TRUE
 post-extract:
 	for f in README.pkgsrc mailer.conf \
 		defaultdelivery fixsmtpio signatures rcptchecks \
 		ofmipfilters smtpfilters \
 		pop3capabilities smtpcapabilities smtpplugins \
 		concurrencyincoming concurrencypop3 concurrencysubmission \
 		tcprules-ofmip tcprules-pop3 tcprules-smtp; do \
 		${CP} ${FILESDIR}/$$f ${WRKDIR}/$$f; \
 	done; \
 	for f in greylisting-spp-wrapper ofmipd-with-user-cdb \
 		qmail-isspam-rspamd qmail-isspam-spamassassin \
 		qmail-procmail qmail-qread-client; do \
 		${CP} ${FILESDIR}/$$f.sh ${WRKDIR}/$$f; \
 	done
 do-install:
 	for f in greylisting-spp-wrapper ofmipd-with-user-cdb \
 		qmail-isspam-rspamd qmail-isspam-spamassassin \
 		qmail-procmail qmail-qread-client; do \
 		${INSTALL_SCRIPT} ${WRKDIR}/$$f ${DESTDIR}${PREFIX}/bin; \
 	done
 	${INSTALL_DATA} ${WRKDIR}/README.pkgsrc \
 		${DESTDIR}${PREFIX}/share/doc/qmail-run
 	for f in defaultdelivery fixsmtpio signatures rcptchecks \
 		ofmipfilters smtpfilters \
 		pop3capabilities smtpcapabilities smtpplugins \
 		concurrencyincoming concurrencypop3 concurrencysubmission \
 		tcprules-ofmip tcprules-pop3 tcprules-smtp; do \
 		${INSTALL_DATA} ${WRKDIR}/$${f} \
 			${DESTDIR}${PREFIX}/${EGDIR}; \
 	done; \
 	for f in database exemptrcpthosts exemptrcpts; do \
 		${TOUCH} ${DESTDIR}${PREFIX}/${EGDIR}/greylist-$${f}; \
 	done; \
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf \
 		${DESTDIR}${PREFIX}/${EGDIR}
 .include "../../mk/bsd.pkg.mk"

 @@ -1,101 +1,101 @@
  Getting started
  ===============
 Assuming NetBSD-style mailwrapper(8) and rc(8), to enable qmail for...
 Local and outbound delivery:
 - Run "/etc/rc.d/postfix stop" and set postfix=NO in /etc/rc.conf.
 - Replace /etc/mailer.conf with ${PREFIX}/share/examples/qmail-run/mailer.conf.
 - Check configuration in ${PKG_SYSCONFDIR} (especially alias/.qmail-*).
 - Set qmailsend=YES and qmailqread=YES in /etc/rc.conf.
 - Run "/etc/rc.d/qmail start".
 Incoming SMTP on port 25:
 - Set qmailsmtpd=YES in /etc/rc.conf.
 - Add any qmail-rcptcheck programs to control/rcptchecks.
 - Add any qmail-qfilter programs to control/smtpfilters.
 - Add any qmail-spp programs (such as greylisting) to control/smtpplugins.
 - Run "/etc/rc.d/qmailsmtpd start".
 Greylisting:
 - Add any exempt recipient addresses to control/greylist/exemptrcpts.
 - Add any exempt recipient domains to control/greylist/exemptrcpthosts.
 - Tuples are (IP,sender,recipient). To effectively omit IP, add
   GL_WRAPPER_TCPREMOTEIP="127.127.127.127" to control/tcprules/smtp,
   then run "/etc/rc.d/qmailsmtpd cdb".
 - Uncomment "greylisting-spp-wrapper" in control/smtpplugins.
 Authenticated message submission on port 587:
 - Set qmailofmipd=YES in /etc/rc.conf.
 - Add any qmail-qfilter programs to control/ofmipfilters.
 - Run "/etc/rc.d/qmailofmipd start".
 POP3 (for Maildirs only) on port 110:
 - Set qmailpop3d=YES in /etc/rc.conf.
 - Run "/etc/rc.d/qmailpop3d start".
 TLS encryption for SMTP, submission, POP3, and remote delivery:
-- Create cert and DH params (as instructed by the qmail package).
+- Create cert and DH params (follow steps in `pkg_info -qD qmail`).
 - Run "/etc/rc.d/qmail restart".
 Sender Policy Framework:
-- Configure Sender Rewriting Scheme (as instructed by the qmail package)
+- Configure Sender Rewriting Scheme (see ${PREFIX}/share/doc/qmail/README.srs)
   so your auto-forwarded messages will reach servers that choose to
   enforce the forwarded domains' SPF policies.
 - Publish a DNS TXT record with your desired policy.
 - Incoming messages that explicit-fail published policy are nonetheless
   accepted. To reject -- including rejecting auto-forwarded messages
   from servers that haven't configured SRS -- add
   SPP_SPF_RESULT_FAIL="E550 spf_smtp_msg" to control/tcprules/smtp,
   then run "/etc/rc.d/qmailsmtpd cdb".
 - Messages that explicit-pass are not greylisted. To remove the
   exemption, remove SPP_SPF_RESULT_PASS="SGL_WHITELISTED=1" from
   control/tcprules/smtp, then run "/etc/rc.d/qmailsmtpd cdb".
  Getting help
  ============
 You've installed an automated and customized qmail-run package. If
 you're having trouble getting the qmail daemons to run, ask the
 package's maintainer:
 <URL:mailto:schmonz-pkgsrc-qmail@schmonz.com>
 Many members of the qmail mailing list recommend following the
 install instructions in Dave Sill's "Life with qmail" document:
 <URL:http://www.lifewithqmail.org/lwq.html>
 A "Life with qmail" installation is done by hand, so any qmail
 package necessarily deviates from LWQ in at least this respect.
 Therefore, if you need to ask for help on the qmail list, please
 mention that you're using the qmail-run package from pkgsrc.
 If you can first reproduce your problem on a manual LWQ-style
 installation, your request for help is likely to be better received.
 It is highly recommended that you read Charles Cazabon's "12 Steps
 to qmail List Bliss" before posting to the list:
 <URL:http://pyropus.ca/personal/writings/12-steps-to-qmail-list-bliss.html>
  Deviations from LWQ
  ===================
 LWQ suggests doing some things that the qmail-run package doesn't do:
 * Copying a script from /var/qmail/boot to /var/qmail/rc.
 * Configuring svscan(8) to run at boot.
 * Creating and/or populating /service.
 * Using supervise(8) and multilog(8).
 * Using the qmailctl script to control qmail.
 * Using the inst_check script to verify the installation.
 * Storing tcp.smtp{,cdb} in /etc.
 * Renaming the system sendmail(8) and marking it non-executable.
 Instead, the qmail-run package:
 * Provides NetBSD-style rc.d scripts, including one very similar to qmailctl.
 * Sends log messages to syslog(3) by default.
 * Stores tcprules in ${PKG_SYSCONFDIR}/control/tcprules.
 * Uses mailwrapper(8) and mailer.conf(5).

 @@ -1,149 +1,149 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: qmailofmipd.sh,v 1.21 2018/12/14 06:55:07 schmonz Exp $
+# $NetBSD: qmailofmipd.sh,v 1.22 2018/12/15 06:31:34 schmonz Exp $
+#
 # @PKGNAME@ script to control ofmipd (SMTP submission service).
+#
 # PROVIDE: qmailofmipd mail
 # REQUIRE: qmailsend
 name="qmailofmipd"
 # User-settable rc.conf variables and their default values:
 : ${qmailofmipd_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@)"}
 : ${qmailofmipd_datalimit:="360000000"}
 : ${qmailofmipd_pretcpserver:=""}
 : ${qmailofmipd_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailofmipd_tcpflags:="-ne -vRl0"}
 : ${qmailofmipd_tcphost:="0.0.0.0"}
 : ${qmailofmipd_tcpport:="587"}
 : ${qmailofmipd_tcprules:="@PKG_SYSCONFDIR@/control/tcprules/ofmip"}
 : ${qmailofmipd_autocdb:="YES"}
 : ${qmailofmipd_precheckpassword:="@PREFIX@/bin/reup -t 5 @PREFIX@/bin/authup smtp"}
 : ${qmailofmipd_checkpassword:="@PREFIX@/bin/nbcheckpassword"}
 : ${qmailofmipd_preofmipd:="@PREFIX@/bin/checknotroot @PREFIX@/bin/fixsmtpio"}
 : ${qmailofmipd_ofmipdcmd:="@PREFIX@/bin/ofmipd-with-user-cdb"}
 : ${qmailofmipd_postofmipd:=""}
 : ${qmailofmipd_log:="YES"}
 : ${qmailofmipd_logcmd:="logger -t nbqmail/ofmipd -p mail.info"}
 : ${qmailofmipd_nologcmd:="@PREFIX@/bin/multilog -*"}
 : ${qmailofmipd_tls:="auto"}
 : ${qmailofmipd_tls_dhparams:="@PKG_SYSCONFDIR@/control/dh2048.pem"}
 : ${qmailofmipd_tls_cert:="@PKG_SYSCONFDIR@/control/servercert.pem"}
 : ${qmailofmipd_tls_key:=""}
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/control/me"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/concurrencysubmission"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/smtpcapabilities"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/fixsmtpio"
-required_files="${required_files} ${qmailofmipd_tcprules}.cdb"
+required_files="${required_files} ${qmailofmipd_tcprules}"
 command="${qmailofmipd_tcpserver}"
 procname=nb${name}
 start_precmd="qmailofmipd_precmd"
 extra_commands="stat pause cont cdb reload"
 stat_cmd="qmailofmipd_stat"
 pause_cmd="qmailofmipd_pause"
 cont_cmd="qmailofmipd_cont"
 cdb_cmd="qmailofmipd_cdb"
 reload_cmd=${cdb_cmd}
 qmailofmipd_configure_tls() {
 	if [ "auto" = "${qmailofmipd_tls}" ]; then
 		if [ -f "${qmailofmipd_tls_dhparams}" ] && [ -f "${qmailofmipd_tls_cert}" ]; then
 			qmailofmipd_enable_tls
 		else
 			qmailofmipd_disable_tls
 		fi
 	elif [ -f /etc/rc.subr ] && checkyesno qmailofmipd_tls; then
 		qmailofmipd_enable_tls
 	else
 		qmailofmipd_disable_tls
 	fi
+}
 qmailofmipd_disable_tls() {
 	qmailofmipd_postenv="${qmailofmipd_postenv} DISABLETLS=1"
+}
 qmailofmipd_enable_tls() {
 	qmailofmipd_postenv="${qmailofmipd_postenv} DHFILE=${qmailofmipd_tls_dhparams}"
 	qmailofmipd_postenv="${qmailofmipd_postenv} CERTFILE=${qmailofmipd_tls_cert}"
 	if [ -f "${qmailofmipd_tls_key}" ]; then
 		qmailofmipd_postenv="${qmailofmipd_postenv} KEYFILE=${qmailofmipd_tls_key}"
 	fi
+}
 qmailofmipd_precmd() {
 	if [ -f /etc/rc.subr ] && ! checkyesno qmailofmipd_log; then
 		qmailofmipd_logcmd=${qmailofmipd_nologcmd}
 	fi
 	qmailofmipd_configure_tls
 	if [ -f /etc/rc.subr ] && checkyesno qmailofmipd_autocdb; then
 		qmailofmipd_needcdb && qmailofmipd_cdb
 	fi
 	# tcpserver(1) is akin to inetd(8), but runs one service per process.
 	# We want to signal only the tcpserver process responsible for this
 	# service. Use argv0(1) to set procname to "nbqmailofmipd".
 	command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailofmipd_postenv}
 @PREFIX@/bin/softlimit -m ${qmailofmipd_datalimit} ${qmailofmipd_pretcpserver}
 @PREFIX@/bin/argv0 ${qmailofmipd_tcpserver} ${procname}
 ${qmailofmipd_tcpflags} -x ${qmailofmipd_tcprules}.cdb
 -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencysubmission`
 ${qmailofmipd_tcphost} ${qmailofmipd_tcpport}
 ${qmailofmipd_precheckpassword} ${qmailofmipd_checkpassword}
 ${qmailofmipd_preofmipd} ${qmailofmipd_ofmipdcmd} ${qmailofmipd_postofmipd}
 >&1 |
 @PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailofmipd_logcmd}"
 	command_args="&"
 	rc_flags=""
+}
 qmailofmipd_stat() {
 	run_rc_command status
+}
 qmailofmipd_pause() {
 	if ! statusmsg=`run_rc_command status`; then
 		@ECHO@ $statusmsg
 		return 1
 	fi
 	@ECHO@ "Pausing ${name}."
 	kill -STOP $rc_pid
+}
 qmailofmipd_cont() {
 	if ! statusmsg=`run_rc_command status`; then
 		@ECHO@ $statusmsg
 		return 1
 	fi
 	@ECHO@ "Continuing ${name}."
 	kill -CONT $rc_pid
+}
 qmailofmipd_needcdb() {
 	_src=${qmailofmipd_tcprules}
 	_dst=${qmailofmipd_tcprules}.cdb
 	[ -f "${_src}" -a "${_src}" -nt "${_dst}" ] || [ ! -f "${_dst}" ]
+}
 qmailofmipd_cdb() {
 	@ECHO@ "Reloading ${qmailofmipd_tcprules}"
 	@PREFIX@/bin/tcprules ${qmailofmipd_tcprules}.cdb ${qmailofmipd_tcprules}.tmp < ${qmailofmipd_tcprules}
 	@CHMOD@ 644 ${qmailofmipd_tcprules}.cdb
+}
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
 	@ECHO_N@ " ${name}"
 	qmailofmipd_precmd
 	eval ${command} ${qmailofmipd_flags} ${command_args}
 fi

 @@ -1,146 +1,146 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: qmailpop3d.sh,v 1.29 2018/12/14 06:55:07 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.30 2018/12/15 06:31:34 schmonz Exp $
+#
 # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
+#
 # PROVIDE: qmailpop3d mail
 name="qmailpop3d"
 # User-settable rc.conf variables and their default values:
 : ${qmailpop3d_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@)"}
 : ${qmailpop3d_datalimit:="180000000"}
 : ${qmailpop3d_pretcpserver:=""}
 : ${qmailpop3d_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailpop3d_tcpflags:="-ne -vRl0"}
 : ${qmailpop3d_tcphost:="0.0.0.0"}
 : ${qmailpop3d_tcpport:="110"}
 : ${qmailpop3d_tcprules:="@PKG_SYSCONFDIR@/control/tcprules/pop3"}
 : ${qmailpop3d_autocdb:="YES"}
 : ${qmailpop3d_precheckpassword:="@PREFIX@/bin/authup pop3"}
 : ${qmailpop3d_checkpassword:="@PREFIX@/bin/nbcheckpassword"}
 : ${qmailpop3d_prepop3d:="@PREFIX@/bin/checknotroot"}
 : ${qmailpop3d_pop3dcmd:="@PREFIX@/bin/qmail-pop3d"}
 : ${qmailpop3d_postpop3d:="Maildir"}
 : ${qmailpop3d_log:="YES"}
 : ${qmailpop3d_logcmd:="logger -t nbqmail/pop3d -p mail.info"}
 : ${qmailpop3d_nologcmd:="@PREFIX@/bin/multilog -*"}
 : ${qmailpop3d_tls:="auto"}
 : ${qmailpop3d_tls_dhparams:="@PKG_SYSCONFDIR@/control/dh2048.pem"}
 : ${qmailpop3d_tls_cert:="@PKG_SYSCONFDIR@/control/servercert.pem"}
 : ${qmailpop3d_tls_key:=""}
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/control/me"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/concurrencypop3"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/pop3capabilities"
-required_files="${required_files} ${qmailpop3d_tcprules}.cdb"
+required_files="${required_files} ${qmailpop3d_tcprules}"
 command="${qmailpop3d_tcpserver}"
 procname=nb${name}
 start_precmd="qmailpop3d_precmd"
 extra_commands="stat pause cont cdb reload"
 stat_cmd="qmailpop3d_stat"
 pause_cmd="qmailpop3d_pause"
 cont_cmd="qmailpop3d_cont"
 cdb_cmd="qmailpop3d_cdb"
 reload_cmd=${cdb_cmd}
 qmailpop3d_configure_tls() {
 	if [ "auto" = "${qmailpop3d_tls}" ]; then
 		if [ -f "${qmailpop3d_tls_dhparams}" ] && [ -f "${qmailpop3d_tls_cert}" ]; then
 			qmailpop3d_enable_tls
 		else
 			qmailpop3d_disable_tls
 		fi
 	elif [ -f /etc/rc.subr ] && checkyesno qmailpop3d_tls; then
 		qmailpop3d_enable_tls
 	else
 		qmailpop3d_disable_tls
 	fi
+}
 qmailpop3d_disable_tls() {
 	qmailpop3d_postenv="${qmailpop3d_postenv} DISABLETLS=1"
+}
 qmailpop3d_enable_tls() {
 	qmailpop3d_postenv="${qmailpop3d_postenv} DHFILE=${qmailpop3d_tls_dhparams}"
 	qmailpop3d_postenv="${qmailpop3d_postenv} CERTFILE=${qmailpop3d_tls_cert}"
 	if [ -f "${qmailpop3d_tls_key}" ]; then
 		qmailpop3d_postenv="${qmailpop3d_postenv} KEYFILE=${qmailpop3d_tls_key}"
 	fi
+}
 qmailpop3d_precmd() {
 	if [ -f /etc/rc.subr ] && ! checkyesno qmailpop3d_log; then
 		qmailpop3d_logcmd=${qmailpop3d_nologcmd}
 	fi
 	qmailpop3d_configure_tls
 	if [ -f /etc/rc.subr ] && checkyesno qmailpop3d_autocdb; then
 		qmailpop3d_needcdb && qmailpop3d_cdb
 	fi
 	# tcpserver(1) is akin to inetd(8), but runs one service per process.
 	# We want to signal only the tcpserver process responsible for this
 	# service. Use argv0(1) to set procname to "nbqmailpop3d".
 	command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailpop3d_postenv}
 @PREFIX@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver}
 @PREFIX@/bin/argv0 ${qmailpop3d_tcpserver} ${procname}
 ${qmailpop3d_tcpflags} -x ${qmailpop3d_tcprules}.cdb
 -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3`
 ${qmailpop3d_tcphost} ${qmailpop3d_tcpport}
 ${qmailpop3d_precheckpassword} ${qmailpop3d_checkpassword}
 ${qmailpop3d_prepop3d} ${qmailpop3d_pop3dcmd} ${qmailpop3d_postpop3d}
 >&1 |
 @PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailpop3d_logcmd}"
 	command_args="&"
 	rc_flags=""
+}
 qmailpop3d_stat() {
 	run_rc_command status
+}
 qmailpop3d_pause() {
 	if ! statusmsg=`run_rc_command status`; then
 		@ECHO@ $statusmsg
 		return 1
 	fi
 	@ECHO@ "Pausing ${name}."
 	kill -STOP $rc_pid
+}
 qmailpop3d_cont() {
 	if ! statusmsg=`run_rc_command status`; then
 		@ECHO@ $statusmsg
 		return 1
 	fi
 	@ECHO@ "Continuing ${name}."
 	kill -CONT $rc_pid
+}
 qmailpop3d_needcdb() {
 	_src=${qmailpop3d_tcprules}
 	_dst=${qmailpop3d_tcprules}.cdb
 	[ -f "${_src}" -a "${_src}" -nt "${_dst}" ] || [ ! -f "${_dst}" ]
+}
 qmailpop3d_cdb() {
 	@ECHO@ "Reloading ${qmailpop3d_tcprules}."
 	@PREFIX@/bin/tcprules ${qmailpop3d_tcprules}.cdb ${qmailpop3d_tcprules}.tmp < ${qmailpop3d_tcprules}
 	@CHMOD@ 644 ${qmailpop3d_tcprules}.cdb
+}
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
 	@ECHO_N@ " ${name}"
 	qmailpop3d_precmd
 	eval ${command} ${qmailpop3d_flags} ${command_args}
 fi

 @@ -1,145 +1,145 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: qmailsmtpd.sh,v 1.26 2018/12/14 06:55:07 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.27 2018/12/15 06:31:34 schmonz Exp $
+#
 # @PKGNAME@ script to control qmail-smtpd (SMTP service).
+#
 # PROVIDE: qmailsmtpd mail
 # REQUIRE: qmailsend
 name="qmailsmtpd"
 # User-settable rc.conf variables and their default values:
 : ${qmailsmtpd_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@)"}
 : ${qmailsmtpd_datalimit:="540000000"}
 : ${qmailsmtpd_pretcpserver:=""}
 : ${qmailsmtpd_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailsmtpd_tcpflags:="-ne -vRl0"}
 : ${qmailsmtpd_tcphost:="0.0.0.0"}
 : ${qmailsmtpd_tcpport:="25"}
 : ${qmailsmtpd_tcprules:="@PKG_SYSCONFDIR@/control/tcprules/smtp"}
 : ${qmailsmtpd_autocdb:="YES"}
 : ${qmailsmtpd_presmtpd:="@PREFIX@/bin/greetdelay @PREFIX@/bin/rblsmtpd -r zen.spamhaus.org @PREFIX@/bin/fixsmtpio"}
 : ${qmailsmtpd_smtpdcmd:="@PREFIX@/bin/qmail-smtpd"}
 : ${qmailsmtpd_postsmtpd:=""}
 : ${qmailsmtpd_log:="YES"}
 : ${qmailsmtpd_logcmd:="logger -t nbqmail/smtpd -p mail.info"}
 : ${qmailsmtpd_nologcmd:="@PREFIX@/bin/multilog -*"}
 : ${qmailsmtpd_tls:="auto"}
 : ${qmailsmtpd_tls_dhparams:="@PKG_SYSCONFDIR@/control/dh2048.pem"}
 : ${qmailsmtpd_tls_cert:="@PKG_SYSCONFDIR@/control/servercert.pem"}
 : ${qmailsmtpd_tls_key:=""}
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/control/me"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/concurrencyincoming"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts"
-required_files="${required_files} ${qmailsmtpd_tcprules}.cdb"
+required_files="${required_files} ${qmailsmtpd_tcprules}"
 command="${qmailsmtpd_tcpserver}"
 procname=nb${name}
 start_precmd="qmailsmtpd_precmd"
 extra_commands="stat pause cont cdb reload"
 stat_cmd="qmailsmtpd_stat"
 pause_cmd="qmailsmtpd_pause"
 cont_cmd="qmailsmtpd_cont"
 cdb_cmd="qmailsmtpd_cdb"
 reload_cmd=${cdb_cmd}
 qmailsmtpd_configure_tls() {
 	if [ "auto" = "${qmailsmtpd_tls}" ]; then
 		if [ -f "${qmailsmtpd_tls_dhparams}" ] && [ -f "${qmailsmtpd_tls_cert}" ]; then
 			qmailsmtpd_enable_tls
 		else
 			qmailsmtpd_disable_tls
 		fi
 	elif [ -f /etc/rc.subr ] && checkyesno qmailsmtpd_tls; then
 		qmailsmtpd_enable_tls
 	else
 		qmailsmtpd_disable_tls
 	fi
+}
 qmailsmtpd_disable_tls() {
 	qmailsmtpd_postenv="${qmailsmtpd_postenv} DISABLETLS=1"
+}
 qmailsmtpd_enable_tls() {
 	qmailsmtpd_postenv="${qmailsmtpd_postenv} DHFILE=${qmailsmtpd_tls_dhparams}"
 	qmailsmtpd_postenv="${qmailsmtpd_postenv} CERTFILE=${qmailsmtpd_tls_cert}"
 	if [ -f "${qmailsmtpd_tls_key}" ]; then
 		qmailsmtpd_postenv="${qmailsmtpd_postenv} KEYFILE=${qmailsmtpd_tls_key}"
 	fi
+}
 qmailsmtpd_precmd() {
 	if [ -f /etc/rc.subr ] && ! checkyesno qmailsmtpd_log; then
 		qmailsmtpd_logcmd=${qmailsmtpd_nologcmd}
 	fi
 	qmailsmtpd_configure_tls
 	if [ -f /etc/rc.subr ] && checkyesno qmailsmtpd_autocdb; then
 		qmailsmtpd_needcdb && qmailsmtpd_cdb
 	fi
 	# tcpserver(1) is akin to inetd(8), but runs one service per process.
 	# We want to signal only the tcpserver process responsible for this
 	# service. Use argv0(1) to set procname to "nbqmailsmtpd".
 	command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailsmtpd_postenv}
 @PREFIX@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver}
 @PREFIX@/bin/argv0 ${qmailsmtpd_tcpserver} ${procname}
 ${qmailsmtpd_tcpflags} -x ${qmailsmtpd_tcprules}.cdb
 -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyincoming`
 -u `@ID@ -u @QMAIL_DAEMON_USER@` -g `@ID@ -g @QMAIL_DAEMON_USER@`
 ${qmailsmtpd_tcphost} ${qmailsmtpd_tcpport}
 ${qmailsmtpd_presmtpd} ${qmailsmtpd_smtpdcmd} ${qmailsmtpd_postsmtpd}
 >&1 |
 @PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailsmtpd_logcmd}"
 	command_args="&"
 	rc_flags=""
+}
 qmailsmtpd_stat() {
 	run_rc_command status
+}
 qmailsmtpd_pause() {
 	if ! statusmsg=`run_rc_command status`; then
 		@ECHO@ $statusmsg
 		return 1
 	fi
 	@ECHO@ "Pausing ${name}."
 	kill -STOP $rc_pid
+}
 qmailsmtpd_cont() {
 	if ! statusmsg=`run_rc_command status`; then
 		@ECHO@ $statusmsg
 		return 1
 	fi
 	@ECHO@ "Continuing ${name}."
 	kill -CONT $rc_pid
+}
 qmailsmtpd_needcdb() {
 	_src=${qmailsmtpd_tcprules}
 	_dst=${qmailsmtpd_tcprules}.cdb
 	[ -f "${_src}" -a "${_src}" -nt "${_dst}" ] || [ ! -f "${_dst}" ]
+}
 qmailsmtpd_cdb() {
 	@ECHO@ "Reloading ${qmailsmtpd_tcprules}."
 	@PREFIX@/bin/tcprules ${qmailsmtpd_tcprules}.cdb ${qmailsmtpd_tcprules}.tmp < ${qmailsmtpd_tcprules}
 	@CHMOD@ 644 ${qmailsmtpd_tcprules}.cdb
+}
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
 	@ECHO_N@ " ${name}"
 	qmailsmtpd_precmd
 	eval ${command} ${qmailsmtpd_flags} ${command_args}
 fi