Upgrade to smokeping-1.28:

- new probes: CiscoRTTMonEchoICMP, CiscoRTTMonDNS, CiscoRTTMonTcpConnect,
  Curl, LDAP, Radius, RemoteFPing, TelnetIOSPing
- support for multiple alert recipients
- new --filter option allows you to run the smokeping deamon on a big config
  but have the config file filtered and only measure the entries that pass
  the filter. This allows to use rsync to consolidate measurements from
  different hosts at a central location for presentation.
- new option to generate static pages (--static-pages)

6 files changed, 56 insertions, 36 deletions

diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index f5c572430f7..358fe877e15 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2004/03/26 02:27:49 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/12 21:05:15 kim Exp $
 
-DISTNAME=	smokeping-1.19
-PKGREVISION=	1
+DISTNAME=	smokeping-1.28
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
 
diff --git a/net/smokeping/PLIST b/net/smokeping/PLIST
index 5e671af0175..370ddca7f81 100644
--- a/net/smokeping/PLIST
+++ b/net/smokeping/PLIST
@@ -1,12 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/24 15:24:39 bouyer Exp $
-etc/rc.d/smokeping
+@comment $NetBSD: PLIST,v 1.2 2004/04/12 21:05:15 kim Exp $
 bin/smokeping
-libexec/cgi-bin/smokeping.cgi
+etc/rc.d/smokeping
 lib/smokeping/BER.pm
+lib/smokeping/ISG/ParseConfig.pm
 lib/smokeping/SNMP_Session.pm
 lib/smokeping/SNMP_util.pm
 lib/smokeping/Smokeping.pm
-lib/smokeping/ISG/ParseConfig.pm
+lib/smokeping/ciscoRttMonMIB.pm
+lib/smokeping/probes/CiscoRTTMonDNS.pm
+lib/smokeping/probes/CiscoRTTMonEchoICMP.pm
+lib/smokeping/probes/CiscoRTTMonTcpConnect.pm
+lib/smokeping/probes/Curl.pm
 lib/smokeping/probes/DNS.pm
 lib/smokeping/probes/EchoPing.pm
 lib/smokeping/probes/EchoPingChargen.pm
@@ -18,15 +22,23 @@ lib/smokeping/probes/EchoPingSmtp.pm
 lib/smokeping/probes/FPing.pm
 lib/smokeping/probes/FPing6.pm
 lib/smokeping/probes/IOSPing.pm
+lib/smokeping/probes/LDAP.pm
+lib/smokeping/probes/Radius.pm
+lib/smokeping/probes/RemoteFPing.pm
 lib/smokeping/probes/base.pm
 lib/smokeping/probes/basefork.pm
 lib/smokeping/probes/basevars.pm
+lib/smokeping/probes/passwordchecker.pm
+lib/smokeping/probes/telnetIOSPing.pm
+libexec/cgi-bin/smokeping.cgi
 share/doc/smokeping/CHANGES
 share/doc/smokeping/CONTRIBUTORS
 share/doc/smokeping/COPYING
 share/doc/smokeping/COPYRIGHT
-share/doc/smokeping/README
-share/doc/smokeping/TODO
+share/doc/smokeping/CiscoRTTMonDNS.pm.txt
+share/doc/smokeping/CiscoRTTMonEchoICMP.pm.txt
+share/doc/smokeping/CiscoRTTMonTcpConnect.pm.txt
+share/doc/smokeping/Curl.pm.txt
 share/doc/smokeping/DNS.pm.txt
 share/doc/smokeping/EchoPing.pm.txt
 share/doc/smokeping/EchoPingChargen.pm.txt
@@ -38,15 +50,22 @@ share/doc/smokeping/EchoPingSmtp.pm.txt
 share/doc/smokeping/FPing.pm.txt
 share/doc/smokeping/FPing6.pm.txt
 share/doc/smokeping/IOSPing.pm.txt
+share/doc/smokeping/LDAP.pm.txt
 share/doc/smokeping/ParseConfig.pm.txt
+share/doc/smokeping/README
+share/doc/smokeping/Radius.pm.txt
+share/doc/smokeping/RemoteFPing.pm.txt
 share/doc/smokeping/Smokeping.pm.txt
+share/doc/smokeping/TODO
 share/doc/smokeping/base.pm.txt
 share/doc/smokeping/basefork.pm.txt
 share/doc/smokeping/basevars.pm.txt
+share/doc/smokeping/passwordchecker.pm.txt
 share/doc/smokeping/smokeping.cgi.txt
 share/doc/smokeping/smokeping.txt
 share/doc/smokeping/smokeping_config.txt
 share/doc/smokeping/smokeping_install.txt
+share/doc/smokeping/telnetIOSPing.pm.txt
 share/examples/smokeping/basepage.html.dist
 share/examples/smokeping/config-echoping.dist
 share/examples/smokeping/config.dist
diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo
index f5736dcd286..ef80efde120 100644
--- a/net/smokeping/distinfo
+++ b/net/smokeping/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/03/24 15:24:39 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2004/04/12 21:05:15 kim Exp $
 
