rc.d scripts:

- ucspi-ssl and ucspi-tcp6 correctly dual-stack v4/v6 on NetBSD, so we
  can go back to "0" (instead of "0.0.0.0") as the default host to
  listen on.
- FreeBSD's /bin/sh needs continuation characters to understand what
  we're assigning to `command` in foo_precmd(). This seems sensible and
  doesn't break NetBSD.

Bump version.

6 files changed, 46 insertions, 46 deletions

diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index 1fc13aeb5d3..41003b7af4b 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2018/12/15 06:31:34 schmonz Exp $
+# $NetBSD: Makefile,v 1.67 2018/12/16 05:32:07 schmonz Exp $
 #
 
-DISTNAME=		qmail-run-20181215
+DISTNAME=		qmail-run-20181216
 CATEGORIES=		mail
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/mail/qmail-run/files/qmailofmipd.sh b/mail/qmail-run/files/qmailofmipd.sh
index 1064f3ee6ef..78a3e0fad0b 100644
--- a/mail/qmail-run/files/qmailofmipd.sh
+++ b/mail/qmail-run/files/qmailofmipd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailofmipd.sh,v 1.22 2018/12/15 06:31:34 schmonz Exp $
+# $NetBSD: qmailofmipd.sh,v 1.23 2018/12/16 05:32:07 schmonz Exp $
 #
 # @PKGNAME@ script to control ofmipd (SMTP submission service).
 #
@@ -16,7 +16,7 @@ name="qmailofmipd"
 : ${qmailofmipd_pretcpserver:=""}
 : ${qmailofmipd_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailofmipd_tcpflags:="-ne -vRl0"}
-: ${qmailofmipd_tcphost:="0.0.0.0"}
+: ${qmailofmipd_tcphost:="0"}
 : ${qmailofmipd_tcpport:="587"}
 : ${qmailofmipd_tcprules:="@PKG_SYSCONFDIR@/control/tcprules/ofmip"}
 : ${qmailofmipd_autocdb:="YES"}
@@ -91,15 +91,15 @@ qmailofmipd_precmd() {
 	# 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}
-2>&1 |
+	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} \
+2>&1 | \
 @PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailofmipd_logcmd}"
 	command_args="&"
 	rc_flags=""
diff --git a/mail/qmail-run/files/qmailpop3d.sh b/mail/qmail-run/files/qmailpop3d.sh
index d42cf57b335..dd51abf779b 100644
--- a/mail/qmail-run/files/qmailpop3d.sh
+++ b/mail/qmail-run/files/qmailpop3d.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailpop3d.sh,v 1.30 2018/12/15 06:31:34 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.31 2018/12/16 05:32:07 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
 #
@@ -15,7 +15,7 @@ name="qmailpop3d"
 : ${qmailpop3d_pretcpserver:=""}
 : ${qmailpop3d_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailpop3d_tcpflags:="-ne -vRl0"}
-: ${qmailpop3d_tcphost:="0.0.0.0"}
+: ${qmailpop3d_tcphost:="0"}
 : ${qmailpop3d_tcpport:="110"}
 : ${qmailpop3d_tcprules:="@PKG_SYSCONFDIR@/control/tcprules/pop3"}
 : ${qmailpop3d_autocdb:="YES"}
@@ -88,15 +88,15 @@ qmailpop3d_precmd() {
 	# 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}
-2>&1 |
+	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} \
+2>&1 | \
 @PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailpop3d_logcmd}"
 	command_args="&"
 	rc_flags=""
diff --git a/mail/qmail-run/files/qmailqread.sh b/mail/qmail-run/files/qmailqread.sh
index 6036d5018f0..798f9b4e1ec 100644
--- a/mail/qmail-run/files/qmailqread.sh
+++ b/mail/qmail-run/files/qmailqread.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailqread.sh,v 1.17 2018/12/14 06:55:07 schmonz Exp $
+# $NetBSD: qmailqread.sh,v 1.18 2018/12/16 05:32:07 schmonz Exp $
 #
 # @PKGNAME@ script to control a service providing local non-root
 # users access to see the queue. Adapted from a script by Steinar Haug.
