Update to 2.3.5 (Ok'ed bouyer@)

* add some security notes to the master/slave documentation --niko
* allow SSH probe to config rsa1 key -- Walery Kokarev
* make ajax mode work on IE again -- tobi
* Integrated TCPPing Probe -- Norman Rasmussen
* made Smokeping.pm more portable by using %.1f in perl sprintf -- tobi
* make sure tsmoke sends mime conformant mails -- tobi

Too many changes to list completely.  See CHANGES for all the details:
	http://oss.oetiker.ch/smokeping/pub/CHANGES

4 files changed, 23 insertions, 20 deletions

diff --git a/net/smokeping/patches/patch-aa b/net/smokeping/patches/patch-aa
index accf655f7ac..416717506ce 100644
--- a/net/smokeping/patches/patch-aa
+++ b/net/smokeping/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2007/11/22 20:25:54 adrianp Exp $
+$NetBSD: patch-aa,v 1.8 2008/04/06 21:47:00 adrianp Exp $
 
---- bin/smokeping.dist.orig	2007-11-05 21:59:38.000000000 +0000
+--- bin/smokeping.dist.orig	2008-03-29 07:47:19.000000000 +0000
 +++ bin/smokeping.dist
 @@ -1,12 +1,11 @@
  #!/usr/sepp/bin/perl-5.8.4 -w
@@ -10,14 +10,14 @@ $NetBSD: patch-aa,v 1.7 2007/11/22 20:25:54 adrianp Exp $
 -use lib qw(lib);
 +use lib qw(@PREFIX@/lib/smokeping);
  
- use Smokeping 2.002007;
+ use Smokeping 2.003005;
   
 -Smokeping::main("etc/config.dist");
-+Smokeping::main("@PKG_SYSCONFDIR@/config");
++Smokeping::main(""@PKG_SYSCONFDIR@/config");
  
  =head1 NAME
  
-@@ -128,17 +127,17 @@ local system. Three paths have to be ent
+@@ -131,17 +130,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 50056613b85..ba2e13381a7 100644
--- a/net/smokeping/patches/patch-ab
+++ b/net/smokeping/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.8 2007/11/22 22:56:01 adrianp Exp $
+$NetBSD: patch-ab,v 1.9 2008/04/06 21:47:00 adrianp Exp $
 
---- htdocs/smokeping.cgi.dist.orig	2007-11-05 21:59:38.000000000 +0000
+--- htdocs/smokeping.cgi.dist.orig	2008-03-29 07:47:19.000000000 +0000
 +++ htdocs/smokeping.cgi.dist
 @@ -1,13 +1,12 @@
 -#!/usr/sepp/bin/speedy -w
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.8 2007/11/22 22:56:01 adrianp Exp $
 +use lib qw(@PREFIX@/lib/smokeping);
  use CGI::Carp qw(fatalsToBrowser);
  
- use Smokeping 2.002007;
+ use Smokeping 2.003005;
  
 -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 134d35a26cc..09e4e6906d5 100644
--- a/net/smokeping/patches/patch-ac
+++ b/net/smokeping/patches/patch-ac
@@ -1,19 +1,22 @@
-$NetBSD: patch-ac,v 1.6 2007/11/22 20:25:54 adrianp Exp $
+$NetBSD: patch-ac,v 1.7 2008/04/06 21:47:00 adrianp Exp $
 
---- etc/config.dist.orig	2007-10-15 08:49:18.000000000 +0100
+--- etc/config.dist.orig	2008-02-04 17:00:46.000000000 +0000
 +++ etc/config.dist
-@@ -1,16 +1,16 @@
+@@ -1,19 +1,19 @@
  *** General ***
  
 -owner    = Peter Random
 -contact  = some@address.nowhere
 -mailhost = my.mail.host
 -sendmail = /usr/lib/sendmail
--imgcache = /home/oetiker/public_html/smokeping-ms/cache
 +owner    = Charlie Root
 +contact  = root@localhost
 +mailhost = smtp.mynet
 +sendmail = /usr/sbin/sendmail
+ # NOTE: do not put the Image Cache below cgi-bin
+ # since all files under cgi-bin will be executed ... this is not
+ # good for images.
+-imgcache = /home/oetiker/public_html/smokeping-ms/cache
 +imgcache = @SPDIR@/.simg
  imgurl   = cache
 -datadir  = /tmp/smokeping-ms/data
@@ -29,7 +32,7 @@ $NetBSD: patch-ac,v 1.6 2007/11/22 20:25:54 adrianp Exp $
  # specify this to get syslog logging
  syslogfacility = local0
  # each probe is now run in its own process
-@@ -44,7 +44,7 @@ AVERAGE  0.5 144   720
+@@ -47,7 +47,7 @@ AVERAGE  0.5 144   720
  
  *** Presentation ***
  
@@ -38,7 +41,7 @@ $NetBSD: patch-ac,v 1.6 2007/11/22 20:25:54 adrianp Exp $
  
  + charts
  
-@@ -96,7 +96,7 @@ unison_tolerance = 2
+@@ -105,7 +105,7 @@ unison_tolerance = 2
  
  + FPing
  
diff --git a/net/smokeping/patches/patch-ad b/net/smokeping/patches/patch-ad
index 6778ec25dc4..77db363a2ef 100644
--- a/net/smokeping/patches/patch-ad
+++ b/net/smokeping/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2007/11/22 20:25:54 adrianp Exp $
+$NetBSD: patch-ad,v 1.4 2008/04/06 21:47:00 adrianp Exp $
 
---- bin/tSmoke.dist.orig	2007-11-05 21:59:38.000000000 +0000
+--- bin/tSmoke.dist.orig	2008-03-29 07:47:19.000000000 +0000
 +++ bin/tSmoke.dist
 @@ -50,8 +50,7 @@ use strict;
  # -- Getopt::Long
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.3 2007/11/22 20:25:54 adrianp Exp $
 -use lib "/usr/local/rrdtool-1.0.39/lib/perl";
 +use lib "@PREFIX@/lib/smokeping";
  
- use Smokeping 2.002007;
+ use Smokeping 2.003005;
  use Net::SMTP;
 @@ -60,7 +59,7 @@ use Pod::Usage;
  use RRDs;
@@ -21,7 +21,7 @@ $NetBSD: patch-ad,v 1.3 2007/11/22 20:25:54 adrianp Exp $
  
  # global variables
  my $cfg;
-@@ -462,9 +461,9 @@ past week and past month including an ov
+@@ -475,9 +474,9 @@ past week and past month including an ov
  Typical crontab used to invoke this are
  
   # Quick morning alert to see what's down
@@ -33,7 +33,7 @@ $NetBSD: patch-ad,v 1.3 2007/11/22 20:25:54 adrianp Exp $
  
  =head1 SETUP
  
-@@ -484,17 +483,16 @@ We need to use the following B<libraries
+@@ -497,17 +496,16 @@ We need to use the following B<libraries
  
  Set up your libraries:
  
@@ -50,7 +50,7 @@ $NetBSD: patch-ad,v 1.3 2007/11/22 20:25:54 adrianp Exp $
  General section:
  
 - tmail = /usr/local/smokeping/etc/tmail
-+ @PKG_SYSCONFDIR@/tmail
++ tmail = @PKG_SYSCONFDIR@/tmail
  
  =head1 COPYRIGHT