Update to 2.2.7

New in Version 2.2
* Ajax based ineractive graph zooming.
Click on any graph in detail mode and use the mouse to mark your area of
interest in navigator graph.
* Multi Target Graphs
Show information from multiple targts in a graph.
* Master/Slave setup for multi source smokeping deployments.
With one central Smokeping Master node, you can run a series of Slave nodes,
taking their configuration from the master. This allows you to ping a single
target from multiple locations.
* Standard Deviation
The standard deviation is now used in several places to give a number for
the variation in round trip times as depicted by the smoke.

See http://oss.oetiker.ch/smokeping/pub/CHANGES for all the details.

OK'ed bouyer@

4 files changed, 33 insertions, 34 deletions

diff --git a/net/smokeping/patches/patch-aa b/net/smokeping/patches/patch-aa
index defc45cc71b..accf655f7ac 100644
--- a/net/smokeping/patches/patch-aa
+++ b/net/smokeping/patches/patch-aa
@@ -1,23 +1,23 @@
-$NetBSD: patch-aa,v 1.6 2006/08/09 21:48:53 adrianp Exp $
+$NetBSD: patch-aa,v 1.7 2007/11/22 20:25:54 adrianp Exp $
 
---- bin/smokeping.dist.orig	2006-07-14 12:17:59.000000000 +0100
+--- bin/smokeping.dist.orig	2007-11-05 21:59:38.000000000 +0000
 +++ bin/smokeping.dist
 @@ -1,12 +1,11 @@
  #!/usr/sepp/bin/perl-5.8.4 -w
  # -*-perl-*-
  
--use lib qw(/usr/pack/rrdtool-1.0.49-to/lib/perl);
+-use lib qw(/usr/pack/rrdtool-1.2.23-mo/lib/perl);
 -use lib qw(lib);
 +use lib qw(@PREFIX@/lib/smokeping);
  
- use Smokeping 2.000009;
+ use Smokeping 2.002007;
   
 -Smokeping::main("etc/config.dist");
 +Smokeping::main("@PKG_SYSCONFDIR@/config");
  
  =head1 NAME
  
-@@ -117,17 +116,17 @@ local system. Three paths have to be ent
+@@ -128,17 +127,17 @@ local system. Three paths have to be ent
  
  One pointing to your B<rrdtool> installation
  
diff --git a/net/smokeping/patches/patch-ab b/net/smokeping/patches/patch-ab
index 984c0c63a5b..544adee168b 100644
--- a/net/smokeping/patches/patch-ab
+++ b/net/smokeping/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2006/08/09 21:48:53 adrianp Exp $
+$NetBSD: patch-ab,v 1.7 2007/11/22 20:25:54 adrianp Exp $
 
---- htdocs/smokeping.cgi.dist.orig	2006-07-14 12:17:59.000000000 +0100
+--- htdocs/smokeping.cgi.dist.orig	2007-11-05 21:59:38.000000000 +0000
 +++ htdocs/smokeping.cgi.dist
 @@ -1,13 +1,12 @@
 -#!/usr/sepp/bin/speedy -w
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.6 2006/08/09 21:48:53 adrianp Exp $
 +use lib qw(@PREFIX@/lib/smokeping);
  use CGI::Carp qw(fatalsToBrowser);
  
- use Smokeping 2.000009;
+ use Smokeping 2.002007;
  
 -Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
 +Smokeping::cgi("@PKG_SYSCONFDIR@/config");
diff --git a/net/smokeping/patches/patch-ac b/net/smokeping/patches/patch-ac
index ec0435fd530..134d35a26cc 100644
--- a/net/smokeping/patches/patch-ac
+++ b/net/smokeping/patches/patch-ac
@@ -1,27 +1,26 @@
-$NetBSD: patch-ac,v 1.5 2005/10/28 21:43:18 adrianp Exp $
+$NetBSD: patch-ac,v 1.6 2007/11/22 20:25:54 adrianp Exp $
 
---- etc/config.dist.orig	2005-10-23 22:19:51.000000000 +0100
+--- etc/config.dist.orig	2007-10-15 08:49:18.000000000 +0100
 +++ etc/config.dist
-@@ -4,17 +4,17 @@
- 
+@@ -1,16 +1,16 @@
  *** General ***
  
