To override sslserver's default cipher list, set qmailfoo_tls_ciphers.

While here, make it easier to use envdir by prepending to
${qmailfoo_postenv} rather than appending.

At least one Linux shell needs "--" between greetdelay and rblsmtpd, and
this doesn't break NetBSD.

Bump version.

4 files changed, 31 insertions, 19 deletions

diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index bc8b051d675..2ad6b4a03cf 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2019/01/07 04:29:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.70 2019/01/18 18:25:33 schmonz Exp $
 #
 
-DISTNAME=		qmail-run-20181230
+DISTNAME=		qmail-run-20190118
 CATEGORIES=		mail
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/mail/qmail-run/files/qmailofmipd.sh b/mail/qmail-run/files/qmailofmipd.sh
index 78a3e0fad0b..297b270e926 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.23 2018/12/16 05:32:07 schmonz Exp $
+# $NetBSD: qmailofmipd.sh,v 1.24 2019/01/18 18:25:34 schmonz Exp $
 #
 # @PKGNAME@ script to control ofmipd (SMTP submission service).
 #
@@ -32,6 +32,7 @@ name="qmailofmipd"
 : ${qmailofmipd_tls_dhparams:="@PKG_SYSCONFDIR@/control/dh2048.pem"}
 : ${qmailofmipd_tls_cert:="@PKG_SYSCONFDIR@/control/servercert.pem"}
 : ${qmailofmipd_tls_key:=""}
+: ${qmailofmipd_tls_ciphers:=""}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -69,14 +70,17 @@ qmailofmipd_configure_tls() {
 }
 
 qmailofmipd_disable_tls() {
-	qmailofmipd_postenv="${qmailofmipd_postenv} DISABLETLS=1"
+	qmailofmipd_postenv="DISABLETLS=1 ${qmailofmipd_postenv}"
 }
 
 qmailofmipd_enable_tls() {
-	qmailofmipd_postenv="${qmailofmipd_postenv} DHFILE=${qmailofmipd_tls_dhparams}"
-	qmailofmipd_postenv="${qmailofmipd_postenv} CERTFILE=${qmailofmipd_tls_cert}"
+	qmailofmipd_postenv="DHFILE=${qmailofmipd_tls_dhparams} ${qmailofmipd_postenv}"
+	qmailofmipd_postenv="CERTFILE=${qmailofmipd_tls_cert} ${qmailofmipd_postenv}"
 	if [ -f "${qmailofmipd_tls_key}" ]; then
-		qmailofmipd_postenv="${qmailofmipd_postenv} KEYFILE=${qmailofmipd_tls_key}"
+		qmailofmipd_postenv="KEYFILE=${qmailofmipd_tls_key} ${qmailofmipd_postenv}"
+	fi
+	if [ -n "${qmailofmipd_tls_ciphers}" ]; then
+		qmailofmipd_postenv="CIPHERS=${qmailofmipd_tls_ciphers} ${qmailofmipd_postenv}"
 	fi
 }
 
@@ -134,7 +138,7 @@ qmailofmipd_needcdb() {
 }
 
 qmailofmipd_cdb() {
-	@ECHO@ "Reloading ${qmailofmipd_tcprules}"
+	@ECHO@ "Reloading ${qmailofmipd_tcprules}."
 	@PREFIX@/bin/tcprules ${qmailofmipd_tcprules}.cdb ${qmailofmipd_tcprules}.tmp < ${qmailofmipd_tcprules}
 	@CHMOD@ 644 ${qmailofmipd_tcprules}.cdb
 }
diff --git a/mail/qmail-run/files/qmailpop3d.sh b/mail/qmail-run/files/qmailpop3d.sh
index dd51abf779b..599fb0dc94c 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.31 2018/12/16 05:32:07 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.32 2019/01/18 18:25:34 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
 #
@@ -31,6 +31,7 @@ name="qmailpop3d"
 : ${qmailpop3d_tls_dhparams:="@PKG_SYSCONFDIR@/control/dh2048.pem"}
 : ${qmailpop3d_tls_cert:="@PKG_SYSCONFDIR@/control/servercert.pem"}
 : ${qmailpop3d_tls_key:=""}
