Author: qwiat Date: Sat Sep 4 21:37:06 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.4.5 - fixed patch
---- Files affected: packages/munin: munin.spec (1.89 -> 1.90) , munin-plugins.patch (1.43 -> 1.44) ---- Diffs: ================================================================ Index: packages/munin/munin.spec diff -u packages/munin/munin.spec:1.89 packages/munin/munin.spec:1.90 --- packages/munin/munin.spec:1.89 Wed Feb 3 17:27:43 2010 +++ packages/munin/munin.spec Sat Sep 4 23:37:00 2010 @@ -10,12 +10,12 @@ Summary: Munin - the Linpro RRD data agent Summary(pl.UTF-8): Munin - agent danych RRD Linpro Name: munin -Version: 1.4.3 -Release: 3 +Version: 1.4.5 +Release: 1 License: GPL Group: Applications/WWW Source0: http://dl.sourceforge.net/munin/%{name}-%{version}.tar.gz -# Source0-md5: 229646facc4e2bca6511b20b3e5eb73f +# Source0-md5: 4ae84b9a27b686c3819d8d7b51d8cb4c Source1: %{name}-node.init Source2: %{name}.cron Source3: %{name}-apache.conf @@ -301,6 +301,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.90 2010/09/04 21:37:00 qwiat +- up to 1.4.5 +- fixed patch + Revision 1.89 2010/02/03 16:27:43 baggins - rel 3 - don't package fonts, R: fonts-TTF-DejaVu (rrdtool 1.3 works this way) ================================================================ Index: packages/munin/munin-plugins.patch diff -u packages/munin/munin-plugins.patch:1.43 packages/munin/munin-plugins.patch:1.44 --- packages/munin/munin-plugins.patch:1.43 Wed Feb 3 16:44:11 2010 +++ packages/munin/munin-plugins.patch Sat Sep 4 23:37:01 2010 @@ -280,15 +280,16 @@ diff -Naur munin-1.3.4/plugins/node.d/mailman.in munin-1.3.4-p/plugins/node.d/mailman.in --- munin-1.3.4/plugins/node.d/mailman.in Sat Mar 8 02:42:39 2008 +++ munin-1.3.4-p/plugins/node.d/mailman.in Fri Apr 4 11:13:06 2008 -@@ -24,7 +24,7 @@ +@@ -26,7 +26,7 @@ - =cut + use Munin::Common::Defaults; --$statefile = "$MUNIN_PLUGSTATE/munin-mailman-log.state"; -+$statefile = "$ENV{MUNIN_PLUGSTATE}/munin-mailman-log.state"; +-$statefile = "$Munin::Common::Defaults::MUNIN_PLUGSTATE/munin-mailman-log.state"; ++$statefile = "$Munin::Common::Defaults::$ENV{MUNIN_PLUGSTATE}/munin-mailman-log.state"; $pos = undef; $posts = 0; $members = 0; + @@ -32,7 +32,12 @@ # System paths (as known to mailman-limacute $logfile = "/var/log/mailman/post"; @@ -811,17 +812,15 @@ fi exit 0 fi -@@ -84,8 +84,8 @@ - exit 0 - fi; - --iptables -L ${INPUT} -v -n -x | grep -m1 "$IP " | -+/usr/sbin/iptables -L ${INPUT} -v -n -x | grep -m1 "$IP " | - awk "{ print \"in.value \" \$2 }" - --iptables -L ${OUTPUT} -v -n -x | grep -m1 "$IP " | -+/usr/sbin/iptables -L ${OUTPUT} -v -n -x | grep -m1 "$IP " | - awk "{ print \"out.value \" \$2 }" +@@ -173,6 +173,6 @@ + # Escape .'s so they don't match _everything_? + IP="$( echo $IP | sed 's~\.~\\.~g' )" + +-iptables -L ${INPUT} -v -n -x | awk "/$IP"'[ /]/ { print "in.value " $2; exit 0; }' ++/usr/sbin/iptables -L ${INPUT} -v -n -x | awk "/$IP"'[ /]/ { print "in.value " $2; exit 0; }' + +-iptables -L ${OUTPUT} -v -n -x | awk "/$IP"'[ /]/ { print "out.value " $2; exit 0; }' ++/usr/sbin/iptables -L ${OUTPUT} -v -n -x | awk "/$IP"'[ /]/ { print "out.value " $2; exit 0; }' --- munin-1.3.4/plugins/node.d.linux/vlan_inetuse_.in~ 2008-03-08 02:42:39.000000000 +0100 +++ munin-1.3.4/plugins/node.d.linux/vlan_inetuse_.in 2008-05-20 13:00:50.000000000 +0200 @@ -37,8 +37,8 @@ @@ -898,7 +897,7 @@ mktempfile () { -- cmd=$(echo $MUNIN_MKTEMP | sed s/\\$1/$1/) +- cmd=`echo $MUNIN_MKTEMP | sed s/\\$1/$1/` - $cmd + mktemp -p /tmp/ $1 } @@ -908,7 +907,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Amavis filter statistics' -- echo 'graph_vlabel #' +- echo 'graph_vlabel \#' + echo 'graph_vlabel mails' echo 'graph_category antivirus' echo 'virus.label virus' @@ -1319,15 +1318,6 @@ ); -@@ -296,7 +296,7 @@ - global_attrs => { - title => 'InnoDB Buffer Pool', - vlabel => 'Pages', -- base => '1024', -+ args => '--base 1024', - }, - data_source_attrs => { - draw => 'LINE2', @@ -900,8 +902,10 @@ update_variables($dbh); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin.spec?r1=1.89&r2=1.90&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin-plugins.patch?r1=1.43&r2=1.44&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
