Received: by mail.netbsd.org (Postfix, from userid 605) id 37DB184DB8; Sun, 16 Dec 2018 05:32:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2E0CD84D68 for ; Sun, 16 Dec 2018 05:32:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id I7x1zoRyE1vA for ; Sun, 16 Dec 2018 05:32:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A435384CD6 for ; Sun, 16 Dec 2018 05:32:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9623FFB16; Sun, 16 Dec 2018 05:32:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1544938327295910" MIME-Version: 1.0 Date: Sun, 16 Dec 2018 05:32:07 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mail/qmail-run To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20181216053207.9623FFB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1544938327295910 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sun Dec 16 05:32:07 UTC 2018 Modified Files: pkgsrc/mail/qmail-run: Makefile pkgsrc/mail/qmail-run/files: qmailofmipd.sh qmailpop3d.sh qmailqread.sh qmailsend.sh qmailsmtpd.sh Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 pkgsrc/mail/qmail-run/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/qmail-run/files/qmailofmipd.sh cvs rdiff -u -r1.30 -r1.31 pkgsrc/mail/qmail-run/files/qmailpop3d.sh cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/qmail-run/files/qmailqread.sh cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/qmail-run/files/qmailsend.sh cvs rdiff -u -r1.27 -r1.28 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. --_----------=_1544938327295910 Content-Disposition: inline Content-Length: 10078 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/qmail-run/Makefile diff -u pkgsrc/mail/qmail-run/Makefile:1.66 pkgsrc/mail/qmail-run/Makefile:1.67 --- pkgsrc/mail/qmail-run/Makefile:1.66 Sat Dec 15 06:31:34 2018 +++ pkgsrc/mail/qmail-run/Makefile Sun Dec 16 05:32:07 2018 @@ -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 Index: pkgsrc/mail/qmail-run/files/qmailofmipd.sh diff -u pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.22 pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.23 --- pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.22 Sat Dec 15 06:31:34 2018 +++ pkgsrc/mail/qmail-run/files/qmailofmipd.sh Sun Dec 16 05:32:07 2018 @@ -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="" Index: pkgsrc/mail/qmail-run/files/qmailpop3d.sh diff -u pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.30 pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.31 --- pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.30 Sat Dec 15 06:31:34 2018 +++ pkgsrc/mail/qmail-run/files/qmailpop3d.sh Sun Dec 16 05:32:07 2018 @@ -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="" Index: pkgsrc/mail/qmail-run/files/qmailqread.sh diff -u pkgsrc/mail/qmail-run/files/qmailqread.sh:1.17 pkgsrc/mail/qmail-run/files/qmailqread.sh:1.18 --- pkgsrc/mail/qmail-run/files/qmailqread.sh:1.17 Fri Dec 14 06:55:07 2018 +++ pkgsrc/mail/qmail-run/files/qmailqread.sh Sun Dec 16 05:32:07 2018 @@ -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="" Index: pkgsrc/mail/qmail-run/files/qmailsend.sh diff -u pkgsrc/mail/qmail-run/files/qmailsend.sh:1.16 pkgsrc/mail/qmail-run/files/qmailsend.sh:1.17 --- pkgsrc/mail/qmail-run/files/qmailsend.sh:1.16 Fri Dec 14 06:55:07 2018 +++ pkgsrc/mail/qmail-run/files/qmailsend.sh Sun Dec 16 05:32:07 2018 @@ -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="" Index: pkgsrc/mail/qmail-run/files/qmailsmtpd.sh diff -u pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.27 pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.28 --- pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.27 Sat Dec 15 06:31:34 2018 +++ pkgsrc/mail/qmail-run/files/qmailsmtpd.sh Sun Dec 16 05:32:07 2018 @@ -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="" --_----------=_1544938327295910--