@@ -41,13 +41,13 @@ qmailqread_precmd() {
 	# 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 "nbqmailqread".
-	command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailqread_postenv}
-@PREFIX@/bin/argv0 ${qmailqread_tcpserver} ${procname}
-${qmailqread_tcpflags}
--u `@ID@ -u @QMAIL_SEND_USER@` -g `@ID@ -g @QMAIL_SEND_USER@`
-${qmailqread_tcphost} ${qmailqread_tcpport}
-@PREFIX@/bin/qmail-qread
-2>&1 |
+	command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailqread_postenv} \
+@PREFIX@/bin/argv0 ${qmailqread_tcpserver} ${procname} \
+${qmailqread_tcpflags} \
+-u `@ID@ -u @QMAIL_SEND_USER@` -g `@ID@ -g @QMAIL_SEND_USER@` \
+${qmailqread_tcphost} ${qmailqread_tcpport} \
+@PREFIX@/bin/qmail-qread \
+2>&1 | \
 @PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailqread_logcmd}"
 	command_args="&"
 	rc_flags=""
diff --git a/mail/qmail-run/files/qmailsend.sh b/mail/qmail-run/files/qmailsend.sh
index e078d0be7e6..8d0506cc97f 100644
--- a/mail/qmail-run/files/qmailsend.sh
+++ b/mail/qmail-run/files/qmailsend.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsend.sh,v 1.16 2018/12/14 06:55:07 schmonz Exp $
+# $NetBSD: qmailsend.sh,v 1.17 2018/12/16 05:32:07 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-send (local and outgoing mail).
 #
@@ -47,8 +47,8 @@ qmailsend_prestart() {
 	@MKDIR@ "@VARBASE@/run"
 	# qmail-start(8) starts the various qmail processes, then execs
 	# qmail-send(8). That's the process we want to signal later.
-	command="@PREFIX@/bin/pgrphack @SETENV@ - PATH=@PREFIX@/bin:$PATH ${qmailsend_postenv}
-qmail-start '$qmailsend_defaultdelivery'
+	command="@PREFIX@/bin/pgrphack @SETENV@ - PATH=@PREFIX@/bin:$PATH ${qmailsend_postenv} \
+qmail-start '$qmailsend_defaultdelivery' \
 ${qmailsend_logcmd}"
 	command_args="&"
 	rc_flags=""
diff --git a/mail/qmail-run/files/qmailsmtpd.sh b/mail/qmail-run/files/qmailsmtpd.sh
index 62be582f9df..a1722e5de7d 100644
--- a/mail/qmail-run/files/qmailsmtpd.sh
+++ b/mail/qmail-run/files/qmailsmtpd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsmtpd.sh,v 1.27 2018/12/15 06:31:34 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.28 2018/12/16 05:32:07 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-smtpd (SMTP service).
 #
@@ -16,7 +16,7 @@ name="qmailsmtpd"
 : ${qmailsmtpd_pretcpserver:=""}
 : ${qmailsmtpd_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailsmtpd_tcpflags:="-ne -vRl0"}
-: ${qmailsmtpd_tcphost:="0.0.0.0"}
+: ${qmailsmtpd_tcphost:="0"}
 : ${qmailsmtpd_tcpport:="25"}
 : ${qmailsmtpd_tcprules:="@PKG_SYSCONFDIR@/control/tcprules/smtp"}
 : ${qmailsmtpd_autocdb:="YES"}
@@ -87,15 +87,15 @@ qmailsmtpd_precmd() {
 	# 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}
-2>&1 |
+	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} \
+2>&1 | \
 @PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailsmtpd_logcmd}"
 	command_args="&"
 	rc_flags=""