CVS commit: pkgsrc/sysutils/daemontools-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Aug  4 18:44:15 UTC 2017

Modified Files:
        pkgsrc/sysutils/daemontools-run: Makefile
        pkgsrc/sysutils/daemontools-run/files: svscan.sh

Log Message:
There might be more than one svscan(8) on a system: for instance, non-
root users might run their own svscans. We want to signal only the
svscan process responsible for this service. Use argv0(1) to set
procname to "nbsvscan".

Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/daemontools-run/Makefile
cvs rdiff -u -r1.2 -r1.3 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.

Modified files:

Index: pkgsrc/sysutils/daemontools-run/Makefile
diff -u pkgsrc/sysutils/daemontools-run/Makefile:1.3 pkgsrc/sysutils/daemontools-run/Makefile:1.4
--- pkgsrc/sysutils/daemontools-run/Makefile:1.3        Sun Jul 30 05:45:22 2017
+++ pkgsrc/sysutils/daemontools-run/Makefile    Fri Aug  4 18:44:15 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2017/07/30 05:45:22 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2017/08/04 18:44:15 schmonz Exp $
 #
 
-DISTNAME=              daemontools-run-20170730
+DISTNAME=              daemontools-run-20170804
 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.2 pkgsrc/sysutils/daemontools-run/files/svscan.sh:1.3
--- pkgsrc/sysutils/daemontools-run/files/svscan.sh:1.2 Sun Jul 30 05:45:22 2017
+++ pkgsrc/sysutils/daemontools-run/files/svscan.sh     Fri Aug  4 18:44:15 2017
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: svscan.sh,v 1.2 2017/07/30 05:45:22 schmonz Exp $
+# $NetBSD: svscan.sh,v 1.3 2017/08/04 18:44:15 schmonz Exp $
 #
 # @PKGNAME@ script to control svscan (service supervisor).
 #
@@ -26,6 +26,7 @@ fi
 rcvar=${name}
 required_dirs="${svscan_servicedir}"
 command="@PREFIX@/bin/${name}"
+procname=nb${name}
 start_precmd="svscan_precmd"
 
 svscan_precmd()
@@ -33,8 +34,13 @@ svscan_precmd()
        if [ -f /etc/rc.subr ] && ! checkyesno svscan_log; then
                svscan_logcmd=${svscan_nologcmd}
        fi
+       # There might be more than one svscan(8) on a system: for instance,
+       # non-root users might run their own svscans. We want to signal only
+       # the svscan process responsible for this service. Use argv0(1) to
+       # set procname to "nbsvscan".
        command="@PREFIX@/bin/pgrphack @SETENV@ - ${svscan_postenv}
-@PREFIX@/bin/${name} ${svscan_servicedir}
+@PREFIX@/bin/argv0 @PREFIX@/bin/${name} ${procname}
+${svscan_servicedir}
 2>&1 |
 @PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @DAEMONTOOLS_LOG_USER@ ${svscan_logcmd}"
        command_args="&"