Received: by mail.netbsd.org (Postfix, from userid 605) id 9104F84D40; Sun, 30 Jul 2017 05:45:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 23C6A84D3E for ; Sun, 30 Jul 2017 05:45:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 3B97Hhcv7gMG for ; Sun, 30 Jul 2017 05:45:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 29A9284CDE for ; Sun, 30 Jul 2017 05:45:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 250FBFACD; Sun, 30 Jul 2017 05:45:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_150139352315590" MIME-Version: 1.0 Date: Sun, 30 Jul 2017 05:45:23 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/sysutils/daemontools-run To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20170730054523.250FBFACD@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. --_----------=_150139352315590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sun Jul 30 05:45:23 UTC 2017 Modified Files: pkgsrc/sysutils/daemontools-run: Makefile pkgsrc/sysutils/daemontools-run/files: svscan.sh Log Message: Add PREFIX/{sbin,bin} to PATH, and don't hide diagnostics. Bump version. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/daemontools-run/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/daemontools-run/files/svscan.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_150139352315590 Content-Disposition: inline Content-Length: 1882 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/daemontools-run/Makefile diff -u pkgsrc/sysutils/daemontools-run/Makefile:1.2 pkgsrc/sysutils/daemontools-run/Makefile:1.3 --- pkgsrc/sysutils/daemontools-run/Makefile:1.2 Thu Jul 27 04:10:30 2017 +++ pkgsrc/sysutils/daemontools-run/Makefile Sun Jul 30 05:45:22 2017 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2017/07/27 04:10:30 schmonz Exp $ +# $NetBSD: Makefile,v 1.3 2017/07/30 05:45:22 schmonz Exp $ # -DISTNAME= daemontools-run-20170727 +DISTNAME= daemontools-run-20170730 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty Index: pkgsrc/sysutils/daemontools-run/files/svscan.sh diff -u pkgsrc/sysutils/daemontools-run/files/svscan.sh:1.1 pkgsrc/sysutils/daemontools-run/files/svscan.sh:1.2 --- pkgsrc/sysutils/daemontools-run/files/svscan.sh:1.1 Thu Jul 27 04:05:16 2017 +++ pkgsrc/sysutils/daemontools-run/files/svscan.sh Sun Jul 30 05:45:22 2017 @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: svscan.sh,v 1.1 2017/07/27 04:05:16 schmonz Exp $ +# $NetBSD: svscan.sh,v 1.2 2017/07/30 05:45:22 schmonz Exp $ # # @PKGNAME@ script to control svscan (service supervisor). # @@ -12,7 +12,7 @@ name="svscan" # User-settable rc.conf variables and their default values: -: ${svscan_postenv:="PATH=$PATH"} +: ${svscan_postenv:="PATH=@PREFIX@/sbin:@PREFIX@/bin:$PATH"} : ${svscan_datalimit:="3000000"} : ${svscan_servicedir:="@VARBASE@/service"} : ${svscan_log:="YES"} @@ -33,8 +33,7 @@ svscan_precmd() if [ -f /etc/rc.subr ] && ! checkyesno svscan_log; then svscan_logcmd=${svscan_nologcmd} fi - command="exec /dev/null 2>/dev/null -@PREFIX@/bin/pgrphack @SETENV@ - ${svscan_postenv} + command="@PREFIX@/bin/pgrphack @SETENV@ - ${svscan_postenv} @PREFIX@/bin/${name} ${svscan_servicedir} 2>&1 | @PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @DAEMONTOOLS_LOG_USER@ ${svscan_logcmd}" --_----------=_150139352315590--