+: ${qmailpop3d_tls_ciphers:=""}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -66,14 +67,17 @@ qmailpop3d_configure_tls() {
 }
 
 qmailpop3d_disable_tls() {
-	qmailpop3d_postenv="${qmailpop3d_postenv} DISABLETLS=1"
+	qmailpop3d_postenv="DISABLETLS=1 ${qmailpop3d_postenv}"
 }
 
 qmailpop3d_enable_tls() {
-	qmailpop3d_postenv="${qmailpop3d_postenv} DHFILE=${qmailpop3d_tls_dhparams}"
-	qmailpop3d_postenv="${qmailpop3d_postenv} CERTFILE=${qmailpop3d_tls_cert}"
+	qmailpop3d_postenv="DHFILE=${qmailpop3d_tls_dhparams} ${qmailpop3d_postenv}"
+	qmailpop3d_postenv="CERTFILE=${qmailpop3d_tls_cert} ${qmailpop3d_postenv}"
 	if [ -f "${qmailpop3d_tls_key}" ]; then
-		qmailpop3d_postenv="${qmailpop3d_postenv} KEYFILE=${qmailpop3d_tls_key}"
+		qmailpop3d_postenv="KEYFILE=${qmailpop3d_tls_key} ${qmailpop3d_postenv}"
+	fi
+	if [ -n "${qmailpop3d_tls_ciphers}" ]; then
+		qmailpop3d_postenv="CIPHERS=${qmailpop3d_tls_ciphers} ${qmailpop3d_postenv}"
 	fi
 }
 
diff --git a/mail/qmail-run/files/qmailsmtpd.sh b/mail/qmail-run/files/qmailsmtpd.sh
index a1722e5de7d..a7147225429 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.28 2018/12/16 05:32:07 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.29 2019/01/18 18:25:34 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-smtpd (SMTP service).
 #
@@ -20,7 +20,7 @@ name="qmailsmtpd"
 : ${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_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"}
@@ -30,6 +30,7 @@ name="qmailsmtpd"
 : ${qmailsmtpd_tls_dhparams:="@PKG_SYSCONFDIR@/control/dh2048.pem"}
 : ${qmailsmtpd_tls_cert:="@PKG_SYSCONFDIR@/control/servercert.pem"}
 : ${qmailsmtpd_tls_key:=""}
+: ${qmailsmtpd_tls_ciphers:=""}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -65,14 +66,17 @@ qmailsmtpd_configure_tls() {
 }
 
 qmailsmtpd_disable_tls() {
-	qmailsmtpd_postenv="${qmailsmtpd_postenv} DISABLETLS=1"
+	qmailsmtpd_postenv="DISABLETLS=1 ${qmailsmtpd_postenv}"
 }
 
 qmailsmtpd_enable_tls() {
-	qmailsmtpd_postenv="${qmailsmtpd_postenv} DHFILE=${qmailsmtpd_tls_dhparams}"
-	qmailsmtpd_postenv="${qmailsmtpd_postenv} CERTFILE=${qmailsmtpd_tls_cert}"
+	qmailsmtpd_postenv="DHFILE=${qmailsmtpd_tls_dhparams} ${qmailsmtpd_postenv}"
+	qmailsmtpd_postenv="CERTFILE=${qmailsmtpd_tls_cert} ${qmailsmtpd_postenv}"
 	if [ -f "${qmailsmtpd_tls_key}" ]; then
-		qmailsmtpd_postenv="${qmailsmtpd_postenv} KEYFILE=${qmailsmtpd_tls_key}"
+		qmailsmtpd_postenv="KEYFILE=${qmailsmtpd_tls_key} ${qmailsmtpd_postenv}"
+	fi
+	if [ -n "${qmailsmtpd_tls_ciphers}" ]; then
+		qmailsmtpd_postenv="CIPHERS=${qmailsmtpd_tls_ciphers} ${qmailsmtpd_postenv}"
 	fi
 }