Revision: 15035
http://gar.svn.sourceforge.net/gar/?rev=15035&view=rev
Author: j_arndt
Date: 2011-07-10 18:19:26 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
munin: update to 1.4.6
Modified Paths:
--------------
csw/mgar/pkg/munin/trunk/Makefile
csw/mgar/pkg/munin/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/munin/trunk/files/if.in.patch
csw/mgar/pkg/munin/trunk/files/if_err.in.patch
Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile 2011-07-10 11:12:47 UTC (rev 15034)
+++ csw/mgar/pkg/munin/trunk/Makefile 2011-07-10 18:19:26 UTC (rev 15035)
@@ -1,5 +1,5 @@
NAME = munin
-VERSION = 1.4.5
+VERSION = 1.4.6
CATEGORIES = apps
SPKG_DESC_CSWmuninmaster = master component of the graphical network and
system monitoring munin
@@ -29,8 +29,6 @@
PATCHFILES += munin-htaccess.in.patch
PATCHFILES += munin-graph.in.patch # match some paths to
/{etc|var}/opt/csw/munin
PATCHFILES += perl.patch # shebang correctly set
-PATCHFILES += if.in.patch # added support for Solaris 10
-PATCHFILES += if_err.in.patch # added support for Solaris 10
# We define upstream file regex so we can be notifed of new upstream software
release
UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums 2011-07-10 11:12:47 UTC (rev 15034)
+++ csw/mgar/pkg/munin/trunk/checksums 2011-07-10 18:19:26 UTC (rev 15035)
@@ -1 +1 @@
-4ae84b9a27b686c3819d8d7b51d8cb4c munin-1.4.5.tar.gz
+b54f320ba75f97ad2ddba3664f7158f2 munin-1.4.6.tar.gz
Deleted: csw/mgar/pkg/munin/trunk/files/if.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/if.in.patch 2011-07-10 11:12:47 UTC (rev
15034)
+++ csw/mgar/pkg/munin/trunk/files/if.in.patch 2011-07-10 18:19:26 UTC (rev
15035)
@@ -1,63 +0,0 @@
-From 961fedeafe1bbeb3e54d3077799b929c43ce0ef0 Mon Sep 17 00:00:00 2001
-From: Juergen Arndt <j...@opencsw.org>
-Date: Thu, 13 Jan 2011 21:08:25 +0100
-Subject: [PATCH] Fix for Solaris 10
-
----
- plugins/node.d.sunos/if_.in | 20 +++++++-------------
- 1 files changed, 7 insertions(+), 13 deletions(-)
-
-diff --git a/plugins/node.d.sunos/if_.in b/plugins/node.d.sunos/if_.in
-index d72a539..94c1316 100755
---- a/plugins/node.d.sunos/if_.in
-+++ b/plugins/node.d.sunos/if_.in
-@@ -56,7 +56,7 @@ fi
-
- if [ "$1" = "suggest" ]; then
- if [ -x /usr/bin/kstat ]; then
-- kstat -m link -p -s '/^rbytes$/' | awk -F: '{ print $3 }'
-+ kstat -p -m '/^(?!unix)/' -n '/^(?!mac$)/' -s rbytes64 | awk
-F: '{ print $3 }'
- exit 0
- else
- exit 1
-@@ -64,31 +64,25 @@ if [ "$1" = "suggest" ]; then
- fi
-
- if [ "$1" = "config" ]; then
--
- echo "graph_order rbytes obytes"
- echo "graph_title $INTERFACE traffic"
- echo 'graph_args --base 1000'
- echo 'graph_vlabel bits per ${graph_period} in (-) / out (+)'
- echo 'graph_category network'
- echo 'rbytes.label received'
-- echo 'rbytes.type COUNTER'
-- echo 'rbytes.max 2000000000'
-- echo 'rbytes.graph no'
-- echo 'rbytes.cdef rbytes,8,*'
-+ echo 'rbytes.type COUNTER'
-+ echo 'rbytes.graph no'
-+ echo 'rbytes.cdef rbytes,8,*'
- print_warning rbytes
- print_critical rbytes
-- echo 'obytes.label bps'
-+ echo 'obytes.label bps'
- echo 'obytes.type COUNTER'
- echo 'obytes.negative rbytes'
- echo 'obytes.cdef obytes,8,*'
-- echo 'obytes.max 2000000000'
- print_warning obytes
- print_critical obytes
- exit 0
- fi;
-
--kstat -p -n $INTERFACE -m link -s '/^[ro]bytes$/' | awk -F: '
--{
-- split($4, four, "\t")
-- print four[1] ".value", four[2]
--}'
-+kstat -p -m '/^(?!unix)/' -n $INTERFACE -s '*bytes64' | sed \
-+ 's/.*\(.bytes\)64./\1.value /'
---
-1.7.3.2
-
Deleted: csw/mgar/pkg/munin/trunk/files/if_err.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/if_err.in.patch 2011-07-10 11:12:47 UTC
(rev 15034)
+++ csw/mgar/pkg/munin/trunk/files/if_err.in.patch 2011-07-10 18:19:26 UTC
(rev 15035)
@@ -1,61 +0,0 @@
-From 74d1fa95cd376e87824fd1bca3cad196adeabf1f Mon Sep 17 00:00:00 2001
-From: Juergen Arndt <j...@opencsw.org>
-Date: Sun, 26 Sep 2010 17:15:57 +0200
-Subject: [PATCH] added support for Solaris 10
-
----
- plugins/node.d.sunos/if_err_.in | 27 +++++++++++++++++++++------
- 1 files changed, 21 insertions(+), 6 deletions(-)
-
-diff --git a/plugins/node.d.sunos/if_err_.in b/plugins/node.d.sunos/if_err_.in
-index 097ec1c..269e9d3 100755
---- a/plugins/node.d.sunos/if_err_.in
-+++ b/plugins/node.d.sunos/if_err_.in
-@@ -42,6 +42,7 @@ Unknown license
-
- . $MUNIN_LIBDIR/plugins/plugin.sh
-
-+SOLVERSION=`uname -r | awk -F. '{print $2}`
- INTERFACE=${0##*/if_err_}
-
- if [ "$1" = "autoconf" ]; then
-@@ -56,7 +57,11 @@ fi
-
- if [ "$1" = "suggest" ]; then
- if [ -x /usr/bin/kstat ]; then
-- kstat -m link -p -s '/^ierrors$/' | awk -F: '{ print $3 }'
-+ if [ $SOLVERSION -le 10 ]; then
-+ kstat -p -s '/^ierrors$/' | awk -F: '{ print $3 }'
-+ elif [ $SOLVERSION -gt 10 ]; then
-+ kstat -m link -p -s '/^ierrors$/' | awk -F: '{ print $3
}'
-+ fi
- exit 0
- else
- exit 1
-@@ -88,8 +93,18 @@ if [ "$1" = "config" ]; then
- exit 0
- fi;
-
--kstat -p -n $INTERFACE -m link -s '/^([io]errors|collisions)$/' | awk -F: '
--{
-- split($4, four, "\t")
-- print four[1] ".value", four[2]
--}'
-+if [ $SOLVERSION -le 10 ] # Solaris 10 and earlier
-+then
-+ kstat -p -n $INTERFACE -s '/^([io]errors|collisions)$/' | awk -F: '
-+ {
-+ split($4, four, "\t")
-+ print four[1] ".value", four[2]
-+ }'
-+elif [ $SOLVERSION -eq 11 ] # later than Solaris 10
-+then
-+ kstat -p -n $INTERFACE -m link -s '/^([io]errors|collisions)$/' | awk
-F: '
-+ {
-+ split($4, four, "\t")
-+ print four[1] ".value", four[2]
-+ }'
-+fi
---
-1.7.2.2
-
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
