summaryrefslogtreecommitdiff
path: root/net/smokeping
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2005-01-22 21:50:54 +0000
committeradrianp <adrianp@pkgsrc.org>2005-01-22 21:50:54 +0000
commit7f9b28302d4e95372c23ba80510a30e956bdd331 (patch)
tree031b8f94f4da6ececcfd556e6dd156ef125dfb8e /net/smokeping
parentca451a948e86f0bf816885527b467bdf047d2379 (diff)
downloadpkgsrc-7f9b28302d4e95372c23ba80510a30e956bdd331.tar.gz
- Update to 1.37
- Migrate to SUBST_* framework - Don't hardcode references to /var, use ${VARBASE} instead 2005/1/12 -- 1.37 * base class did assume that concurrent probes were off by default -- Niko Tyni <ntyni *iki.fi> 2005/1/7 -- 1.36 (1.35 was an internal release) * concurrent probes are default now, together with a 'random' offset to make sure not all smokepings hit the net at the same time -- Tobi * fixes for loggin -- Niko Tyni <ntyni *iki.fi> - warn if no logging method is active while daemonizing. - turn debugging on before loading the config file. - make do_debuglog a no-op if $use_debuglog isn't set - add debug info to FPing* probes - print the RRD create and update strings when debugging * Allow probe- and target-specific number of pings -- Niko Tyni <ntyni *iki.fi> * RemoteFPing probe revisited and fixed. Note this probe allowed PROBE_CONF config where this was technically not possible. Now these settings are done in the ***Probes*** section ... you have to fix your config files -- Niko Tyni <ntyni *iki.fi> * fixed many typos and some seemingly numeric comparisons -- Niko Tyni <ntyni *iki.fi> * new feature 'concurrentprobes' allow to run multiple probes in paralell and at different step width. -- Niko Tyni <ntyni *iki.fi> * allow to define multiple instances of a sigle probe -- Niko Tyni <ntyni *iki.fi> * fix --filter again ... pathprefix was still in there -- tobi 2004/11/29 -- 1.34 (1.32 + 1.33 were internal only releases) * added SNPP support as suggested by jdelisle -- tobi * added ipv6 support to EchoPing probe -- Niko Tyni <ntyni *iki.fi> * fix for Radius probe -- Niko Tyni <ntyni *iki.fi> * added new alert plugins called matchers -- tobi * created matcher::avgratio sponsored by virtela.net -- tobi * make --filter option actually work -- tobi * removed maxmedian magic regexp ... -- tobi * added new alert type matcher -- tobi * fixed pod errors -- Niko Tyni <ntyni *iki.fi> * allow to mix programs and email addresses in alerts --tobi * allow to define recipient per alert --tobi 2004/08/04 -- 1.31 * added anotherdns and anotherssh probes -- Christoph.Heine *HaDiKo.DE * modify FPing probes to skip ICPM errors in the output -- Tobi * modify RemoteFPing probe to work with normal fping that outputs via stderr. -- Tobi * allow timeout to be specified in base::forks based probes -- Tobi * Added ssh probe -- Christian Recktenwald <smokeping-contact *citecs.de>
Diffstat (limited to 'net/smokeping')
-rw-r--r--net/smokeping/Makefile49
-rw-r--r--net/smokeping/PLIST67
-rw-r--r--net/smokeping/distinfo12
-rw-r--r--net/smokeping/patches/patch-aa16
-rw-r--r--net/smokeping/patches/patch-ab9
-rw-r--r--net/smokeping/patches/patch-ac26
6 files changed, 105 insertions, 74 deletions
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 79a5db48a56..baa837caa81 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2004/12/28 02:47:48 reed Exp $
+# $NetBSD: Makefile,v 1.10 2005/01/22 21:50:54 adrianp Exp $
-DISTNAME= smokeping-1.30
-PKGREVISION= 1
+DISTNAME= smokeping-1.37
CATEGORIES= net
MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
@@ -17,6 +16,7 @@ DEPENDS+= p5-libwww>=5.64:../../www/p5-libwww
USE_PERL5= YES
PERL5_REQD+= 5.6.0
USE_PKGINSTALL= YES
+NO_BUILD= YES
BUILD_DEFS+= USE_INET6
@@ -32,6 +32,7 @@ REPLACE_PERL= bin/smokeping.dist
BUILD_DEFS+= USE_SPEEDY
.include "../../mk/bsd.prefs.mk"
+
.if defined(USE_INET6) && ${USE_INET6} == "YES"
DEPENDS+= p5-Socket6-*:../../net/p5-Socket6
.endif
@@ -43,23 +44,26 @@ INTERP= speedy
INTERP= perl
.endif
-do-build:
- ${SED} -e s#@PREFIX@#${PREFIX}#g \
- -e s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g \
- <${WRKSRC}/bin/smokeping.dist >${WRKDIR}/smokeping.pl
- ${SED} -e s#@PREFIX@#${PREFIX}#g \
- -e s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g \
- -e s#@INTERP@#${INTERP}#g \
- <${WRKSRC}/htdocs/smokeping.cgi.dist >${WRKDIR}/smokeping.cgi
- ${SED} -e s#@PREFIX@#${PREFIX}#g \
- -e s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g \
- <${WRKSRC}/etc/config.dist >${WRKDIR}/config.dist
+SUBST_CLASSES+= files
+SUBST_STAGE.files= post-patch
+SUBST_FILES.files= bin/smokeping.dist htdocs/smokeping.cgi.dist \
+ etc/config.dist etc/smokemail.dist
+SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" \
+ -e "s|@VARBASE@|${VARBASE}|g" \
+ -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
+ -e "s|@INTERP@|${INTERP}|g" \
+ -e "s|perl-5.8.0|perl|g" \
+ -e "s|/usr/bin/perl|${PERL5}|g"
+SUBST_MESSAGE.files= "Fixing configuration files."
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping
${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/ISG
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/matchers
${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/probes
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping/matchers
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping/probes
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/smokeping
for FILE in CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO; do \
${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/smokeping; \
@@ -67,8 +71,16 @@ do-install:
for FILE in ${WRKSRC}/doc/*.txt; do \
${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/smokeping; \
done
- ${INSTALL_SCRIPT} ${WRKDIR}/smokeping.pl ${PREFIX}/bin/smokeping
- ${INSTALL_SCRIPT} ${WRKDIR}/smokeping.cgi ${PREFIX}/libexec/cgi-bin/
+ for FILE in ${WRKSRC}/doc/matchers/*.txt; do \
+ ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/smokeping/matchers; \
+ done
+ for FILE in ${WRKSRC}/doc/probes/*.txt; do \
+ ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/smokeping/probes; \
+ done
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping.dist \
+ ${PREFIX}/bin/smokeping
+ ${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi.dist \
+ ${PREFIX}/libexec/cgi-bin/smokeping.cgi
for FILE in ${WRKSRC}/lib/*.pm; do \
${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping; \
done
@@ -78,7 +90,10 @@ do-install:
for FILE in ${WRKSRC}/lib/probes/*.pm; do \
${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/probes; \
done
- for FILE in ${WRKDIR}/config.dist \
+ for FILE in ${WRKSRC}/lib/matchers/*.pm; do \
+ ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/matchers; \
+ done
+ for FILE in ${WRKSRC}/etc/config.dist \
${WRKSRC}/etc/basepage.html.dist \
${WRKSRC}/etc/config-echoping.dist \
${WRKSRC}/etc/smokemail.dist; do \
diff --git a/net/smokeping/PLIST b/net/smokeping/PLIST
index fc461824ca6..7ac39db417b 100644
--- a/net/smokeping/PLIST
+++ b/net/smokeping/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/04/23 22:07:57 reed Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/01/22 21:50:54 adrianp Exp $
bin/smokeping
lib/smokeping/BER.pm
lib/smokeping/ISG/ParseConfig.pm
@@ -6,6 +6,11 @@ lib/smokeping/SNMP_Session.pm
lib/smokeping/SNMP_util.pm
lib/smokeping/Smokeping.pm
lib/smokeping/ciscoRttMonMIB.pm
+lib/smokeping/matchers/avgratio.pm
+lib/smokeping/matchers/base.pm
+lib/smokeping/matchers/median.pm
+lib/smokeping/probes/AnotherDNS.pm
+lib/smokeping/probes/AnotherSSH.pm
lib/smokeping/probes/CiscoRTTMonDNS.pm
lib/smokeping/probes/CiscoRTTMonEchoICMP.pm
lib/smokeping/probes/CiscoRTTMonTcpConnect.pm
@@ -24,6 +29,7 @@ lib/smokeping/probes/IOSPing.pm
lib/smokeping/probes/LDAP.pm
lib/smokeping/probes/Radius.pm
lib/smokeping/probes/RemoteFPing.pm
+lib/smokeping/probes/SSH.pm
lib/smokeping/probes/base.pm
lib/smokeping/probes/basefork.pm
lib/smokeping/probes/basevars.pm
@@ -34,43 +40,52 @@ share/doc/smokeping/CHANGES
share/doc/smokeping/CONTRIBUTORS
share/doc/smokeping/COPYING
share/doc/smokeping/COPYRIGHT
-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
-share/doc/smokeping/EchoPingDiscard.pm.txt
-share/doc/smokeping/EchoPingHttp.pm.txt
-share/doc/smokeping/EchoPingHttps.pm.txt
-share/doc/smokeping/EchoPingIcp.pm.txt
-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/doc/smokeping/matchers/avgratio.pm.txt
+share/doc/smokeping/matchers/base.pm.txt
+share/doc/smokeping/matchers/median.pm.txt
+share/doc/smokeping/probes/AnotherDNS.pm.txt
+share/doc/smokeping/probes/AnotherSSH.pm.txt
+share/doc/smokeping/probes/CiscoRTTMonDNS.pm.txt
+share/doc/smokeping/probes/CiscoRTTMonEchoICMP.pm.txt
+share/doc/smokeping/probes/CiscoRTTMonTcpConnect.pm.txt
+share/doc/smokeping/probes/Curl.pm.txt
+share/doc/smokeping/probes/DNS.pm.txt
+share/doc/smokeping/probes/EchoPing.pm.txt
+share/doc/smokeping/probes/EchoPingChargen.pm.txt
+share/doc/smokeping/probes/EchoPingDiscard.pm.txt
+share/doc/smokeping/probes/EchoPingHttp.pm.txt
+share/doc/smokeping/probes/EchoPingHttps.pm.txt
+share/doc/smokeping/probes/EchoPingIcp.pm.txt
+share/doc/smokeping/probes/EchoPingSmtp.pm.txt
+share/doc/smokeping/probes/FPing.pm.txt
+share/doc/smokeping/probes/FPing6.pm.txt
+share/doc/smokeping/probes/IOSPing.pm.txt
+share/doc/smokeping/probes/LDAP.pm.txt
+share/doc/smokeping/probes/Radius.pm.txt
+share/doc/smokeping/probes/RemoteFPing.pm.txt
+share/doc/smokeping/probes/SSH.pm.txt
+share/doc/smokeping/probes/base.pm.txt
+share/doc/smokeping/probes/basefork.pm.txt
+share/doc/smokeping/probes/basevars.pm.txt
+share/doc/smokeping/probes/passwordchecker.pm.txt
+share/doc/smokeping/probes/telnetIOSPing.pm.txt
share/examples/smokeping/basepage.html.dist
share/examples/smokeping/config-echoping.dist
share/examples/smokeping/config.dist
share/examples/smokeping/smokemail.dist
-@dirrm share/doc/smokeping
@dirrm share/examples/smokeping
-@dirrm lib/smokeping/ISG
+@dirrm share/doc/smokeping/matchers
+@dirrm share/doc/smokeping/probes
+@dirrm share/doc/smokeping
@dirrm lib/smokeping/probes
+@dirrm lib/smokeping/matchers
+@dirrm lib/smokeping/ISG
@dirrm lib/smokeping
diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo
index c52d9a7dc01..91dadfec3e6 100644
--- a/net/smokeping/distinfo
+++ b/net/smokeping/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2004/06/23 22:25:44 adrianp Exp $
+$NetBSD: distinfo,v 1.4 2005/01/22 21:50:54 adrianp Exp $
-SHA1 (smokeping-1.30.tar.gz) = 8161ed558b357be69da1c20b7738fd166e8f90e2
-Size (smokeping-1.30.tar.gz) = 191865 bytes
-SHA1 (patch-aa) = fce938bab82e77c66b0dc27118f16cd981dead8a
-SHA1 (patch-ab) = c7a303b5285df490925cc2e14de9e65b2f2c818c
-SHA1 (patch-ac) = 38192257b9ab760650c6972e34089bfa058d1007
+SHA1 (smokeping-1.37.tar.gz) = 3a37f0e877d7a35c108d35f61580644a2e8b4361
+Size (smokeping-1.37.tar.gz) = 224689 bytes
+SHA1 (patch-aa) = 216a0c1764c6cc7ee381c299aec10e22801c64f0
+SHA1 (patch-ab) = 7c4444c68f251fcb8ec5dc106313effe6665bb1f
+SHA1 (patch-ac) = facf5fdf127503757a3e2e8e7de91a152de5521f
diff --git a/net/smokeping/patches/patch-aa b/net/smokeping/patches/patch-aa
index 8a41872ed7f..c5fe5114524 100644
--- a/net/smokeping/patches/patch-aa
+++ b/net/smokeping/patches/patch-aa
@@ -1,18 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2004/06/23 22:25:44 adrianp Exp $
+$NetBSD: patch-aa,v 1.4 2005/01/22 21:50:54 adrianp Exp $
---- bin/smokeping.dist.orig Wed May 12 20:49:01 2004
-+++ bin/smokeping.dist Wed May 12 20:49:44 2004
-@@ -1,14 +1,11 @@
- #!/usr/sepp/bin/perl -w
+--- bin/smokeping.dist.orig 2005-01-22 19:45:31.000000000 +0000
++++ bin/smokeping.dist 2005-01-22 19:46:58.000000000 +0000
+@@ -1,12 +1,11 @@
+ #!/usr/sepp/bin/perl-5.8.0 -w
# -*-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(/usr/pack/rrdtool-1.0.47-to/lib);
-use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
+use lib qw(@PREFIX@/lib/smokeping);
- use Smokeping 1.30;
+ use Smokeping 1.37;
-Smokeping::main("etc/config.dist");
+Smokeping::main("@PKG_SYSCONFDIR@/config");
diff --git a/net/smokeping/patches/patch-ab b/net/smokeping/patches/patch-ab
index e06daa7e617..725890a5d3c 100644
--- a/net/smokeping/patches/patch-ab
+++ b/net/smokeping/patches/patch-ab
@@ -1,6 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2004/06/23 22:25:44 adrianp Exp $
---- htdocs/smokeping.cgi.dist.orig Thu Jun 10 00:14:25 2004
-+++ htdocs/smokeping.cgi.dist Thu Jun 10 00:15:42 2004
+$NetBSD: patch-ab,v 1.4 2005/01/22 21:50:54 adrianp Exp $
+
+--- htdocs/smokeping.cgi.dist.orig 2005-01-22 19:49:27.000000000 +0000
++++ htdocs/smokeping.cgi.dist 2005-01-22 19:51:16.000000000 +0000
@@ -1,12 +1,11 @@
-#!/usr/sepp/bin/speedy -w
+#!@PREFIX@/bin/@INTERP@ -w
@@ -10,7 +11,7 @@ $NetBSD: patch-ab,v 1.3 2004/06/23 22:25:44 adrianp Exp $
-use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
+use lib qw(@PREFIX@/lib/smokeping);
- use Smokeping 1.30;
+ use Smokeping 1.37;
-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 493e440ccc1..140d557bf4c 100644
--- a/net/smokeping/patches/patch-ac
+++ b/net/smokeping/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2004/04/12 21:05:15 kim Exp $
+$NetBSD: patch-ac,v 1.3 2005/01/22 21:50:54 adrianp Exp $
---- 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 @@
+--- etc/config.dist.orig 2005-01-22 19:52:46.000000000 +0000
++++ etc/config.dist 2005-01-22 19:59:21.000000000 +0000
+@@ -4,16 +4,18 @@
*** General ***
@@ -21,14 +21,16 @@ $NetBSD: patch-ac,v 1.2 2004/04/12 21:05:15 kim Exp $
-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
-+datadir = /var/db/smokeping
-+piddir = /var/run
++datadir = @VARBASE@/db/smokeping
++piddir = @VARBASE@/run
+cgiurl = http://localhost/cgi-bin/smokeping.cgi
+smokemail = @PREFIX@/etc/smokeping/smokemail
++
++
# specify this to get syslog logging
- # syslogfacility = local0
-
-@@ -63,7 +63,7 @@
+ syslogfacility = local0
+ # each probe is now run in its own process
+@@ -65,7 +67,7 @@
*** Presentation ***
@@ -37,16 +39,16 @@ $NetBSD: patch-ac,v 1.2 2004/04/12 21:05:15 kim Exp $
+ overview
-@@ -86,7 +86,7 @@
+@@ -88,7 +90,7 @@
+ FPing
-binary = /usr/sepp/bin/fping
-+binary = @PREFIX@/sbin/fping
++binary = @PREFIX@/bin/fping
*** Targets ***
-@@ -171,4 +171,3 @@
+@@ -173,4 +175,3 @@
menu = Sun Microsystems
title = Sun Microsystems Webserver
host = www.sun-web.com