 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.70 2019/01/18 18:25:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.71 2019/03/21 15:33:06 schmonz Exp $
+#
-DISTNAME=		qmail-run-20190118
+DISTNAME=		qmail-run-20190321
 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}

 @@ -1,32 +1,32 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: qmailofmipd.sh,v 1.24 2019/01/18 18:25:34 schmonz Exp $
+# $NetBSD: qmailofmipd.sh,v 1.25 2019/03/21 15:33:06 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_postenv:=""}
 : ${qmailofmipd_datalimit:="360000000"}
 : ${qmailofmipd_pretcpserver:=""}
 : ${qmailofmipd_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailofmipd_tcpflags:="-ne -vRl0"}
-: ${qmailofmipd_tcphost:="0"}
+: ${qmailofmipd_tcphost:=":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"}
 @@ -64,26 +64,28 @@ qmailofmipd_configure_tls() {
 		fi
 	elif [ -f /etc/rc.subr ] && checkyesno qmailofmipd_tls; then
 		qmailofmipd_enable_tls
 	else
 		qmailofmipd_disable_tls
 	fi
+}
 qmailofmipd_disable_tls() {
 	qmailofmipd_postenv="DISABLETLS=1 ${qmailofmipd_postenv}"
+}
 qmailofmipd_enable_tls() {
 	qmailofmipd_postenv="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) ${qmailofmipd_postenv}"
 	qmailofmipd_postenv="SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@) ${qmailofmipd_postenv}"
 	qmailofmipd_postenv="DHFILE=${qmailofmipd_tls_dhparams} ${qmailofmipd_postenv}"
 	qmailofmipd_postenv="CERTFILE=${qmailofmipd_tls_cert} ${qmailofmipd_postenv}"
 	if [ -f "${qmailofmipd_tls_key}" ]; then
 		qmailofmipd_postenv="KEYFILE=${qmailofmipd_tls_key} ${qmailofmipd_postenv}"
 	fi
 	if [ -n "${qmailofmipd_tls_ciphers}" ]; then
 		qmailofmipd_postenv="CIPHERS=${qmailofmipd_tls_ciphers} ${qmailofmipd_postenv}"
 	fi
+}
 qmailofmipd_precmd() {
 	if [ -f /etc/rc.subr ] && ! checkyesno qmailofmipd_log; then
 		qmailofmipd_logcmd=${qmailofmipd_nologcmd}

 @@ -1,31 +1,31 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: qmailpop3d.sh,v 1.32 2019/01/18 18:25:34 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.33 2019/03/21 15:33:06 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_postenv:=""}
 : ${qmailpop3d_datalimit:="180000000"}
 : ${qmailpop3d_pretcpserver:=""}
 : ${qmailpop3d_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailpop3d_tcpflags:="-ne -vRl0"}
-: ${qmailpop3d_tcphost:="0"}
+: ${qmailpop3d_tcphost:=":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"}
 @@ -61,26 +61,28 @@ qmailpop3d_configure_tls() {
 		fi
 	elif [ -f /etc/rc.subr ] && checkyesno qmailpop3d_tls; then
 		qmailpop3d_enable_tls
 	else
 		qmailpop3d_disable_tls
 	fi
+}
 qmailpop3d_disable_tls() {
 	qmailpop3d_postenv="DISABLETLS=1 ${qmailpop3d_postenv}"
+}
 qmailpop3d_enable_tls() {
 	qmailpop3d_postenv="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) ${qmailpop3d_postenv}"
 	qmailpop3d_postenv="SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@) ${qmailpop3d_postenv}"
 	qmailpop3d_postenv="DHFILE=${qmailpop3d_tls_dhparams} ${qmailpop3d_postenv}"
 	qmailpop3d_postenv="CERTFILE=${qmailpop3d_tls_cert} ${qmailpop3d_postenv}"
 	if [ -f "${qmailpop3d_tls_key}" ]; then
 		qmailpop3d_postenv="KEYFILE=${qmailpop3d_tls_key} ${qmailpop3d_postenv}"
 	fi
 	if [ -n "${qmailpop3d_tls_ciphers}" ]; then
 		qmailpop3d_postenv="CIPHERS=${qmailpop3d_tls_ciphers} ${qmailpop3d_postenv}"
 	fi
+}
 qmailpop3d_precmd() {
 	if [ -f /etc/rc.subr ] && ! checkyesno qmailpop3d_log; then
 		qmailpop3d_logcmd=${qmailpop3d_nologcmd}

 @@ -1,32 +1,32 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: qmailsmtpd.sh,v 1.29 2019/01/18 18:25:34 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.30 2019/03/21 15:33:06 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_postenv:=""}
 : ${qmailsmtpd_datalimit:="540000000"}
 : ${qmailsmtpd_pretcpserver:=""}
 : ${qmailsmtpd_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailsmtpd_tcpflags:="-ne -vRl0"}
-: ${qmailsmtpd_tcphost:="0"}
+: ${qmailsmtpd_tcphost:=":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:=""}
 @@ -60,26 +60,28 @@ qmailsmtpd_configure_tls() {
 		fi
 	elif [ -f /etc/rc.subr ] && checkyesno qmailsmtpd_tls; then
 		qmailsmtpd_enable_tls
 	else
 		qmailsmtpd_disable_tls
 	fi
+}
 qmailsmtpd_disable_tls() {
 	qmailsmtpd_postenv="DISABLETLS=1 ${qmailsmtpd_postenv}"
+}
 qmailsmtpd_enable_tls() {
 	qmailsmtpd_postenv="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) ${qmailsmtpd_postenv}"
 	qmailsmtpd_postenv="SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@) ${qmailsmtpd_postenv}"
 	qmailsmtpd_postenv="DHFILE=${qmailsmtpd_tls_dhparams} ${qmailsmtpd_postenv}"
 	qmailsmtpd_postenv="CERTFILE=${qmailsmtpd_tls_cert} ${qmailsmtpd_postenv}"
 	if [ -f "${qmailsmtpd_tls_key}" ]; then
 		qmailsmtpd_postenv="KEYFILE=${qmailsmtpd_tls_key} ${qmailsmtpd_postenv}"
 	fi
 	if [ -n "${qmailsmtpd_tls_ciphers}" ]; then
 		qmailsmtpd_postenv="CIPHERS=${qmailsmtpd_tls_ciphers} ${qmailsmtpd_postenv}"
 	fi
+}
 qmailsmtpd_precmd() {
 	if [ -f /etc/rc.subr ] && ! checkyesno qmailsmtpd_log; then
 		qmailsmtpd_logcmd=${qmailsmtpd_nologcmd}