--owner    = Joe Random
--contact  = joe@some.place.xyz
--mailhost = smtp.mailhost.abc
+-owner    = Peter Random
+-contact  = some@address.nowhere
+-mailhost = my.mail.host
 -sendmail = /usr/lib/sendmail
--imgcache = /home/oetiker/public_html/.simg
+-imgcache = /home/oetiker/public_html/smokeping-ms/cache
 +owner    = Charlie Root
 +contact  = root@localhost
 +mailhost = smtp.mynet
 +sendmail = /usr/sbin/sendmail
-+imgcache = @PREFIX@/share/httpd/htdocs/.simg
- imgurl   = ../.simg
--datadir  = /home/oetiker/data/projects/AADJ-smokeping/dist/var
--piddir  = /home/oetiker/data/projects/AADJ-smokeping/dist/var
--cgiurl   = http://people.ee.ethz.ch/~oetiker/smokeping/smokeping.cgi
--smokemail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/smokemail.dist
--tmail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/tmail.dist
++imgcache = @SPDIR@/.simg
+ imgurl   = cache
+-datadir  = /tmp/smokeping-ms/data
+-piddir  = /tmp/smokeping-ms/var
+-cgiurl   = http://some.url/smokeping.cgi
+-smokemail = /home/oetiker/checkouts/smokeping/trunk/software/etc/smokemail.dist
+-tmail = /home/oetiker/checkouts/smokeping/trunk/software/etc/tmail.dist
 +datadir  = @VARBASE@/db/smokeping
 +piddir  = @VARBASE@/run
 +cgiurl   = http://localhost/cgi-bin/smokeping.cgi
@@ -30,21 +29,21 @@ $NetBSD: patch-ac,v 1.5 2005/10/28 21:43:18 adrianp Exp $
  # specify this to get syslog logging
  syslogfacility = local0
  # each probe is now run in its own process
-@@ -66,7 +66,7 @@ AVERAGE  0.5 144   720
+@@ -44,7 +44,7 @@ AVERAGE  0.5 144   720
  
  *** Presentation ***
  
--template = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/basepage.html.dist
+-template = /home/oetiker/checkouts/smokeping/trunk/software/etc/basepage.html.dist
 +template = @PKG_SYSCONFDIR@/basepage.html
  
- + overview 
+ + charts
  
-@@ -89,7 +89,7 @@ unison_tolerance = 2
+@@ -96,7 +96,7 @@ unison_tolerance = 2
  
  + FPing
  
--binary = /usr/sepp/bin/fping
+-binary = /usr/sbin/fping
 +binary = @PREFIX@/sbin/fping
  
- *** Targets ***
- 
+ *** Slaves ***
+ secrets=/home/oetiker/checkouts/smokeping/trunk/software/etc/smokeping_secrets.dist
diff --git a/net/smokeping/patches/patch-ad b/net/smokeping/patches/patch-ad
index a065843a67e..6778ec25dc4 100644
--- a/net/smokeping/patches/patch-ad
+++ b/net/smokeping/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2006/08/09 21:48:53 adrianp Exp $
+$NetBSD: patch-ad,v 1.3 2007/11/22 20:25:54 adrianp Exp $
 
---- bin/tSmoke.dist.orig	2006-07-14 12:17:59.000000000 +0100
+--- bin/tSmoke.dist.orig	2007-11-05 21:59:38.000000000 +0000
 +++ bin/tSmoke.dist
 @@ -50,8 +50,7 @@ use strict;
  # -- Getopt::Long
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.2 2006/08/09 21:48:53 adrianp Exp $
 -use lib "/usr/local/rrdtool-1.0.39/lib/perl";
 +use lib "@PREFIX@/lib/smokeping";
  
- use Smokeping 2.000009;
+ use Smokeping 2.002007;
  use Net::SMTP;
 @@ -60,7 +59,7 @@ use Pod::Usage;
  use RRDs;
@@ -50,7 +50,7 @@ $NetBSD: patch-ad,v 1.2 2006/08/09 21:48:53 adrianp Exp $
  General section:
  
 - tmail = /usr/local/smokeping/etc/tmail
-+ tmail = @PKG_SYSCONFDIR@/tmail
++ @PKG_SYSCONFDIR@/tmail
  
  =head1 COPYRIGHT