-SHA1 (smokeping-1.19.tar.gz) = 6397d059313b5d72cf32b016eab7cf27c0e48e1b
-Size (smokeping-1.19.tar.gz) = 137348 bytes
-SHA1 (patch-aa) = 2d79e1ffde3f8d65cecfae0aea3b91ece151cb05
-SHA1 (patch-ab) = a8c3877881fa06f203be52d80aecb30609b2d27a
-SHA1 (patch-ac) = b2ced83abad8ec60d3c9f7a0664caddf77dd17e8
+SHA1 (smokeping-1.28.tar.gz) = d53642255b1923f4541ea17fb51ae7fe394daa63
+Size (smokeping-1.28.tar.gz) = 214564 bytes
+SHA1 (patch-aa) = 88fc78660d5b44430725783653cb72e04aaec88a
+SHA1 (patch-ab) = 8ca6c7c069da74d9a5e28cc54d30a8f90cbe8ad7
+SHA1 (patch-ac) = 38192257b9ab760650c6972e34089bfa058d1007
diff --git a/net/smokeping/patches/patch-aa b/net/smokeping/patches/patch-aa
index ba84c2b878a..64fe89bfcdc 100644
--- a/net/smokeping/patches/patch-aa
+++ b/net/smokeping/patches/patch-aa
@@ -1,19 +1,21 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/03/24 15:24:39 bouyer Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/12 21:05:15 kim Exp $
 
---- bin/smokeping.dist.orig	Wed Mar 19 22:35:02 2003
-+++ bin/smokeping.dist	Wed Mar 19 22:37:00 2003
-@@ -1,12 +1,11 @@
+--- bin/smokeping.dist.orig	2004-03-14 15:27:24.000000000 -0500
++++ bin/smokeping.dist	2004-04-12 16:24:12.000000000 -0400
+@@ -1,14 +1,11 @@
 -#!/usr/sepp/bin/perl -w
 +#!@PREFIX@/bin/perl -w
  # -*-perl-*-
  
--use lib qw(/usr/pack/rrdtool-1.0.40-ds/lib/perl);
+-use lib qw(/home/oetiker/data/projects/AABN-rrdtool/perl-shared/blib/lib);
+-use lib qw(/home/oetiker/data/projects/AABN-rrdtool/perl-shared/blib/arch);
+-use lib qw(/usr/pack/rrdtool-1.0.40-ds/lib/perl/5.8.0);
 -use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
 +use lib qw(@PREFIX@/lib/smokeping);
  
- use Smokeping 1.19;
+ use Smokeping 1.28;
  
--Smokeping::main("/home/oetiker/.smokeping/config");
+-Smokeping::main("etc/config.dist");
 +Smokeping::main("@PKG_SYSCONFDIR@/config");
  
  =head1 NAME
diff --git a/net/smokeping/patches/patch-ab b/net/smokeping/patches/patch-ab
index 99ba75b4a80..aa4d152ff6e 100644
--- a/net/smokeping/patches/patch-ab
+++ b/net/smokeping/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/03/24 15:24:39 bouyer Exp $
+$NetBSD: patch-ab,v 1.2 2004/04/12 21:05:15 kim Exp $
 
---- htdocs/smokeping.cgi.dist.orig	Wed Mar 19 22:48:58 2003
-+++ htdocs/smokeping.cgi.dist	Wed Mar 19 22:50:01 2003
+--- htdocs/smokeping.cgi.dist.orig	2004-03-14 15:27:24.000000000 -0500
++++ htdocs/smokeping.cgi.dist	2004-04-12 16:23:45.000000000 -0400
 @@ -1,12 +1,11 @@
 -#!/usr/sepp/bin/speedy -w
 +#!@PREFIX@/bin/perl -w
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/03/24 15:24:39 bouyer Exp $
 -use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
 +use lib qw(@PREFIX@/lib/smokeping);
  
- use Smokeping 1.19;
+ use Smokeping 1.28;
  
 -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 a00bacc82d7..493e440ccc1 100644
--- a/net/smokeping/patches/patch-ac
+++ b/net/smokeping/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/03/24 15:24:39 bouyer Exp $
+$NetBSD: patch-ac,v 1.2 2004/04/12 21:05:15 kim Exp $
 
---- etc/config.dist.orig	Wed Mar 19 22:52:32 2003
-+++ etc/config.dist	Wed Mar 19 22:58:47 2003
+--- etc/config.dist.orig	2004-01-04 08:57:51.000000000 -0500
++++ etc/config.dist	2004-04-12 16:27:51.000000000 -0400
 @@ -4,16 +4,16 @@
  
  *** General ***
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/03/24 15:24:39 bouyer Exp $
 -mailhost = smtp.mailhost.abc
 -sendmail = /usr/lib/sendmail
 -imgcache = /home/oetiker/public_html/.simg
-+owner    = Charlie root
++owner    = Charlie Root
 +contact  = root@localhost
 +mailhost = smtp.mynet
 +sendmail = /usr/sbin/sendmail
@@ -20,24 +20,24 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/03/24 15:24:39 bouyer Exp $
 -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
+-smokemail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/smokemail.dist
 +datadir  = /var/db/smokeping
-+piddir  = /var/run
++piddir   = /var/run
 +cgiurl   = http://localhost/cgi-bin/smokeping.cgi
 +smokemail = @PREFIX@/etc/smokeping/smokemail
  # specify this to get syslog logging
  # syslogfacility = local0
  
-@@ -35,7 +35,7 @@
+@@ -63,7 +63,7 @@
  
  *** Presentation ***
  
--template = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/basepage.html
+-template = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/basepage.html.dist
 +template = @PREFIX@/etc/smokeping/basepage.html
  
  + overview 
  
-@@ -58,7 +58,7 @@
+@@ -86,7 +86,7 @@
  
  + FPing
  
@@ -46,7 +46,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/03/24 15:24:39 bouyer Exp $
  
  *** Targets ***
  
-@@ -142,4 +142,3 @@
+@@ -171,4 +171,3 @@
  menu = Sun Microsystems
  title = Sun Microsystems Webserver
  host = www.sun-web.com