Bug#309344: SmokePing and rrd 1.2.x

[Loïc Lefort]

Hi,

Latest upstream (1.42) is compatible with rrd 1.2.
Attached to this mail is a patch (extracted from upstream 1.42) that
adds rrd 1.2 compatibility to SmokePing 1.38-3.

Regards,
Loïc

--- Smokeping.pm.orig	2005-03-13 13:58:57.000000000 +0100
+++ Smokeping.pm	2005-08-17 12:30:46.000000000 +0200
@@ -545,6 +545,9 @@
     my $date = $cfg->{Presentation}{overview}{strftime} ? 
         POSIX::strftime($cfg->{Presentation}{overview}{strftime},
                         localtime(time)) : scalar localtime(time);
+    if ( $RRDs::VERSION >= 1.199908 ){
+         $date =~ s|:|\\:|g;
+    }
     foreach my $prop (sort {$tree->{$a}{_order} <=> $tree->{$b}{_order}} 
                       grep {  ref $tree->{$_} eq 'HASH' and $_ ne "PROBE_CONF" and defined $tree->{$_}{host}}
                       keys %$tree) {
@@ -801,6 +804,10 @@
 
         my @lazy =();
         @lazy = ('--lazy') if $lasthight{$start} and $lasthight{$start} == $max->{$start};
+        my $colon = ':';
+        if ( $RRDs::VERSION >= 1.199908 ){
+          $colon = '\:';
+        }
 	my ($graphret,$xs,$ys) = RRDs::graph
 	  ($cfg->{General}{imgcache}.$dir."/${file}_last_${start}.png",
 	   @lazy,
@@ -834,7 +841,7 @@
 		 ()),
 	   'HRULE:0#000000',
 	   'COMMENT:\s',
-           "COMMENT:Probe: $pings $ProbeDesc every $step seconds",
+           "COMMENT:Probe$colon $pings $ProbeDesc every $step seconds",
 	   'COMMENT:created on '.$date.'\j' );
 	
 	my $ERROR = RRDs::error();