CVS commit: pkgsrc/net/net-snmp

["Juraj Lutter" <otis%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   otis
Date:           Wed Nov  4 15:51:31 UTC 2020

Modified Files:
        pkgsrc/net/net-snmp: Makefile
        pkgsrc/net/net-snmp/files/smf: manifest.xml

Log Message:
net-snmp: Add SMF instance for snmptrapd


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 pkgsrc/net/net-snmp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/net-snmp/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/net/net-snmp/Makefile
diff -u pkgsrc/net/net-snmp/Makefile:1.132 pkgsrc/net/net-snmp/Makefile:1.133
--- pkgsrc/net/net-snmp/Makefile:1.132  Mon Aug 31 18:10:37 2020
+++ pkgsrc/net/net-snmp/Makefile        Wed Nov  4 15:51:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2020/08/31 18:10:37 wiz Exp $
+# $NetBSD: Makefile,v 1.133 2020/11/04 15:51:31 otis Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
@@ -106,6 +106,7 @@ CFLAGS.Darwin+=             -framework IOKit
 REQD_DIRS=     ${PREFIX}/share/snmp
 RCD_SCRIPTS=   snmpd snmptrapd
 SMF_NAME=      snmp
+SMF_INSTANCES= default snmptrapd
 
 USE_TOOLS+=            sh:run
 REPLACE_INTERPRETER+=  bash

Index: pkgsrc/net/net-snmp/files/smf/manifest.xml
diff -u pkgsrc/net/net-snmp/files/smf/manifest.xml:1.2 pkgsrc/net/net-snmp/files/smf/manifest.xml:1.3
--- pkgsrc/net/net-snmp/files/smf/manifest.xml:1.2      Wed Jun  8 10:02:26 2016
+++ pkgsrc/net/net-snmp/files/smf/manifest.xml  Wed Nov  4 15:51:31 2020
@@ -2,8 +2,6 @@
 <!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='milestone' grouping='require_all' restart_on='none' type='service'>
       <service_fmri value='svc:/milestone/sysconfig'/>
     </dependency>
@@ -25,21 +23,41 @@
     <dependency name='network' grouping='require_all' restart_on='restart' type='service'>
       <service_fmri value='svc:/milestone/network'/>
     </dependency>
-    <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
-      <service_fmri value='file://localhost/@PKG_SYSCONFDIR@/snmpd.conf'/>
-    </dependency>
-    <exec_method name='start' type='method' exec='@PREFIX@/sbin/snmpd -c %{config_file}' timeout_seconds='60'/>
-    <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
-    <property_group name="application" type="application">
-      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/snmpd.conf" />
-    </property_group>
-    <template>
-      <common_name>
-        <loctext xml:lang='C'>net-snmp SNMP daemon</loctext>
-      </common_name>
-      <documentation>
-        <manpage title='snmpd' section='1M' manpath='@PREFIX@/@PKGMANDIR@/'/>
-      </documentation>
-    </template>
+    <instance name='default' enabled='false'>
+      <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
+        <service_fmri value='file://localhost/@PKG_SYSCONFDIR@/snmpd.conf'/>
+      </dependency>
+      <exec_method name='start' type='method' exec='@PREFIX@/sbin/snmpd -c %{config_file}' timeout_seconds='60'/>
+      <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
+      <property_group name="application" type="application">
+        <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/snmpd.conf" />
+      </property_group>
+      <template>
+        <common_name>
+          <loctext xml:lang='C'>net-snmp SNMP daemon</loctext>
+        </common_name>
+        <documentation>
+          <manpage title='snmpd' section='1M' manpath='@PREFIX@/@PKGMANDIR@/'/>
+        </documentation>
+      </template>
+    </instance>
+    <instance name='snmptrapd' enabled='false'>
+      <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
+        <service_fmri value='file://localhost/@PKG_SYSCONFDIR@/snmptrapd.conf'/>
+      </dependency>
+      <exec_method name='start' type='method' exec='@PREFIX@/sbin/snmptrapd -c %{config_file}' timeout_seconds='60'/>
+      <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
+      <property_group name="application" type="application">
+        <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/snmptrapd.conf" />
+      </property_group>
+      <template>
+        <common_name>
+          <loctext xml:lang='C'>net-snmp SNMP trapper daemon</loctext>
+        </common_name>
+        <documentation>
+          <manpage title='snmpd' section='1M' manpath='@PREFIX@/@PKGMANDIR@/'/>
+        </documentation>
+      </template>
+    </instance>
   </service>
 </service_bundle>