CVS commit: pkgsrc/sysutils/daemontools-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Sep  4 17:51:11 UTC 2023

Modified Files:
        pkgsrc/sysutils/daemontools-run: Makefile
        pkgsrc/sysutils/daemontools-run/files: svscan.sh
Added Files:
        pkgsrc/sysutils/daemontools-run: DEINSTALL INSTALL
        pkgsrc/sysutils/daemontools-run/files/smf: manifest.xml

Log Message:
daemontools-run: update to 20230903.

pkgsrc changes:

- Create a /service symlink, if possible, pointing to ${VARBASE}/service
- Change default rc.d svscan_servicedir to "/service"
- Allow daemontools-encore to satisfy the dependency
- Move SMF configuration here (from daemontools)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/daemontools-run/DEINSTALL \
    pkgsrc/sysutils/daemontools-run/INSTALL
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/daemontools-run/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/daemontools-run/files/svscan.sh
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/daemontools-run/files/smf/manifest.xml

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.10 pkgsrc/sysutils/daemontools-run/Makefile:1.11
--- pkgsrc/sysutils/daemontools-run/Makefile:1.10       Mon Aug 19 22:11:44 2019
+++ pkgsrc/sysutils/daemontools-run/Makefile    Mon Sep  4 17:51:10 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2019/08/19 22:11:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.11 2023/09/04 17:51:10 schmonz Exp $
 #
 
-DISTNAME=              daemontools-run-20190819
+DISTNAME=              daemontools-run-20230904
 CATEGORIES=            sysutils
 MASTER_SITES=          # empty
 DISTFILES=             # empty
@@ -10,7 +10,7 @@ MAINTAINER=           schmonz%NetBSD.org@localhost
 COMMENT=               Configures daemontools to run supervised services
 LICENSE=               2-clause-bsd
 
-DEPENDS+=              daemontools-[0-9]*:../../sysutils/daemontools
+DEPENDS+=              {daemontools>=0.76nb5,daemontools-encore-[0-9]*}:../../sysutils/daemontools
 
 WRKSRC=                        ${WRKDIR}
 NO_BUILD=              yes
@@ -22,6 +22,7 @@ PKG_USERS_VARS+=      DAEMONTOOLS_LOG_USER
 PKG_GROUPS+=           ${DAEMONTOOLS_GROUP}
 PKG_USERS+=            ${DAEMONTOOLS_LOG_USER}:${DAEMONTOOLS_GROUP}
 RCD_SCRIPTS=           svscan
+SMF_NAME=              svscan
 FILES_SUBST+=          VARBASE=${VARBASE:Q}
 FILES_SUBST+=          DAEMONTOOLS_LOG_USER=${DAEMONTOOLS_LOG_USER:Q}
 FILES_SUBST+=          PKGNAME=${PKGNAME:Q}

Index: pkgsrc/sysutils/daemontools-run/files/svscan.sh
diff -u pkgsrc/sysutils/daemontools-run/files/svscan.sh:1.5 pkgsrc/sysutils/daemontools-run/files/svscan.sh:1.6
--- pkgsrc/sysutils/daemontools-run/files/svscan.sh:1.5 Sat Aug  5 15:20:03 2017
+++ pkgsrc/sysutils/daemontools-run/files/svscan.sh     Mon Sep  4 17:51:11 2023
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: svscan.sh,v 1.5 2017/08/05 15:20:03 schmonz Exp $
+# $NetBSD: svscan.sh,v 1.6 2023/09/04 17:51:11 schmonz Exp $
 #
 # @PKGNAME@ script to control svscan (service supervisor).
 #
@@ -14,7 +14,7 @@ name="svscan"
 # User-settable rc.conf variables and their default values:
 : ${svscan_postenv:="PATH=@PREFIX@/sbin:@PREFIX@/bin:$PATH"}
 : ${svscan_datalimit:="3000000"}
-: ${svscan_servicedir:="@VARBASE@/service"}
+: ${svscan_servicedir:="/service"}
 : ${svscan_log:="YES"}
 : ${svscan_logcmd:="logger -t nb${name} -p daemon.info"}
 : ${svscan_nologcmd:="@PREFIX@/bin/multilog -*"}

Added files:

Index: pkgsrc/sysutils/daemontools-run/DEINSTALL
diff -u /dev/null pkgsrc/sysutils/daemontools-run/DEINSTALL:1.1
--- /dev/null   Mon Sep  4 17:51:11 2023
+++ pkgsrc/sysutils/daemontools-run/DEINSTALL   Mon Sep  4 17:51:10 2023
@@ -0,0 +1,10 @@
+# $NetBSD: DEINSTALL,v 1.1 2023/09/04 17:51:10 schmonz Exp $
+
+case "${STAGE}" in
+
+DEINSTALL)
+       ${RM} -f /service
+
+       ;;
+
+esac
Index: pkgsrc/sysutils/daemontools-run/INSTALL
diff -u /dev/null pkgsrc/sysutils/daemontools-run/INSTALL:1.1
--- /dev/null   Mon Sep  4 17:51:11 2023
+++ pkgsrc/sysutils/daemontools-run/INSTALL     Mon Sep  4 17:51:10 2023
@@ -0,0 +1,12 @@
+# $NetBSD: INSTALL,v 1.1 2023/09/04 17:51:10 schmonz Exp $
+
+VARBASE=@VARBASE@
+
+case "${STAGE}" in
+
+POST-INSTALL)
+       ${LN} -s ${VARBASE}/service             /service
+
+       ;;
+
+esac

Index: pkgsrc/sysutils/daemontools-run/files/smf/manifest.xml
diff -u /dev/null pkgsrc/sysutils/daemontools-run/files/smf/manifest.xml:1.1
--- /dev/null   Mon Sep  4 17:51:11 2023
+++ pkgsrc/sysutils/daemontools-run/files/smf/manifest.xml      Mon Sep  4 17:51:11 2023
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="export">
+  <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
+    <create_default_instance enabled="false"/>
+    <single_instance/>
+    <dependency name="network" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/milestone/network:default"/>
+    </dependency>
+    <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/system/filesystem/local"/>
+    </dependency>
+    <exec_method type="method" name="start" exec="@PREFIX@/bin/svscanboot" timeout_seconds="60">
+       <method_context>
+        <method_environment>
+          <envvar name="PATH" value="@PREFIX@/sbin:@PREFIX@/bin:/sbin:/usr/sbin:/usr/bin"/>
+        </method_environment>
+       </method_context>
+    </exec_method>
+    <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60"/>
+    <property_group name="application" type="application"></property_group>
+    <property_group name="startd" type="framework">
+      <propval name="duration" type="astring" value="child"/>
+      <propval name="ignore_error" type="astring" value="core,signal"/>
+    </property_group>
+    <template>
+      <common_name>
+        <loctext xml:lang="C">Scan /service directory to start and monitor a collection of services.</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>