packages: munin-plugins-muninexchange/.cvsignore, munin-plugins-muninexchan...

[marmarek]

Author: marmarek                     Date: Wed Apr 29 11:55:27 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- apache patch (escape various chars)

---- Files affected:
packages/munin-plugins-muninexchange:
   .cvsignore (1.2 -> 1.3) , munin-plugins-muninexchange.spec (1.10 -> 1.11) , munin-plugins-muninexchange-apache.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/munin-plugins-muninexchange/.cvsignore
diff -u packages/munin-plugins-muninexchange/.cvsignore:1.2 packages/munin-plugins-muninexchange/.cvsignore:1.3
--- packages/munin-plugins-muninexchange/.cvsignore:1.2	Tue Apr 28 20:54:38 2009
+++ packages/munin-plugins-muninexchange/.cvsignore	Wed Apr 29 13:55:21 2009
@@ -6,3 +6,4 @@
 BUILD
 SRPMS
 RPMS
+munin-plugins-muninexchange-20081128.tar.bz2

================================================================
Index: packages/munin-plugins-muninexchange/munin-plugins-muninexchange.spec
diff -u packages/munin-plugins-muninexchange/munin-plugins-muninexchange.spec:1.10 packages/munin-plugins-muninexchange/munin-plugins-muninexchange.spec:1.11
--- packages/munin-plugins-muninexchange/munin-plugins-muninexchange.spec:1.10	Tue Dec  2 00:30:31 2008
+++ packages/munin-plugins-muninexchange/munin-plugins-muninexchange.spec	Wed Apr 29 13:55:21 2009
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Wtyczki munina z MuninExchange
 Name:		munin-plugins-muninexchange
 Version:	20081128
-Release:	2.1
+Release:	2.2
 License:	GPL
 Group:		Daemons
 Source0:	%{name}-%{version}.tar.bz2
@@ -19,6 +19,7 @@
 Patch3:		%{name}-php.patch
 Patch4:		%{name}-openvpn.patch
 Patch5:		%{name}-samba.patch
+Patch6:		%{name}-apache.patch
 URL:		http://muninexchange.projects.linpro.no/
 BuildRequires:	dos2unix
 BuildRequires:	perl-devel
@@ -705,6 +706,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p0
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -781,6 +783,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2009/04/29 11:55:21  marmarek
+- apache patch (escape various chars)
+
 Revision 1.10  2008/12/01 23:30:31  baggins
 - fix samba plugins (grep polluted exit code from script)
 

================================================================
Index: packages/munin-plugins-muninexchange/munin-plugins-muninexchange-apache.patch
diff -u /dev/null packages/munin-plugins-muninexchange/munin-plugins-muninexchange-apache.patch:1.1
--- /dev/null	Wed Apr 29 13:55:27 2009
+++ packages/munin-plugins-muninexchange/munin-plugins-muninexchange-apache.patch	Wed Apr 29 13:55:21 2009
@@ -0,0 +1,20 @@
+--- ./apache/apache_watch_~	2008-11-30 01:59:30.000000000 +0100
++++ ./apache/apache_watch_	2009-04-26 20:30:15.107587925 +0200
+@@ -95,7 +95,7 @@
+   print "graph_vlabel activity\n";
+   my $i = 0;
+   foreach my $server (sort (@servers)) {
+-    (my $txtserver = $server) =~ s/(-|\.)/\_/g;
++    (my $txtserver = $server) =~ s/(-|\.|:|\\)/\_/g;
+     my $draw = ($i==0) ? 'AREA' : 'STACK';
+     if ($action eq "bytes") {
+       print "${txtserver}.label $server\n";
+@@ -114,7 +114,7 @@
+ foreach my $string (sort (@data)) {
+   my ($server, $ifInOctets, $ifOutOctets, $ifRequests, $ifDocuments) =
+     split (/\s/, $string);
+-  (my $txtserver = $server) =~ s/(-|\.)/\_/g;
++  (my $txtserver = $server) =~ s/(-|\.|:|\\)/\_/g;
+   if ($action eq "documents") {
+     print "${txtserver}.value $ifDocuments\n";
+   } elsif ($action eq "requests") {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin-plugins-muninexchange/.cvsignore?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin-plugins-muninexchange/munin-plugins-muninexchange.spec?r1=1.10&r2=1.11&f=u