Received: by mail.netbsd.org (Postfix, from userid 605) id 3A6A684DA6; Sat, 17 Jun 2017 05:58:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BF5B184C86 for ; Sat, 17 Jun 2017 05:58:40 +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 Bkg_W892XxOr for ; Sat, 17 Jun 2017 05:58:39 +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 B25E084C6C for ; Sat, 17 Jun 2017 05:58:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AD2E1FAE8; Sat, 17 Jun 2017 05:58:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1497679119222210" MIME-Version: 1.0 Date: Sat, 17 Jun 2017 05:58:39 +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: <20170617055839.AD2E1FAE8@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. --_----------=_1497679119222210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sat Jun 17 05:58:39 UTC 2017 Modified Files: pkgsrc/mail/qmail-run: Makefile options.mk pkgsrc/mail/qmail-run/files: qmail.sh qmailofmipd.sh qmailpop3d.sh qmailqread.sh qmailsend.sh qmailsmtpd.sh Log Message: Increase default {ofmip,pop3,smtp}d softlimits by about 20 percent, to 180000000 bytes. From Nathan Arthur in private mail. Allow path to tcpserver to be overridden in rc.conf (e.g., by sslserver from net/ucspi-ssl). From Thomas Lazar in private mail. Detach processes and their loggers from the controlling terminal with pgrphack(8). Include qmailqread in the services driven by the LWQ-style qmail rc.d script. Unconditionally depend on mail/mess822, now that it's correctly marked public-domain. Remove qmail-run-ofmipd option. Bump version. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 pkgsrc/mail/qmail-run/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/qmail-run/options.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/qmail-run/files/qmail.sh \ pkgsrc/mail/qmail-run/files/qmailofmipd.sh cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/qmail-run/files/qmailpop3d.sh \ pkgsrc/mail/qmail-run/files/qmailsmtpd.sh cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/qmail-run/files/qmailqread.sh cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/qmail-run/files/qmailsend.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1497679119222210 Content-Disposition: inline Content-Length: 13593 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.36 pkgsrc/mail/qmail-run/Makefile:1.37 --- pkgsrc/mail/qmail-run/Makefile:1.36 Wed May 31 07:08:04 2017 +++ pkgsrc/mail/qmail-run/Makefile Sat Jun 17 05:58:39 2017 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2017/05/31 07:08:04 schmonz Exp $ +# $NetBSD: Makefile,v 1.37 2017/06/17 05:58:39 schmonz Exp $ # -DISTNAME= qmail-run-20170531 +DISTNAME= qmail-run-20170617 CATEGORIES= mail MASTER_SITES= # empty DISTFILES= # empty @@ -10,6 +10,7 @@ MAINTAINER= schmonz@NetBSD.org COMMENT= Configures qmail to receive and deliver mail LICENSE= 2-clause-bsd +DEPENDS+= mess822-[0-9]*:../../mail/mess822 DEPENDS_QMAIL= qmail>=1.03nb8:../../mail/qmail DEPENDS+= ${DEPENDS_QMAIL} DEPENDS+= qmail-qfilter>1.5nb1:../../mail/qmail-qfilter Index: pkgsrc/mail/qmail-run/options.mk diff -u pkgsrc/mail/qmail-run/options.mk:1.2 pkgsrc/mail/qmail-run/options.mk:1.3 --- pkgsrc/mail/qmail-run/options.mk:1.2 Sun Apr 9 12:58:46 2017 +++ pkgsrc/mail/qmail-run/options.mk Sat Jun 17 05:58:39 2017 @@ -1,15 +1,10 @@ -# $NetBSD: options.mk,v 1.2 2017/04/09 12:58:46 schmonz Exp $ +# $NetBSD: options.mk,v 1.3 2017/06/17 05:58:39 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail-run -PKG_SUPPORTED_OPTIONS+= qmail-run-ofmipd sasl tls +PKG_SUPPORTED_OPTIONS+= sasl tls .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mqmail-run-ofmipd) -DEPENDS+= mess822-[0-9]*:../../mail/mess822 -.endif - - .if !empty(PKG_OPTIONS:Msasl) DEPENDS+= spamdyke-[0-9]*:../../mail/spamdyke .endif Index: pkgsrc/mail/qmail-run/files/qmail.sh diff -u pkgsrc/mail/qmail-run/files/qmail.sh:1.4 pkgsrc/mail/qmail-run/files/qmail.sh:1.5 --- pkgsrc/mail/qmail-run/files/qmail.sh:1.4 Mon Jan 9 04:58:09 2017 +++ pkgsrc/mail/qmail-run/files/qmail.sh Sat Jun 17 05:58:39 2017 @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmail.sh,v 1.4 2017/01/09 04:58:09 schmonz Exp $ +# $NetBSD: qmail.sh,v 1.5 2017/06/17 05:58:39 schmonz Exp $ # # @PKGNAME@ master script for administrators to control qmail # services. Usage resembles the qmailctl script from "Life with qmail". @@ -70,7 +70,7 @@ doqueue -- schedules queued messages for HELP } -COMMAND_LIST="qmailsend qmailsmtpd qmailofmipd qmailpop3d" +COMMAND_LIST="qmailsend qmailqread qmailsmtpd qmailofmipd qmailpop3d" name="qmail" start_cmd="forward_commands" Index: pkgsrc/mail/qmail-run/files/qmailofmipd.sh diff -u pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.4 pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.5 --- pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.4 Mon Apr 10 15:04:56 2017 +++ pkgsrc/mail/qmail-run/files/qmailofmipd.sh Sat Jun 17 05:58:39 2017 @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailofmipd.sh,v 1.4 2017/04/10 15:04:56 schmonz Exp $ +# $NetBSD: qmailofmipd.sh,v 1.5 2017/06/17 05:58:39 schmonz Exp $ # # @PKGNAME@ script to control ofmipd (SMTP submission service). # @@ -15,8 +15,9 @@ name="qmailofmipd" : ${qmailofmipd_tcpflags:="-vRl0"} : ${qmailofmipd_tcphost:="127.0.0.1"} : ${qmailofmipd_tcpport:="26"} -: ${qmailofmipd_datalimit:="146800640"} +: ${qmailofmipd_datalimit:="180000000"} : ${qmailofmipd_pretcpserver:=""} +: ${qmailofmipd_tcpserver:="@PREFIX@/bin/tcpserver"} : ${qmailofmipd_preofmipd:=""} : ${qmailofmipd_ofmipdcmd:="@PREFIX@/bin/ofmipd"} : ${qmailofmipd_postofmipd:=""} @@ -32,7 +33,7 @@ rcvar=${name} required_files="@PKG_SYSCONFDIR@/control/concurrencyofmip" required_files="${required_files} @PKG_SYSCONFDIR@/tcp.ofmip.cdb" required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts" -command="@PREFIX@/bin/tcpserver" +command="${qmailofmipd_tcpserver}" procname=${name} start_precmd="qmailofmipd_precmd" extra_commands="stat pause cont cdb" @@ -43,22 +44,22 @@ cdb_cmd="qmailofmipd_cdb" 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 OFMIP - # service. Use argv0(1) to set procname to "qmailofmipd". if [ -f /etc/rc.subr ] && ! checkyesno qmailofmipd_log; then qmailofmipd_logcmd=${qmailofmipd_nologcmd} fi - command="@SETENV@ - ${qmailofmipd_postenv} + # 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 "qmailofmipd". + command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailofmipd_postenv} @PREFIX@/bin/softlimit -m ${qmailofmipd_datalimit} ${qmailofmipd_pretcpserver} -@PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} +@PREFIX@/bin/argv0 ${qmailofmipd_tcpserver} ${name} ${qmailofmipd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.ofmip.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyofmip` -u `@ID@ -u @QMAIL_DAEMON_USER@` -g `@ID@ -g @QMAIL_DAEMON_USER@` ${qmailofmipd_tcphost} ${qmailofmipd_tcpport} ${qmailofmipd_preofmipd} ${qmailofmipd_ofmipdcmd} ${qmailofmipd_postofmipd} 2>&1 | -@PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailofmipd_logcmd}" +@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.13 pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.14 --- pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.13 Mon Apr 10 15:04:56 2017 +++ pkgsrc/mail/qmail-run/files/qmailpop3d.sh Sat Jun 17 05:58:39 2017 @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailpop3d.sh,v 1.13 2017/04/10 15:04:56 schmonz Exp $ +# $NetBSD: qmailpop3d.sh,v 1.14 2017/06/17 05:58:39 schmonz Exp $ # # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs). # @@ -14,8 +14,9 @@ name="qmailpop3d" : ${qmailpop3d_tcpflags:="-vRHl0"} : ${qmailpop3d_tcphost:="0"} : ${qmailpop3d_tcpport:="110"} -: ${qmailpop3d_datalimit:="146800640"} +: ${qmailpop3d_datalimit:="180000000"} : ${qmailpop3d_pretcpserver:=""} +: ${qmailpop3d_tcpserver:="@PREFIX@/bin/tcpserver"} : ${qmailpop3d_prepop3d:=""} : ${qmailpop3d_pop3dcmd:="@PREFIX@/bin/qmail-pop3d"} : ${qmailpop3d_checkpassword:="@PREFIX@/bin/checkpassword"} @@ -32,7 +33,7 @@ rcvar=${name} required_files="@PKG_SYSCONFDIR@/control/me" required_files="${required_files} @PKG_SYSCONFDIR@/control/concurrencypop3" required_files="${required_files} @PKG_SYSCONFDIR@/tcp.pop3.cdb" -command="@PREFIX@/bin/tcpserver" +command="${qmailpop3d_tcpserver}" procname=${name} start_precmd="qmailpop3d_precmd" extra_commands="stat pause cont cdb" @@ -43,22 +44,22 @@ cdb_cmd="qmailpop3d_cdb" 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 POP - # service. Use argv0(1) to set procname to "qmailpop3d". if [ -f /etc/rc.subr ] && ! checkyesno qmailpop3d_log; then qmailpop3d_logcmd=${qmailpop3d_nologcmd} fi - command="@SETENV@ - ${qmailpop3d_postenv} + # 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 "qmailpop3d". + command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailpop3d_postenv} @PREFIX@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver} -@PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} +@PREFIX@/bin/argv0 ${qmailpop3d_tcpserver} ${name} ${qmailpop3d_tcpflags} -x @PKG_SYSCONFDIR@/tcp.pop3.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3` ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @PREFIX@/bin/qmail-popup `@HEAD@ -1 @PKG_SYSCONFDIR@/control/me` ${qmailpop3d_checkpassword} ${qmailpop3d_prepop3d} ${qmailpop3d_pop3dcmd} ${qmailpop3d_maildirname} 2>&1 | -@PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailpop3d_logcmd}" +@PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailpop3d_logcmd}" command_args="&" rc_flags="" } Index: pkgsrc/mail/qmail-run/files/qmailsmtpd.sh diff -u pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.13 pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.14 --- pkgsrc/mail/qmail-run/files/qmailsmtpd.sh:1.13 Mon Apr 10 15:04:56 2017 +++ pkgsrc/mail/qmail-run/files/qmailsmtpd.sh Sat Jun 17 05:58:39 2017 @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailsmtpd.sh,v 1.13 2017/04/10 15:04:56 schmonz Exp $ +# $NetBSD: qmailsmtpd.sh,v 1.14 2017/06/17 05:58:39 schmonz Exp $ # # @PKGNAME@ script to control qmail-smtpd (SMTP service). # @@ -15,8 +15,9 @@ name="qmailsmtpd" : ${qmailsmtpd_tcpflags:="-vRl0"} : ${qmailsmtpd_tcphost:="0"} : ${qmailsmtpd_tcpport:="25"} -: ${qmailsmtpd_datalimit:="146800640"} +: ${qmailsmtpd_datalimit:="180000000"} : ${qmailsmtpd_pretcpserver:=""} +: ${qmailsmtpd_tcpserver:="@PREFIX@/bin/tcpserver"} : ${qmailsmtpd_presmtpd:=""} : ${qmailsmtpd_smtpdcmd:="@PREFIX@/bin/qmail-smtpd"} : ${qmailsmtpd_postsmtpd:=""} @@ -32,7 +33,7 @@ rcvar=${name} required_files="@PKG_SYSCONFDIR@/control/concurrencyincoming" required_files="${required_files} @PKG_SYSCONFDIR@/tcp.smtp.cdb" required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts" -command="@PREFIX@/bin/tcpserver" +command="${qmailsmtpd_tcpserver}" procname=${name} start_precmd="qmailsmtpd_precmd" extra_commands="stat pause cont cdb" @@ -43,22 +44,22 @@ cdb_cmd="qmailsmtpd_cdb" 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 SMTP - # service. Use argv0(1) to set procname to "qmailsmtpd". if [ -f /etc/rc.subr ] && ! checkyesno qmailsmtpd_log; then qmailsmtpd_logcmd=${qmailsmtpd_nologcmd} fi - command="@SETENV@ - ${qmailsmtpd_postenv} + # 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 "qmailsmtpd". + command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailsmtpd_postenv} @PREFIX@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver} -@PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} +@PREFIX@/bin/argv0 ${qmailsmtpd_tcpserver} ${name} ${qmailsmtpd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.smtp.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/setuidgid @QMAIL_LOG_USER@ ${qmailsmtpd_logcmd}" +@PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailsmtpd_logcmd}" command_args="&" rc_flags="" } Index: pkgsrc/mail/qmail-run/files/qmailqread.sh diff -u pkgsrc/mail/qmail-run/files/qmailqread.sh:1.10 pkgsrc/mail/qmail-run/files/qmailqread.sh:1.11 --- pkgsrc/mail/qmail-run/files/qmailqread.sh:1.10 Mon Apr 10 15:04:56 2017 +++ pkgsrc/mail/qmail-run/files/qmailqread.sh Sat Jun 17 05:58:39 2017 @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailqread.sh,v 1.10 2017/04/10 15:04:56 schmonz Exp $ +# $NetBSD: qmailqread.sh,v 1.11 2017/06/17 05:58:39 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. @@ -16,6 +16,7 @@ name="qmailqread" : ${qmailqread_tcpflags:="-R1"} : ${qmailqread_tcphost:="127.0.0.1"} : ${qmailqread_tcpport:="20025"} +: ${qmailqread_tcpserver:="@PREFIX@/bin/tcpserver"} : ${qmailqread_log:="YES"} : ${qmailqread_logcmd:="logger -t nb${name} -p mail.info"} : ${qmailqread_nologcmd:="@PREFIX@/bin/multilog -*"} @@ -25,7 +26,7 @@ if [ -f /etc/rc.subr ]; then fi rcvar=${name} -command="@PREFIX@/bin/tcpserver" +command="${qmailqread_tcpserver}" procname=${name} start_precmd="qmailqread_precmd" @@ -34,14 +35,17 @@ qmailqread_precmd() if [ -f /etc/rc.subr ] && ! checkyesno qmailqread_log; then qmailqread_logcmd=${qmailqread_nologcmd} fi - command="@SETENV@ - ${qmailqread_postenv} -@PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} + # 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 "qmailqread". + command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailqread_postenv} +@PREFIX@/bin/argv0 ${qmailqread_tcpserver} ${name} ${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/setuidgid @QMAIL_LOG_USER@ ${qmailqread_logcmd}" +@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.9 pkgsrc/mail/qmail-run/files/qmailsend.sh:1.10 --- pkgsrc/mail/qmail-run/files/qmailsend.sh:1.9 Mon Apr 10 15:04:56 2017 +++ pkgsrc/mail/qmail-run/files/qmailsend.sh Sat Jun 17 05:58:39 2017 @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailsend.sh,v 1.9 2017/04/10 15:04:56 schmonz Exp $ +# $NetBSD: qmailsend.sh,v 1.10 2017/06/17 05:58:39 schmonz Exp $ # # @PKGNAME@ script to control qmail-send (local and outgoing mail). # @@ -44,7 +44,7 @@ qmailsend_precmd() if [ -f /etc/rc.subr ] && ! checkyesno qmailsend_log; then qmailsend_logcmd=${qmailsend_nologcmd} fi - command="@SETENV@ - ${qmailsend_postenv} + command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailsend_postenv} qmail-start '$qmailsend_defaultdelivery' ${qmailsend_logcmd}" command_args="&" --_----------=_1497679119222210--