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

7 files changed, 66 insertions, 58 deletions

diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 8ff3313fa9e..df2c25914f9 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2007/11/22 20:25:54 adrianp Exp $
+# $NetBSD: Makefile,v 1.24 2008/04/06 21:47:00 adrianp Exp $
 
-DISTNAME=	smokeping-2.2.7
+DISTNAME=	smokeping-2.3.5
 CATEGORIES=	net
 MASTER_SITES=	http://oss.oetiker.ch/smokeping/pub/
 
@@ -21,15 +21,16 @@ SMOKEPING_HOME=		${VARBASE}/db/smokeping
 MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 BUILD_DEFS+=		VARBASE
 
-EGDIR=		${PREFIX}/share/examples/smokeping
-SPDIR=		${PREFIX}/share/smokeping
-CONF_FILES=	${EGDIR}/basepage.html.dist ${PKG_SYSCONFDIR}/basepage.html
-CONF_FILES+=	${EGDIR}/smokemail.dist ${PKG_SYSCONFDIR}/smokemail
-CONF_FILES+=	${EGDIR}/config.dist ${PKG_SYSCONFDIR}/config
-CONF_FILES+=	${EGDIR}/tmail.dist ${PKG_SYSCONFDIR}/tmail
-CONF_FILES+=	${EGDIR}/smokeping.conf ${PKG_SYSCONFDIR}/smokeping.conf
-RCD_SCRIPTS=	smokeping
-REPLACE_PERL=	bin/smokeping.dist bin/tSmoke.dist
+EGDIR=			${PREFIX}/share/examples/smokeping
+SPDIR=			${PREFIX}/share/smokeping
+CONF_FILES=		${EGDIR}/basepage.html.dist \
+			${PKG_SYSCONFDIR}/basepage.html
+CONF_FILES+=		${EGDIR}/smokemail.dist ${PKG_SYSCONFDIR}/smokemail
+CONF_FILES+=		${EGDIR}/config.dist ${PKG_SYSCONFDIR}/config
+CONF_FILES+=		${EGDIR}/tmail.dist ${PKG_SYSCONFDIR}/tmail
+CONF_FILES+=		${EGDIR}/smokeping.conf ${PKG_SYSCONFDIR}/smokeping.conf
+RCD_SCRIPTS=		smokeping
+REPLACE_PERL=		bin/smokeping.dist bin/tSmoke.dist
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -50,6 +51,7 @@ SUBST_SED.files+=	-e "s|= cache|= /smokeping/.simg|g"
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 OWN_DIRS+=		${SMOKEPING_HOME}
+OWN_DIRS+=		${SPDIR}/.simg
 
 INSTALLATION_DIRS=	bin libexec/cgi-bin
 
@@ -69,19 +71,19 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${SPDIR}
-	${INSTALL_DATA_DIR} ${SPDIR}/.simg
 	${INSTALL_DATA_DIR} ${SPDIR}/cropper
 
 	for FILE in CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO; do \
