Sun Jul 30 05:45:23 2017 UTC ()
Add PREFIX/{sbin,bin} to PATH, and don't hide diagnostics. Bump version.


(schmonz)
diff -r1.2 -r1.3 pkgsrc/sysutils/daemontools-run/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/daemontools-run/files/svscan.sh
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/daemontools-run/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/daemontools-run/Makefile 2017/07/27 04:10:30 1.2
+++ pkgsrc/sysutils/daemontools-run/Makefile 2017/07/30 05:45:22 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.2 2017/07/27 04:10:30 schmonz Exp $ 1# $NetBSD: Makefile,v 1.3 2017/07/30 05:45:22 schmonz Exp $
2# 2#
3 3
4DISTNAME= daemontools-run-20170727 4DISTNAME= daemontools-run-20170730
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10COMMENT= Configures daemontools to run supervised services 10COMMENT= Configures daemontools to run supervised services
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13DEPENDS_DAEMONTOOLS= daemontools-[0-9]*:../../sysutils/daemontools 13DEPENDS_DAEMONTOOLS= daemontools-[0-9]*:../../sysutils/daemontools
14DEPENDS+= ${DEPENDS_DAEMONTOOLS} 14DEPENDS+= ${DEPENDS_DAEMONTOOLS}
15 15
16WRKSRC= ${WRKDIR} 16WRKSRC= ${WRKDIR}
17NO_BUILD= yes 17NO_BUILD= yes
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/daemontools-run/files/svscan.sh (expand / switch to unified diff)

--- pkgsrc/sysutils/daemontools-run/files/svscan.sh 2017/07/27 04:05:16 1.1
+++ pkgsrc/sysutils/daemontools-run/files/svscan.sh 2017/07/30 05:45:22 1.2
@@ -1,50 +1,49 @@ @@ -1,50 +1,49 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: svscan.sh,v 1.1 2017/07/27 04:05:16 schmonz Exp $ 3# $NetBSD: svscan.sh,v 1.2 2017/07/30 05:45:22 schmonz Exp $
4# 4#
5# @PKGNAME@ script to control svscan (service supervisor). 5# @PKGNAME@ script to control svscan (service supervisor).
6# 6#
7 7
8# PROVIDE: svscan 8# PROVIDE: svscan
9# REQUIRE: NETWORKING mountcritremote syslogd 9# REQUIRE: NETWORKING mountcritremote syslogd
10# BEFORE: DAEMON 10# BEFORE: DAEMON
11 11
12name="svscan" 12name="svscan"
13 13
14# User-settable rc.conf variables and their default values: 14# User-settable rc.conf variables and their default values:
15: ${svscan_postenv:="PATH=$PATH"} 15: ${svscan_postenv:="PATH=@PREFIX@/sbin:@PREFIX@/bin:$PATH"}
16: ${svscan_datalimit:="3000000"} 16: ${svscan_datalimit:="3000000"}
17: ${svscan_servicedir:="@VARBASE@/service"} 17: ${svscan_servicedir:="@VARBASE@/service"}
18: ${svscan_log:="YES"} 18: ${svscan_log:="YES"}
19: ${svscan_logcmd:="logger -t nb${name} -p daemon.info"} 19: ${svscan_logcmd:="logger -t nb${name} -p daemon.info"}
20: ${svscan_nologcmd:="@PREFIX@/bin/multilog -*"} 20: ${svscan_nologcmd:="@PREFIX@/bin/multilog -*"}
21 21
22if [ -f /etc/rc.subr ]; then 22if [ -f /etc/rc.subr ]; then
23 . /etc/rc.subr 23 . /etc/rc.subr
24fi 24fi
25 25
26rcvar=${name} 26rcvar=${name}
27required_dirs="${svscan_servicedir}" 27required_dirs="${svscan_servicedir}"
28command="@PREFIX@/bin/${name}" 28command="@PREFIX@/bin/${name}"
29start_precmd="svscan_precmd" 29start_precmd="svscan_precmd"
30 30
31svscan_precmd() 31svscan_precmd()
32{ 32{
33 if [ -f /etc/rc.subr ] && ! checkyesno svscan_log; then 33 if [ -f /etc/rc.subr ] && ! checkyesno svscan_log; then
34 svscan_logcmd=${svscan_nologcmd} 34 svscan_logcmd=${svscan_nologcmd}
35 fi 35 fi
36 command="exec </dev/null >/dev/null 2>/dev/null 36 command="@PREFIX@/bin/pgrphack @SETENV@ - ${svscan_postenv}
37@PREFIX@/bin/pgrphack @SETENV@ - ${svscan_postenv} 
38@PREFIX@/bin/${name} ${svscan_servicedir} 37@PREFIX@/bin/${name} ${svscan_servicedir}
392>&1 | 382>&1 |
40@PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @DAEMONTOOLS_LOG_USER@ ${svscan_logcmd}" 39@PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @DAEMONTOOLS_LOG_USER@ ${svscan_logcmd}"
41 command_args="&" 40 command_args="&"
42 rc_flags="" 41 rc_flags=""
43} 42}
44 43
45if [ -f /etc/rc.subr ]; then 44if [ -f /etc/rc.subr ]; then
46 load_rc_config $name 45 load_rc_config $name
47 run_rc_command "$1" 46 run_rc_command "$1"
48else 47else
49 @ECHO_N@ " ${name}" 48 @ECHO_N@ " ${name}"
50 svscan_precmd 49 svscan_precmd