diff options
| -rw-r--r-- | net/smokeping/MESSAGE | 4 | ||||
| -rw-r--r-- | net/smokeping/Makefile | 36 | ||||
| -rw-r--r-- | net/smokeping/PLIST | 5 | ||||
| -rw-r--r-- | net/smokeping/distinfo | 14 | ||||
| -rw-r--r-- | net/smokeping/options.mk | 31 | ||||
| -rw-r--r-- | net/smokeping/patches/patch-aa | 6 | ||||
| -rw-r--r-- | net/smokeping/patches/patch-ab | 6 | ||||
| -rw-r--r-- | net/smokeping/patches/patch-ad | 12 |
8 files changed, 67 insertions, 47 deletions
diff --git a/net/smokeping/MESSAGE b/net/smokeping/MESSAGE index 63c13bb2939..9008b149277 100644 --- a/net/smokeping/MESSAGE +++ b/net/smokeping/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2005/10/28 21:43:18 adrianp Exp $ +$NetBSD: MESSAGE,v 1.3 2006/08/09 21:48:53 adrianp Exp $ Smokeping is now installed. The documentation can be found at ${PREFIX}/share/doc/smokeping/ @@ -15,6 +15,6 @@ Also, make sure that your web's server /cgi-bin/smokeping.cgi refers to ${PREFIX}/libexec/cgi-bin/smokeping.cgi, or copy the smokeping in your web server's cgi space. -If upgrading from version 1.x there is detailed information on what has +If upgrading from version 1.x there is detailed information on what has changed available on the smokeping homepage. =========================================================================== diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile index e3fe6f67a4c..8d90bf9227b 100644 --- a/net/smokeping/Makefile +++ b/net/smokeping/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2006/06/30 10:07:50 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/08/09 21:48:53 adrianp Exp $ -DISTNAME= smokeping-2.0.4 -PKGREVISION= 2 +DISTNAME= smokeping-2.0.9 CATEGORIES= net MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/ @@ -17,8 +16,6 @@ DEPENDS+= p5-libwww>=5.64:../../www/p5-libwww USE_TOOLS+= perl:run NO_BUILD= YES -BUILD_DEFS+= USE_INET6 - PKG_SYSCONFSUBDIR?= smokeping SMOKEPING_HOME= ${VARBASE}/db/smokeping MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} @@ -31,37 +28,26 @@ CONF_FILES+= ${EGDIR}/tmail.dist ${PKG_SYSCONFDIR}/tmail RCD_SCRIPTS= smokeping REPLACE_PERL= bin/smokeping.dist bin/tSmoke.dist -BUILD_DEFS+= USE_SPEEDY - .include "../../mk/bsd.prefs.mk" -.if defined(USE_INET6) && ${USE_INET6} == "YES" -DEPENDS+= p5-Socket6-[0-9]*:../../net/p5-Socket6 -.endif - -.if defined(USE_SPEEDY) && ${USE_SPEEDY} == "YES" -DEPENDS+= SpeedyCGI-[0-9]*:../../www/SpeedyCGI -INTERP= speedy -.else -INTERP= perl -.endif - SUBST_CLASSES+= files SUBST_STAGE.files= post-patch SUBST_FILES.files= bin/smokeping.dist htdocs/smokeping.cgi.dist \ etc/config.dist etc/smokemail.dist bin/tSmoke.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.4|perl|g" \ - -e "s|/usr/bin/perl|${PERL5}|g" +SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g" +SUBST_SED.files+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_SED.files+= -e "s|@INTERP@|${INTERP}|g" +SUBST_SED.files+= -e "s|perl-5.8.4|perl|g" +SUBST_SED.files+= -e "s|/usr/bin/perl|${PERL5}|g" SUBST_MESSAGE.files= Fixing configuration files. -OWN_DIRS+= ${SMOKEPING_HOME} +OWN_DIRS+= ${SMOKEPING_HOME} INSTALLATION_DIRS= bin libexec/cgi-bin +.include "options.mk" + do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Config diff --git a/net/smokeping/PLIST b/net/smokeping/PLIST index 3d8fe64936a..c7d21293f7d 100644 --- a/net/smokeping/PLIST +++ b/net/smokeping/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2005/10/28 21:43:18 adrianp Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/08/09 21:48:53 adrianp Exp $ bin/smokeping bin/tSmoke lib/smokeping/BER.pm @@ -12,6 +12,8 @@ lib/smokeping/Smokeping/ciscoRttMonMIB.pm lib/smokeping/Smokeping/matchers/Avgratio.pm lib/smokeping/Smokeping/matchers/Median.pm lib/smokeping/Smokeping/matchers/base.pm +lib/smokeping/Smokeping/matchers/CheckLatency.pm +lib/smokeping/Smokeping/matchers/CheckLoss.pm lib/smokeping/Smokeping/probes/AnotherDNS.pm lib/smokeping/Smokeping/probes/AnotherSSH.pm lib/smokeping/Smokeping/probes/CiscoRTTMonDNS.pm @@ -33,6 +35,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/TacacsPlus.pm lib/smokeping/Smokeping/probes/TelnetIOSPing.pm lib/smokeping/Smokeping/probes/base.pm lib/smokeping/Smokeping/probes/basefork.pm diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo index 800be555a81..7ba639e4418 100644 --- a/net/smokeping/distinfo +++ b/net/smokeping/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.7 2005/10/28 21:43:18 adrianp Exp $ +$NetBSD: distinfo,v 1.8 2006/08/09 21:48:53 adrianp Exp $ -SHA1 (smokeping-2.0.4.tar.gz) = 253c060e144e0bf6062fa2663f7320c623604007 -RMD160 (smokeping-2.0.4.tar.gz) = beb3ba86ad4e0de571bc5ed18cd2ea47af194a6f -Size (smokeping-2.0.4.tar.gz) = 375301 bytes -SHA1 (patch-aa) = d10ea259ae0861dfb76e186c8f3ef9425bb8190a -SHA1 (patch-ab) = f6173859e5c8b61d56be37707fa12e41554bf216 +SHA1 (smokeping-2.0.9.tar.gz) = 89427122eada5fdf5f6145705f080583fb2d245a +RMD160 (smokeping-2.0.9.tar.gz) = 3ddbe35f6ec634773d6facc5d7e4c17c17753984 +Size (smokeping-2.0.9.tar.gz) = 393777 bytes +SHA1 (patch-aa) = 10784cd4e981ad7acedaee6b661ac802d9a31e2e +SHA1 (patch-ab) = 56d9f1e7e850f476309474c7a256b654092960dc SHA1 (patch-ac) = 504f7c3ae3d3369facfafe80f742dfb63f416537 -SHA1 (patch-ad) = c8185b03aef8fafada08ae0c117d302631bba0b3 +SHA1 (patch-ad) = f512f9964d81d0231d01a8c0c80e7b193ecb757a diff --git a/net/smokeping/options.mk b/net/smokeping/options.mk new file mode 100644 index 00000000000..6d56de1760d --- /dev/null +++ b/net/smokeping/options.mk @@ -0,0 +1,31 @@ +# $NetBSD: options.mk,v 1.1 2006/08/09 21:48:53 adrianp Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.smokeping + +PKG_SUPPORTED_OPTIONS= smokeping-speedycgi inet6 + +### +### Just here to ease migration to the options framework +### +.if defined(USE_SPEEDY) && ${USE_SPEEDY} == "YES" +PKG_SUGGESTED_OPTIONS+= smokeping-speedycgi +.endif + +.include "../../mk/bsd.options.mk" + +### +### Use SpeedyCGI to get the smokeping WWW interface running a lot faster +### +.if !empty(PKG_OPTIONS:Msmokeping-speedycgi) +DEPENDS+= SpeedyCGI-[0-9]*:../../www/SpeedyCGI +INTERP= speedy +.else +INTERP= perl +.endif + +### +### ipv6 support +### +.if !empty(PKG_OPTIONS:Minet6) +DEPENDS+= p5-Socket6-[0-9]*:../../net/p5-Socket6 +.endif diff --git a/net/smokeping/patches/patch-aa b/net/smokeping/patches/patch-aa index f1a571359fc..defc45cc71b 100644 --- a/net/smokeping/patches/patch-aa +++ b/net/smokeping/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.5 2005/10/28 21:43:18 adrianp Exp $ +$NetBSD: patch-aa,v 1.6 2006/08/09 21:48:53 adrianp Exp $ ---- bin/smokeping.dist.orig 2005-10-23 22:09:23.000000000 +0100 +--- bin/smokeping.dist.orig 2006-07-14 12:17:59.000000000 +0100 +++ bin/smokeping.dist @@ -1,12 +1,11 @@ #!/usr/sepp/bin/perl-5.8.4 -w @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.5 2005/10/28 21:43:18 adrianp Exp $ -use lib qw(lib); +use lib qw(@PREFIX@/lib/smokeping); - use Smokeping 2.000004; + use Smokeping 2.000009; -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 55869b5f14d..984c0c63a5b 100644 --- a/net/smokeping/patches/patch-ab +++ b/net/smokeping/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.5 2005/10/28 21:43:18 adrianp Exp $ +$NetBSD: patch-ab,v 1.6 2006/08/09 21:48:53 adrianp Exp $ ---- htdocs/smokeping.cgi.dist.orig 2005-10-23 22:16:54.000000000 +0100 +--- htdocs/smokeping.cgi.dist.orig 2006-07-14 12:17:59.000000000 +0100 +++ htdocs/smokeping.cgi.dist @@ -1,13 +1,12 @@ -#!/usr/sepp/bin/speedy -w @@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.5 2005/10/28 21:43:18 adrianp Exp $ +use lib qw(@PREFIX@/lib/smokeping); use CGI::Carp qw(fatalsToBrowser); - use Smokeping 2.000004; + use Smokeping 2.000009; -Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config"); +Smokeping::cgi("@PKG_SYSCONFDIR@/config"); diff --git a/net/smokeping/patches/patch-ad b/net/smokeping/patches/patch-ad index e8735b7eacc..a065843a67e 100644 --- a/net/smokeping/patches/patch-ad +++ b/net/smokeping/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.1 2005/10/28 21:43:18 adrianp Exp $ +$NetBSD: patch-ad,v 1.2 2006/08/09 21:48:53 adrianp Exp $ ---- bin/tSmoke.dist.orig 2005-10-23 22:31:49.000000000 +0100 +--- bin/tSmoke.dist.orig 2006-07-14 12:17:59.000000000 +0100 +++ bin/tSmoke.dist @@ -50,8 +50,7 @@ use strict; # -- Getopt::Long @@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.1 2005/10/28 21:43:18 adrianp Exp $ -use lib "/usr/local/rrdtool-1.0.39/lib/perl"; +use lib "@PREFIX@/lib/smokeping"; - use Smokeping 2.000004; + use Smokeping 2.000009; use Net::SMTP; @@ -60,7 +59,7 @@ use Pod::Usage; use RRDs; @@ -21,7 +21,7 @@ $NetBSD: patch-ad,v 1.1 2005/10/28 21:43:18 adrianp Exp $ # global variables my $cfg; -@@ -473,9 +472,9 @@ past week and past month including an ov +@@ -462,9 +461,9 @@ past week and past month including an ov Typical crontab used to invoke this are # Quick morning alert to see what's down @@ -29,11 +29,11 @@ $NetBSD: patch-ad,v 1.1 2005/10/28 21:43:18 adrianp Exp $ + 0 6 * * * @PREFIX@/bin/tSmoke.pl --q --to=mobilephone@att.net.invalid --morning # Weekly report on the percent availability of network systems with no detail - 0 8 * * * /usr/local/smokeping/bin/tSmoke.pl --q --to=mailbox@company.com.invalid --weekly --detail=0 -+ 0 8 * * * @PREFIX@/tSmoke.pl --q --to=mailbox@company.com.invalid --weekly --detail=0 ++ 0 8 * * * @PREFIX@/bin/tSmoke.pl --q --to=mailbox@company.com.invalid --weekly --detail=0 =head1 SETUP -@@ -495,17 +494,16 @@ We need to use the following B<libraries +@@ -484,17 +483,16 @@ We need to use the following B<libraries Set up your libraries: |