[smokeping] 2.6.8

[terjeros]

commit cb7240204e8c8530f5d7539a02d4b294e972fc90
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Thu Sep 6 19:32:07 2012 +0200

    2.6.8
    
    - Fix fping issue (bz #854572)
    - Explicit dep on httpd (not just webserver) (bz #854804)

 .gitignore                  |    1 +
 smokeping-2.6.7-fping.patch |   44 +++++++++++++++++++++++++++++++++++++++++++
 smokeping.spec              |   14 ++++++++++--
 sources                     |    2 +-
 4 files changed, 57 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 185b111..b0fa7ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 smokeping-2.4.2.tar.gz
 /smokeping-2.6.7.tar.gz
+/smokeping-2.6.8.tar.gz
diff --git a/smokeping-2.6.7-fping.patch b/smokeping-2.6.7-fping.patch
new file mode 100644
index 0000000..5781e76
--- /dev/null
+++ b/smokeping-2.6.7-fping.patch
@@ -0,0 +1,44 @@
+--- smokeping-2.4.2/lib/Smokeping/probes/FPing.pm.fping33	2008-06-08 17:49:42.000000000 -0400
++++ smokeping-2.4.2/lib/Smokeping/probes/FPing.pm	2012-09-06 02:31:14.592525741 -0400
+@@ -112,6 +112,7 @@ sub ping ($){
+     my $inh = gensym;
+     my $outh = gensym;
+     my $errh = gensym;
++    my $handle = gensym;
+     # pinging nothing is pointless
+     return unless @{$self->addresses};
+     my @params = () ;
+@@ -136,18 +137,20 @@ sub ping ($){
+     $self->do_debug("Executing @cmd");
+     my $pid = open3($inh,$outh,$errh, @cmd);
+     $self->{rtts}={};
+-    while (<$errh>){
+-        chomp;
+-	$self->do_debug("Got fping output: '$_'");
+-        next unless /^\S+\s+:\s+[-\d\.]/; #filter out error messages from fping
+-        my @times = split /\s+/;
+-        my $ip = shift @times;
+-        next unless ':' eq shift @times; #drop the colon
+-        if (($self->{properties}{blazemode} || '') eq 'true'){     
+-             shift @times;
+-        }
+-        @times = map {sprintf "%.10e", $_ / $self->{pingfactor}} sort {$a <=> $b} grep /^\d/, @times;
+-        map { $self->{rtts}{$_} = [@times] } @{$self->{addrlookup}{$ip}} ;
++    foreach $handle ($outh, $errh) {
++        while (<$handle>){
++	    chomp;
++	    $self->do_debug("Got fping output: '$_'");
++	    next unless /^\S+\s+:\s+[-\d\.]/; #filter out error messages from fping
++	    my @times = split /\s+/;
++	    my $ip = shift @times;
++	    next unless ':' eq shift @times; #drop the colon
++	    if (($self->{properties}{blazemode} || '') eq 'true'){     
++	      shift @times;
++	    }
++	    @times = map {sprintf "%.10e", $_ / $self->{pingfactor}} sort {$a <=> $b} grep /^\d/, @times;
++	    map { $self->{rtts}{$_} = [@times] } @{$self->{addrlookup}{$ip}} ;
++	}
+     }
+     waitpid $pid,0;
+     close $inh;
+
diff --git a/smokeping.spec b/smokeping.spec
index 209b753..a27f1ef 100644
--- a/smokeping.spec
+++ b/smokeping.spec
@@ -6,8 +6,8 @@
 
 Summary:          Latency Logging and Graphing System
 Name:             smokeping
-Version:          2.6.7
-Release:          4%{?dist}
+Version:          2.6.8
+Release:          1%{?dist}
 License:          GPLv2+
 Group:            Applications/Internet
 URL:              http://oss.oetiker.ch/smokeping/
@@ -22,6 +22,7 @@ Patch0:           smokeping-2.6.7-path.patch
 Patch1:           smokeping-2.6.7-config.patch
 Patch2:           smokeping-2.6.7-silence.patch
 Patch3:           smokeping-2.6.7-datadir.patch
+Patch4:           smokeping-2.6.7-fping.patch
 BuildRequires:    glibc-common
 BuildRequires:    systemd-units
 BuildRequires:    perl(RRDs)
@@ -41,7 +42,8 @@ Requires:         traceroute
 # Not picked up for some reason
 Requires:         perl(Config::Grammar)
 Requires:         perl(SNMP_util) >= 1.13
-Requires:         webserver
+# only httpd supported without config changes
+Requires:         httpd
 Requires:         mod_fcgid
 Requires(post):   systemd-sysv
 Requires(post):   systemd-units
@@ -60,6 +62,7 @@ which presents the graphs.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__install} -p -m 0644 %{SOURCE5} . 
 iconv -f ISO-8859-1 -t utf-8 -o CHANGES.utf8 CHANGES
@@ -144,6 +147,11 @@ rm -f %{buildroot}%{_datadir}/%{name}/htdocs/smokeping.fcgi.dist
 %{_mandir}/man7/%{name}_*.7*
 
 %changelog
+* Thu Sep 06 2012 Terje Rosten <terje.rosten at ntnu.no> - 2.6.8-1
+- 2.6.8
+- Fix fping issue (bz #854572)
+- Explicit dep on httpd (not just webserver) (bz #854804)
+
 * Tue Aug 28 2012 Terje Rosten <terje.rosten at ntnu.no> - 2.6.7-4
 - Convert to new set of macros for scripts
 
diff --git a/sources b/sources
index 666cbbd..0cb5522 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29ba2b17ed55aa00e2066c9424a1b4fb  smokeping-2.6.7.tar.gz
+14a968daab2d17a27d41600077e3e967  smokeping-2.6.8.tar.gz