-	  ${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/smokeping; \
+		${INSTALL_DATA} \
+			${WRKSRC}/$$FILE ${PREFIX}/share/doc/smokeping; \
 	done
 
 	for FILE in ${WRKSRC}/doc/*.txt; do \
-	  ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/smokeping; \
+		${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/smokeping; \
 	done
 
 	for FILE in ${WRKSRC}/doc/examples/config.*; do \
-	  ${INSTALL_DATA} $$FILE ${EGDIR}; \
+		${INSTALL_DATA} $$FILE ${EGDIR}; \
 	done
 
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping.dist ${PREFIX}/bin/smokeping
@@ -91,42 +93,45 @@ do-install:
 		${PREFIX}/libexec/cgi-bin/smokeping.cgi
 
 	for FILE in ${WRKSRC}/lib/*.pm; do \
-	  ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping; \
+		${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping; \
 	done
 
 	for FILE in ${WRKSRC}/lib/Config/*.pm; do \
-	  ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Config; \
+		${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Config; \
 	done
 
 	for FILE in ${WRKSRC}/lib/Config/Grammar/*.pm; do \
-	  ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Config/Grammar; \
+		${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Config/Grammar; \
 	done
 
 	for FILE in ${WRKSRC}/lib/Smokeping/*.pm; do \
-	  ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping; \
+		${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping; \
 	done
 
 	for FILE in ${WRKSRC}/lib/Smokeping/matchers/*.pm; do \
-	  ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping/matchers; \
+		${INSTALL_DATA} \
+			$$FILE ${PREFIX}/lib/smokeping/Smokeping/matchers; \
 	done
 
 	for FILE in ${WRKSRC}/lib/Smokeping/probes/*.pm; do \
-	  ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping/probes; \
+		${INSTALL_DATA} \
+			$$FILE ${PREFIX}/lib/smokeping/Smokeping/probes; \
 	done
 
 	for FILE in ${WRKSRC}/lib/Smokeping/sorters/*.pm; do \
-	  ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping/sorters; \
+		${INSTALL_DATA} \
+			$$FILE ${PREFIX}/lib/smokeping/Smokeping/sorters; \
 	done
 
 	cd ${WRKSRC}/htdocs/cropper && ${PAX} -rw -pm . ${SPDIR}/cropper
 
 	for FILE in ${WRKSRC}/etc/config.dist \
-	    ${WRKSRC}/etc/basepage.html.dist \
-	    ${WRKSRC}/etc/tmail.dist \
-	    ${WRKSRC}/etc/config.dist \
-	    ${WRKSRC}/smokeping.conf \
-	    ${WRKSRC}/etc/smokemail.dist; do \
-	  ${INSTALL_DATA} $$FILE ${EGDIR}; \
+		${WRKSRC}/etc/basepage.html.dist \
+		${WRKSRC}/etc/tmail.dist \
+		${WRKSRC}/etc/config.dist \
+		${WRKSRC}/smokeping.conf \
+		${WRKSRC}/etc/smokemail.dist; do \
+		${INSTALL_DATA} $$FILE ${EGDIR}; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/smokeping/PLIST b/net/smokeping/PLIST
index 6f478daff07..1c716fcbc6e 100644
--- a/net/smokeping/PLIST
+++ b/net/smokeping/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2007/11/22 20:25:54 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/04/06 21:47:00 adrianp Exp $
 bin/smokeping
 bin/tSmoke
 lib/smokeping/BER.pm
@@ -49,6 +49,7 @@ lib/smokeping/Smokeping/probes/LDAP.pm
 lib/smokeping/Smokeping/probes/Radius.pm
 lib/smokeping/Smokeping/probes/RemoteFPing.pm
 lib/smokeping/Smokeping/probes/SSH.pm
+lib/smokeping/Smokeping/probes/TCPPing.pm
 lib/smokeping/Smokeping/probes/TacacsPlus.pm
 lib/smokeping/Smokeping/probes/TelnetIOSPing.pm
 lib/smokeping/Smokeping/probes/TelnetJunOSPing.pm
@@ -112,7 +113,6 @@ share/examples/smokeping/tmail.dist
 @dirrm share/doc/smokeping
 @dirrm share/smokeping/cropper/lib
 @dirrm share/smokeping/cropper
-@dirrm share/smokeping/.simg
 @dirrm share/smokeping
 @dirrm lib/smokeping/Smokeping/probes
 @dirrm lib/smokeping/Smokeping/matchers
diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo
index bbe5bd24945..5c6a31e8209 100644
--- a/net/smokeping/distinfo
+++ b/net/smokeping/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2007/11/22 22:56:01 adrianp Exp $
+$NetBSD: distinfo,v 1.11 2008/04/06 21:47:00 adrianp Exp $
 
-SHA1 (smokeping-2.2.7.tar.gz) = 5011db1ccefa0d5ec967006fc482b42c4ebbeadb
-RMD160 (smokeping-2.2.7.tar.gz) = 037b3f8ac442b270e9633769635a0de1f8286454
-Size (smokeping-2.2.7.tar.gz) = 557546 bytes
-SHA1 (patch-aa) = f7d5bdf27df7be788a016aad71a894e03ad07bb8
-SHA1 (patch-ab) = e18a62b21d4ef9422147a2e8fcd2b516fc8ae02d
-SHA1 (patch-ac) = cb822e28a25672e08a9e0255615a580bbaee7432
-SHA1 (patch-ad) = 7726e0c3697e32d93218358078800fce5428b1b2
+SHA1 (smokeping-2.3.5.tar.gz) = d7ed6d1cf7fde5c8c9e1cb69c1e543cdf3f3edfa
+RMD160 (smokeping-2.3.5.tar.gz) = 484efd851453024e83cb84ecad753d2051df0081
+Size (smokeping-2.3.5.tar.gz) = 580458 bytes
+SHA1 (patch-aa) = b86c8e571c502b2a1517a32188df849ffd13f34c
+SHA1 (patch-ab) = 0365074b3308637c82b5a611c3283886f40a3227
+SHA1 (patch-ac) = 6cbefd4c8a6bea7ccae32b663dffd8c6fd1f73e5
+SHA1 (patch-ad) = ef7b3139a87faa5895ba48171359458aefe1496a
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