CVS commit: pkgsrc/mail/qmail-run

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Mar 21 15:33:06 UTC 2019

Modified Files:
        pkgsrc/mail/qmail-run: Makefile
        pkgsrc/mail/qmail-run/files: qmailofmipd.sh qmailpop3d.sh qmailsmtpd.sh

Log Message:
Defer SSL_UID and SSL_GID to qmailfoo_enable_tls(). Listen on ":0",
the updated dual-stack pseudo-host for ucspi-tcp6 and ucspi-ssl.
Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mail/qmail-run/files/qmailofmipd.sh
cvs rdiff -u -r1.32 -r1.33 pkgsrc/mail/qmail-run/files/qmailpop3d.sh
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mail/qmail-run/files/qmailsmtpd.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/qmail-run/Makefile
diff -u pkgsrc/mail/qmail-run/Makefile:1.70 pkgsrc/mail/qmail-run/Makefile:1.71
--- pkgsrc/mail/qmail-run/Makefile:1.70 Fri Jan 18 18:25:33 2019
+++ pkgsrc/mail/qmail-run/Makefile      Thu Mar 21 15:33:06 2019
@@ -1,7 +1,7 @@
-# $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

Index: pkgsrc/mail/qmail-run/files/qmailofmipd.sh
diff -u pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.24 pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.25
--- pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.24     Fri Jan 18 18:25:34 2019
+++ pkgsrc/mail/qmail-run/files/qmailofmipd.sh  Thu Mar 21 15:33:06 2019
@@ -1,6 +1,6 @@
 #!@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).
 #
@@ -11,12 +11,12 @@
 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"}
@@ -74,6 +74,8 @@ qmailofmipd_disable_tls() {
 }
 
 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

Index: pkgsrc/mail/qmail-run/files/qmailpop3d.sh
diff -u pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.32 pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.33
--- pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.32      Fri Jan 18 18:25:34 2019
+++ pkgsrc/mail/qmail-run/files/qmailpop3d.sh   Thu Mar 21 15:33:06 2019
@@ -1,6 +1,6 @@
 #!@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).
 #
@@ -10,12 +10,12 @@
 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"}
@@ -71,6 +71,8 @@ qmailpop3d_disable_tls() {
 }
 
 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

Index: pkgsrc/mail/qmail-run/files/qmailsmtpd.sh
diff -u pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.29 pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.30
--- pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.29      Fri Jan 18 18:25:34 2019
+++ pkgsrc/mail/qmail-run/files/qmailsmtpd.sh   Thu Mar 21 15:33:06 2019
@@ -1,6 +1,6 @@
 #!@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).
 #
@@ -11,12 +11,12 @@
 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"}
@@ -70,6 +70,8 @@ qmailsmtpd_disable_tls() {
 }
 
 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