 @@ -1,17 +1,17 @@
-# $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}

 @@ -25,31 +25,31 @@ Greylisting:
   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".

 @@ -1,16 +1,16 @@
 #!@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:=""}
 @@ -33,27 +33,27 @@ name="qmailofmipd"
 : ${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

 @@ -1,16 +1,16 @@
 #!@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"}
 @@ -30,27 +30,27 @@ name="qmailpop3d"
 : ${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

 @@ -1,16 +1,16 @@
 #!@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:=""}
 @@ -29,27 +29,27 @@ name="qmailsmtpd"
 : ${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