Import of pkgsrc-2014Q1

sysutils/munin-node/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2013/05/31 12:42:02 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2014/03/11 14:34:40 jperkin Exp $
 #
 
 DISTNAME=	munin_${VER}
 VER=		1.3.2
 PKGNAME=	munin-node-${VER}
-PKGREVISION=	13
+PKGREVISION=	15
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=munin/}
 
@@ -99,6 +99,7 @@ MESSAGE_SUBST+=	VARBASE=${VARBASE:Q}
 BUILD_DEFS+=	VARBASE
 
 RCD_SCRIPTS+=	munin-node
+SMF_NAME=	munin
 
 EGDIR=		${PREFIX}/share/examples/munin
 

sysutils/munin-node/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2010/12/11 12:09:23 abs Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/03/11 14:05:15 jperkin Exp $
 lib/munin/plugins/acpi
 lib/munin/plugins/amavis
 lib/munin/plugins/apache_accesses
@@ -22,6 +22,7 @@ ${PLIST.linux}lib/munin/plugins/df_abs
 lib/munin/plugins/df_inode
 lib/munin/plugins/dhcpd3
 ${PLIST.linux}lib/munin/plugins/entropy
+${PLIST.netbsd}lib/munin/plugins/entropy
 lib/munin/plugins/exim_mailqueue
 lib/munin/plugins/exim_mailqueue_alt
 lib/munin/plugins/exim_mailstats
@@ -143,4 +144,3 @@ sbin/munin-node-configure
 sbin/munin-node-configure-snmp
 sbin/munin-run
 share/examples/munin/munin-node.conf
-share/examples/rc.d/munin-node

sysutils/munin-node/files/node/node.d.netbsd/entropy.in

@@ -0,0 +1,39 @@
+#!/bin/sh
+# 
+# Plugin to monitor available entropy
+#
+# Usage: Link or copy into /etc/munin/node.d/
+#
+# Magic markers (optional - only used by munin-config and some
+# installation scripts):
+#
+#%# family=auto
+#%# capabilities=autoconf
+
+
+
+if [ "$1" = "autoconf" ]; then
+	if [ -x /sbin/rndctl ]; then
+		echo yes
+		exit 0
+	else
+		echo no
+		exit 1
+	fi
+fi
+
+ 
+if [ "$1" = "config" ]; then
+	echo 'graph_title Available entropy'
+	echo 'graph_args --base 1000 -l 0'
+	echo 'graph_vlabel entropy (bytes)'
+	echo 'graph_scale no'
+	echo 'graph_category system'
+	echo 'graph_info This graph shows the amount of entropy available in the system.'
+	echo 'entropy.label entropy'
+	echo 'entropy.info The number of random bytes available. This is typically used by cryptographic applications.'
+	exit 0
+fi
+
+echo -n "entropy.value "
+/sbin/rndctl -s | /usr/bin/awk '/bits currently stored/ { print $1 }'

sysutils/munin-node/files/smf/manifest.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="@SMF_NAME@">
+  <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>
+    <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
+        <service_fmri value='file://@PKG_SYSCONFDIR@/munin-node.conf'/>
+    </dependency>
+    <method_context>
+      <method_environment>
+        <envvar name="PATH" value="@PREFIX@/bin:@PREFIX@/sbin:/usr/xpg4/bin:/usr/bin:/usr/sbin:/usr/sfw/bin:/usr/ccs/bin" />
+      </method_environment>
+    </method_context>
+    <exec_method type="method" name="start" exec="@PREFIX@/sbin/munin-node" timeout_seconds="60" />
+    <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
+    <property_group name="startd" type="framework">
+      <propval name="duration" type="astring" value="contract" />
+      <propval name="ignore_error" type="astring" value="core,signal" />
+    </property_group>
+    <property_group name="application" type="application">
+      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/munin-node.conf" />
+    </property_group>
+    <stability value="Evolving" />
+    <template>
+      <common_name>
+        <loctext xml:lang="C">Munin node</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>