Revision: 8205
http://gar.svn.sourceforge.net/gar/?rev=8205&view=rev
Author: j_arndt
Date: 2010-01-27 22:34:03 +0000 (Wed, 27 Jan 2010)
Log Message:
-----------
munin: update to 1.4.3
Modified Paths:
--------------
csw/mgar/pkg/munin/trunk/Makefile
csw/mgar/pkg/munin/trunk/checksums
csw/mgar/pkg/munin/trunk/files/makefile.config.diff
csw/mgar/pkg/munin/trunk/files/makefile.diff
csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff
csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff
csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff
csw/mgar/pkg/munin/trunk/files/perl.diff
csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff
Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile 2010-01-27 16:10:39 UTC (rev 8204)
+++ csw/mgar/pkg/munin/trunk/Makefile 2010-01-27 22:34:03 UTC (rev 8205)
@@ -1,5 +1,5 @@
GARNAME = munin
-GARVERSION = 1.4.0
+GARVERSION = 1.4.3
CATEGORIES = apps
SPKG_DESC_CSWmuninmaster = master component of the graphical network and
system monitoring munin
@@ -12,7 +12,7 @@
SF_PROJ = munin
MASTER_SITES = $(SF_MIRRORS)
-DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
DISTFILES += CSWmuninmaster.postinstall
DISTFILES += CSWmuninmaster.prototype CSWmuninmaster.postinstall
DISTFILES += CSWmuninnode.prototype cswmuninnode
@@ -96,6 +96,7 @@
@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
@ginstall -m 755 $(FILEDIR)/cswmuninnode
$(DESTDIR)/etc/opt/csw/init.d/cswmuninnode
@ginstall -d $(DESTDIR)/opt/csw/share/munin/fonts
- @ginstall -m 644 $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf
$(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf
- @rm $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf
+ #...@ginstall -m 644 $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf
$(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf
+ @ginstall -m 644 $(WORKSRC)/master/VeraMono.ttf
$(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf
+ #...@rm $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums 2010-01-27 16:10:39 UTC (rev 8204)
+++ csw/mgar/pkg/munin/trunk/checksums 2010-01-27 22:34:03 UTC (rev 8205)
@@ -7,11 +7,11 @@
e701d132ba0b6f3dcc90190860f5aa6b download/apache-munin.conf.CSW
31aec7f9a9a452cc6c75c1096c937fdd download/cswmuninnode
50fa4a545f878d79e219891c6ac8d2d2 download/cswusergroup
-fd380babe0e8adeb2fdceb2ff38c8e14 download/makefile.config.diff
-81ce1cb57e8331fad745635ad9f2debb download/makefile.diff
-e5afa54ed754c43b0b53c57ebac31915 download/munin-graph.in.diff
-a0754324697266f8ae3530fcbdf885c0 download/munin-node.conf.in.diff
-fcecf75276f36a96027976fd7d0dfdf9 download/munin.conf.in.diff
-95be0e6eb98c4c7b2a4f2f922b358414 download/munin_1.4.0.tar.gz
-9dc05eea4250fc1bc61436493ab9de75 download/perl.diff
-7cb3378da78576a51cacd5b753134ccf download/sunos_memory.in.diff
+43264e38738fb609a453d22592f4b010 download/makefile.config.diff
+07148c7b093dea95f7fcda8bcac53059 download/makefile.diff
+229646facc4e2bca6511b20b3e5eb73f download/munin-1.4.3.tar.gz
+523afc4767b0548a93bc7b47fc5996ec download/munin-graph.in.diff
+0e7e3ae081db51996eb5c01a4f08139f download/munin-node.conf.in.diff
+fed7c87522fed3224eac8cb507ddf8d0 download/munin.conf.in.diff
+bdb45d45fdf901092e6a5c4711e8223c download/perl.diff
+3a39524074d4581373fa20cd5ff5e5b8 download/sunos_memory.in.diff
Modified: csw/mgar/pkg/munin/trunk/files/makefile.config.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2010-01-27 16:10:39 UTC
(rev 8204)
+++ csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2010-01-27 22:34:03 UTC
(rev 8205)
@@ -1,6 +1,6 @@
-diff --speed-large-files --minimal -Nru munin-1.4.0.orig/Makefile.config
munin-1.4.0/Makefile.config
---- munin-1.4.0.orig/Makefile.config 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0/Makefile.config 2009-11-28 16:51:45.380818848 +0100
+diff --speed-large-files --minimal -Nru munin-1.4.3.orig/Makefile.config
munin-1.4.3/Makefile.config
+--- munin-1.4.3.orig/Makefile.config 2009-12-30 13:55:56.000000000 +0100
++++ munin-1.4.3/Makefile.config 2010-01-27 12:26:29.445565248 +0100
@@ -14,13 +14,15 @@
# and LOGDIR as subdirectories. Today, DBDIR contains configured
# domains, as well as PLUGSTATE, and we risk collisions.
Modified: csw/mgar/pkg/munin/trunk/files/makefile.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/makefile.diff 2010-01-27 16:10:39 UTC
(rev 8204)
+++ csw/mgar/pkg/munin/trunk/files/makefile.diff 2010-01-27 22:34:03 UTC
(rev 8205)
@@ -1,6 +1,6 @@
-diff --speed-large-files --minimal -Nru munin-1.4.0.orig/Makefile
munin-1.4.0/Makefile
---- munin-1.4.0.orig/Makefile 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0/Makefile 2009-11-28 18:13:47.250778081 +0100
+diff --speed-large-files --minimal -Nru munin-1.4.3.orig/Makefile
munin-1.4.3/Makefile
+--- munin-1.4.3.orig/Makefile 2009-12-30 13:55:56.000000000 +0100
++++ munin-1.4.3/Makefile 2010-01-27 22:01:51.419441374 +0100
@@ -49,8 +49,8 @@
# This removes the installed config so that the next install-pass installs
# a new config. Target _only_ suitable for maintainers.
@@ -12,7 +12,7 @@
tags:
-rm -f TAGS
-@@ -66,50 +66,47 @@
+@@ -66,52 +66,51 @@
install-pre: Makefile Makefile.config
@$(CHECKUSER)
@@ -35,8 +35,6 @@
- mkdir -p $(HTMLDIR)
- mkdir -p $(DBDIR)
- mkdir -p $(CGIDIR)
--
-- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
+ mkdir -p $(DESTDIR)$(CONFDIR)/templates
+ mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial
+ mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d
@@ -48,6 +46,11 @@
+ mkdir -p $(DESTDIR)$(DBDIR)
+ mkdir -p $(DESTDIR)$(CGIDIR)
+- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
+- $(CHMOD) 0755 $(DBDIR)
++ #$(CHOWN) $(USER) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(DBDIR)
++ $(CHMOD) 0755 $(DESTDIR)$(DBDIR)
+
for p in master/www/*.tmpl master/www/*.png master/www/*.css
resources/favicon.ico; do \
- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
+ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
@@ -59,9 +62,11 @@
done
- $(INSTALL) -m 0644 master/www/definitions.html $(CONFDIR)/templates/
-- $(INSTALL) -m 0755 master/VeraMono.ttf $(LIBDIR)/
+- $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/
+- $(INSTALL) -m 0755 master/DejaVuSans.ttf $(LIBDIR)/
+ $(INSTALL) -m 0644 master/www/definitions.html
$(DESTDIR)$(CONFDIR)/templates/
-+ $(INSTALL) -m 0755 master/VeraMono.ttf $(DESTDIR)$(LIBDIR)/
++ $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/
++ $(INSTALL) -m 0755 master/DejaVuSans.ttf $(DESTDIR)$(LIBDIR)/
- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644
build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644
build/master/munin.conf $(CONFDIR)/
@@ -91,22 +96,23 @@
# ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
# GENERIC ONES
-@@ -120,28 +117,24 @@
+@@ -122,28 +121,24 @@
install-plugins-prime: install-plugins build $(PLUGINS) Makefile
Makefile.config
@$(CHECKGROUP)
- mkdir -p $(CONFDIR)/plugins
- mkdir -p $(CONFDIR)/plugin-conf.d
- mkdir -p $(LIBDIR)/plugins
+- mkdir -p $(PLUGSTATE)
+-
+- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
+- $(CHMOD) 0775 $(PLUGSTATE)
+- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
+ mkdir -p $(DESTDIR)$(CONFDIR)/plugins
+ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
+ mkdir -p $(DESTDIR)$(LIBDIR)/plugins
- mkdir -p $(PLUGSTATE)
++ mkdir -p $(DESTDIR)$(PLUGSTATE)
-- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
-- $(CHMOD) 0775 $(PLUGSTATE)
-- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
--
for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
if test -f "$$p" ; then \
echo Installing $$p; \
@@ -129,7 +135,7 @@
#TODO:
# configure plugins. Or not. Better done under the direction of the installer
-@@ -150,30 +143,30 @@
+@@ -152,30 +147,30 @@
install-node-prime: install-node-pre install-node
install-node-pre: build/node/munin-node.conf install-pre
@@ -175,7 +181,49 @@
######################################################################
-@@ -370,20 +363,20 @@
+@@ -189,28 +184,28 @@
+ @echo "$< -> $@"
+ @mkdir -p build/`dirname $<`
+ @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \
+- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \
+- -e 's|@@BINDIR@@|$(BINDIR)|g' \
+- -e 's|@@SBINDIR@@|$(SBINDIR)|g' \
+- -e 's|@@DOCDIR@@|$(DOCDIR)|g' \
+- -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
++ -e 's|@@CONFDIR@@|$(DESTDIR)$(CONFDIR)|g' \
++ -e 's|@@BINDIR@@|$(DESTDIR)$(BINDIR)|g' \
++ -e 's|@@SBINDIR@@|$(DESTDIR)$(SBINDIR)|g' \
++ -e 's|@@DOCDIR@@|$(DESTDIR)$(DOCDIR)|g' \
++ -e 's|@@LIBDIR@@|$(DESTDIR)$(LIBDIR)|g' \
+ -e 's|@@MANDIR@@|$(MANDIR)|g' \
+- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \
+- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \
+- -e 's|@@DBDIR@@|$(DBDIR)|g' \
+- -e 's|@@STATEDIR@@|$(STATEDIR)|g' \
++ -e 's|@@LOGDIR@@|$(DESTDIR)$(LOGDIR)|g' \
++ -e 's|@@HTMLDIR@@|$(DESTDIR)$(HTMLDIR)|g' \
++ -e 's|@@DBDIR@@|$(DESTDIR)$(DBDIR)|g' \
++ -e 's|@@STATEDIR@@|$(DESTDIR)$(STATEDIR)|g' \
+ -e 's|@@PERL@@|$(PERL)|g' \
+- -e 's|@@PERLLIB@@|$(PERLLIB)|g' \
++ -e 's|@@PERLLIB@@|$(DESTDIR)$(PERLLIB)|g' \
+ -e 's|@@PYTHON@@|$(PYTHON)|g' \
+ -e 's|@@RUBY@@|$(RUBY)|g' \
+ -e 's|@@JAVARUN@@|$(JAVARUN)|g' \
+- -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g' \
++ -e 's|@@JAVALIBDIR@@|$(DESTDIR)$(JAVALIBDIR)|g' \
+ -e 's|@@OSTYPE@@|$(OSTYPE)|g' \
+ -e 's|@@HOSTNAME@@|$(HOSTNAME)|g' \
+ -e 's|@@MKTEMP@@|$(MKTEMP)|g' \
+ -e 's|@@VERSION@@|$(VERSION)|g' \
+- -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g' \
+- -e 's|@@CGIDIR@@|$(CGIDIR)|g' \
++ -e 's|@@PLUGSTATE@@|$(DESTDIR)$(PLUGSTATE)|g' \
++ -e 's|@@CGIDIR@@|$(DESTDIR)$(CGIDIR)|g' \
+ -e 's|@@USER@@|$(USER)|g' \
+ -e 's|@@GROUP@@|$(GROUP)|g' \
+ -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g' \
+@@ -354,20 +349,20 @@
$(MAKE) $@ CONFIG=t/Makefile.config
else
test_plugins = id_default id_root env
@@ -204,7 +252,7 @@
echo 'Done?'
t/install:
-@@ -407,12 +400,12 @@
+@@ -391,12 +386,12 @@
# can't seem to find a way to persuade it to write otherwhere.
install-%: %/Build
cd $* && $(PERL) Build install \
Modified: csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2010-01-27 16:10:39 UTC
(rev 8204)
+++ csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2010-01-27 22:34:03 UTC
(rev 8205)
@@ -1,6 +1,6 @@
-diff --speed-large-files --minimal -Nru
munin-1.4.0.orig/master/_bin/munin-graph.in
munin-1.4.0/master/_bin/munin-graph.in
---- munin-1.4.0.orig/master/_bin/munin-graph.in 2009-11-27
12:17:18.000000000 +0100
-+++ munin-1.4.0/master/_bin/munin-graph.in 2009-11-28 13:41:02.135025435
+0100
+diff --speed-large-files --minimal -Nru
munin-1.4.3.orig/master/_bin/munin-graph.in
munin-1.4.3/master/_bin/munin-graph.in
+--- munin-1.4.3.orig/master/_bin/munin-graph.in 2009-12-30
13:55:56.000000000 +0100
++++ munin-1.4.3/master/_bin/munin-graph.in 2010-01-27 15:37:25.532990968
+0100
@@ -135,10 +135,10 @@
=head1 FILES
Modified: csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2010-01-27
16:10:39 UTC (rev 8204)
+++ csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2010-01-27
22:34:03 UTC (rev 8205)
@@ -1,6 +1,17 @@
-diff --speed-large-files --minimal -Nru
munin-1.4.0.orig/node/munin-node.conf.in munin-1.4.0/node/munin-node.conf.in
---- munin-1.4.0.orig/node/munin-node.conf.in 2009-11-27 12:17:13.000000000
+0100
-+++ munin-1.4.0/node/munin-node.conf.in 2009-11-28 11:59:12.681167885
+0100
+diff --speed-large-files --minimal -Nru
munin-1.4.3.orig/node/munin-node.conf.in munin-1.4.3/node/munin-node.conf.in
+--- munin-1.4.3.orig/node/munin-node.conf.in 2009-12-30 13:55:56.000000000
+0100
++++ munin-1.4.3/node/munin-node.conf.in 2010-01-27 22:15:03.160953219
+0100
+@@ -3,8 +3,8 @@
+ #
+
+ log_level 4
+-log_file @@LOGDIR@@/munin-node.log
+-pid_file @@STATEDIR@@/munin-node.pid
++log_file /var/opt/csw/munin/munin-node.log
++pid_file /var/opt/csw/munin/munin-node.pid
+
+ background 1
+ setsid 1
@@ -26,7 +26,7 @@
# Set this if the client doesn't report the correct hostname when
# telnetting to localhost, port 4949
Modified: csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2010-01-27 16:10:39 UTC
(rev 8204)
+++ csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2010-01-27 22:34:03 UTC
(rev 8205)
@@ -1,6 +1,6 @@
-diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/munin.conf.in
munin-1.4.0/master/munin.conf.in
---- munin-1.4.0.orig/master/munin.conf.in 2009-11-27 12:17:18.000000000
+0100
-+++ munin-1.4.0/master/munin.conf.in 2009-11-28 12:03:14.865737210 +0100
+diff --speed-large-files --minimal -Nru munin-1.4.3.orig/master/munin.conf.in
munin-1.4.3/master/munin.conf.in
+--- munin-1.4.3.orig/master/munin.conf.in 2009-12-30 13:55:56.000000000
+0100
++++ munin-1.4.3/master/munin.conf.in 2010-01-27 15:26:42.127815407 +0100
@@ -57,7 +57,7 @@
#contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
Modified: csw/mgar/pkg/munin/trunk/files/perl.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/perl.diff 2010-01-27 16:10:39 UTC (rev
8204)
+++ csw/mgar/pkg/munin/trunk/files/perl.diff 2010-01-27 22:34:03 UTC (rev
8205)
@@ -1,42 +1,42 @@
-diff --speed-large-files --minimal -Nru
munin-1.4.0.orig/master/_bin/munin-update.in
munin-1.4.0/master/_bin/munin-update.in
---- munin-1.4.0.orig/master/_bin/munin-update.in 2009-11-27
12:17:18.000000000 +0100
-+++ munin-1.4.0/master/_bin/munin-update.in 2009-11-28 19:30:06.713647230
+0100
+diff --speed-large-files --minimal -Nru
munin-1.4.3.orig/master/_bin/munin-update.in
munin-1.4.3/master/_bin/munin-update.in
+--- munin-1.4.3.orig/master/_bin/munin-update.in 2009-12-30
13:55:56.000000000 +0100
++++ munin-1.4.3/master/_bin/munin-update.in 2010-01-27 15:45:19.655925252
+0100
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
-+#!@@PERL@@
++#!/opt/csw/bin/perl
use warnings;
use strict;
-diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/bin/munindoc
munin-1.4.0/node/bin/munindoc
---- munin-1.4.0.orig/node/bin/munindoc 2009-11-27 12:17:13.000000000 +0100
-+++ munin-1.4.0/node/bin/munindoc 2009-11-28 19:28:26.453064302 +0100
+diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/bin/munindoc
munin-1.4.3/node/bin/munindoc
+--- munin-1.4.3.orig/node/bin/munindoc 2009-12-30 13:55:56.000000000 +0100
++++ munin-1.4.3/node/bin/munindoc 2010-01-27 15:45:11.095300986 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
-+#!/opt/csw/bin/perl -w
++#/opt/csw/bin/perl -w
# -*- perl -*-
#
# This script provides the basis for a plugin documentation system for
-diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/sbin/munin-node
munin-1.4.0/node/sbin/munin-node
---- munin-1.4.0.orig/node/sbin/munin-node 2009-11-27 12:17:13.000000000
+0100
-+++ munin-1.4.0/node/sbin/munin-node 2009-11-28 19:28:26.455172374 +0100
+diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/sbin/munin-node
munin-1.4.3/node/sbin/munin-node
+--- munin-1.4.3.orig/node/sbin/munin-node 2009-12-30 13:55:56.000000000
+0100
++++ munin-1.4.3/node/sbin/munin-node 2010-01-27 15:45:47.944337631 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!/opt/csw/bin/perl -wT
# -*- cperl -*-
#
# Copyright (C) 2002-2009 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
-diff --speed-large-files --minimal -Nru
munin-1.4.0.orig/node/sbin/munin-node-configure
munin-1.4.0/node/sbin/munin-node-configure
---- munin-1.4.0.orig/node/sbin/munin-node-configure 2009-11-27
12:17:13.000000000 +0100
-+++ munin-1.4.0/node/sbin/munin-node-configure 2009-11-28 19:28:26.457840168
+0100
+diff --speed-large-files --minimal -Nru
munin-1.4.3.orig/node/sbin/munin-node-configure
munin-1.4.3/node/sbin/munin-node-configure
+--- munin-1.4.3.orig/node/sbin/munin-node-configure 2009-12-30
13:55:56.000000000 +0100
++++ munin-1.4.3/node/sbin/munin-node-configure 2010-01-27 15:46:18.906920790
+0100
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/opt/csw/bin/perl -w
# -*- cperl -*-
#
# Copyright (C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt.
-diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/sbin/munin-run
munin-1.4.0/node/sbin/munin-run
---- munin-1.4.0.orig/node/sbin/munin-run 2009-11-27 12:17:13.000000000
+0100
-+++ munin-1.4.0/node/sbin/munin-run 2009-11-28 19:28:26.459939564 +0100
+diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/sbin/munin-run
munin-1.4.3/node/sbin/munin-run
+--- munin-1.4.3.orig/node/sbin/munin-run 2009-12-30 13:55:56.000000000
+0100
++++ munin-1.4.3/node/sbin/munin-run 2010-01-27 15:46:36.558632214 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!/opt/csw/bin/perl -wT
Modified: csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2010-01-27 16:10:39 UTC
(rev 8204)
+++ csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2010-01-27 22:34:03 UTC
(rev 8205)
@@ -1,17 +1,17 @@
-diff --speed-large-files --minimal -Nru
munin-1.4.0.orig/plugins/node.d.sunos/memory.in
munin-1.4.0/plugins/node.d.sunos/memory.in
---- munin-1.4.0.orig/plugins/node.d.sunos/memory.in 2009-11-27
12:17:12.000000000 +0100
-+++ munin-1.4.0/plugins/node.d.sunos/memory.in 2009-11-28 11:53:12.048911726
+0100
-@@ -15,7 +15,7 @@
+diff --speed-large-files --minimal -Nru
munin-1.4.3.orig/plugins/node.d.sunos/memory.in
munin-1.4.3/plugins/node.d.sunos/memory.in
+--- munin-1.4.3.orig/plugins/node.d.sunos/memory.in 2009-12-30
13:55:56.000000000 +0100
++++ munin-1.4.3/plugins/node.d.sunos/memory.in 2010-01-27 15:08:58.425391715
+0100
+@@ -17,7 +17,7 @@
+ The following shows the default settings for this plugin:
- =item top
+ [memory]
+- env.top /usr/local/bin/top
++ env.top /opt/csw/bin/top
--The path to "top" (Default: "/usr/local/bin/top")
-+The path to "top" (Default: "/opt/csw/bin/top")
+ You can also set warning and critical limits with these env settings:
- =back
+@@ -61,7 +61,7 @@
-@@ -50,7 +50,7 @@
-
. $MUNIN_LIBDIR/plugins/plugin.sh
-TOP=${top:-/usr/local/bin/top}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
