[pkgsrc/trunk]: pkgsrc/net/smokeping Update to smokeping-2.0.9

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/smokeping Update to smokeping-2.0.9
From: adrianp <adrianp%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:51:50 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/30dbeb82e6c4
branches:  trunk
changeset: 517374:30dbeb82e6c4
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Wed Aug 09 21:48:53 2006 +0000

description:
Update to smokeping-2.0.9
Package changes include:
- pkglintification
- move to options.mk

smokeping changes include:
* remove the FPing 'timeout' variable, since it never really did anything
* Curl.pm: new variables 'follow_redirects' and 'include_redirects'
* make buggy_perl_version test work on perl 5.8.7 too ...
* AnotherDNS.pm: added option 'require_answers' for testing

For a full list see:
http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/CHANGES

ok'ed bouyer@

diffstat:

 net/smokeping/MESSAGE          |   4 ++--
 net/smokeping/Makefile         |  36 +++++++++++-------------------------
 net/smokeping/PLIST            |   5 ++++-
 net/smokeping/distinfo         |  14 +++++++-------
 net/smokeping/options.mk       |  31 +++++++++++++++++++++++++++++++
 net/smokeping/patches/patch-aa |   6 +++---
 net/smokeping/patches/patch-ab |   6 +++---
 net/smokeping/patches/patch-ad |  12 ++++++------
 8 files changed, 67 insertions(+), 47 deletions(-)

diffs (254 lines):

diff -r 6ab62ba7670f -r 30dbeb82e6c4 net/smokeping/MESSAGE
--- a/net/smokeping/MESSAGE     Wed Aug 09 21:44:14 2006 +0000
+++ b/net/smokeping/MESSAGE     Wed Aug 09 21:48:53 2006 +0000
@@ -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 @@
 ${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 -r 6ab62ba7670f -r 30dbeb82e6c4 net/smokeping/Makefile
--- a/net/smokeping/Makefile    Wed Aug 09 21:44:14 2006 +0000
+++ b/net/smokeping/Makefile    Wed Aug 09 21:48:53 2006 +0000
@@ -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 @@
 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 @@
 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 -r 6ab62ba7670f -r 30dbeb82e6c4 net/smokeping/PLIST
--- a/net/smokeping/PLIST       Wed Aug 09 21:44:14 2006 +0000
+++ b/net/smokeping/PLIST       Wed Aug 09 21:48:53 2006 +0000
@@ -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/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/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 -r 6ab62ba7670f -r 30dbeb82e6c4 net/smokeping/distinfo
--- a/net/smokeping/distinfo    Wed Aug 09 21:44:14 2006 +0000
+++ b/net/smokeping/distinfo    Wed Aug 09 21:48:53 2006 +0000
@@ -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 -r 6ab62ba7670f -r 30dbeb82e6c4 net/smokeping/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/smokeping/options.mk  Wed Aug 09 21:48:53 2006 +0000
@@ -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 -r 6ab62ba7670f -r 30dbeb82e6c4 net/smokeping/patches/patch-aa
--- a/net/smokeping/patches/patch-aa    Wed Aug 09 21:44:14 2006 +0000
+++ b/net/smokeping/patches/patch-aa    Wed Aug 09 21:48:53 2006 +0000
@@ -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 @@
 -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 -r 6ab62ba7670f -r 30dbeb82e6c4 net/smokeping/patches/patch-ab
--- a/net/smokeping/patches/patch-ab    Wed Aug 09 21:44:14 2006 +0000
+++ b/net/smokeping/patches/patch-ab    Wed Aug 09 21:48:53 2006 +0000
@@ -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 @@
 +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 -r 6ab62ba7670f -r 30dbeb82e6c4 net/smokeping/patches/patch-ad
--- a/net/smokeping/patches/patch-ad    Wed Aug 09 21:44:14 2006 +0000
+++ b/net/smokeping/patches/patch-ad    Wed Aug 09 21:48:53 2006 +0000
@@ -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 @@
 -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 @@
  
  # 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 @@
 + 0 6 * * * @PREFIX@/bin/tSmoke.pl --q --to=mobilephone%att.net@localhost.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@localhost.invalid --weekly --detail=0
-+ 0 8 * * * @PREFIX@/tSmoke.pl --q --to=mailbox%company.com@localhost.invalid --weekly --detail=0
++ 0 8 * * * @PREFIX@/bin/tSmoke.pl --q --to=mailbox%company.com@localhost.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:
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated net/mrtg to 2.14.5
Next by Date: [pkgsrc/trunk]: pkgsrc update pkg_chk to 1.79: default PKG_DBDIR
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated net/mrtg to 2.14.5
Next by Thread: [pkgsrc/trunk]: pkgsrc update pkg_chk to 1.79: default PKG_DBDIR
Indexes:
Home | Main Index | Thread Index | Old Index