pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/smokeping Update to 2.2.7
details: https://anonhg.NetBSD.org/pkgsrc/rev/8cd29a263ccb
branches: trunk
changeset: 535579:8cd29a263ccb
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Thu Nov 22 20:25:54 2007 +0000
description:
Update to 2.2.7
New in Version 2.2
* Ajax based ineractive graph zooming.
Click on any graph in detail mode and use the mouse to mark your area of
interest in navigator graph.
* Multi Target Graphs
Show information from multiple targts in a graph.
* Master/Slave setup for multi source smokeping deployments.
With one central Smokeping Master node, you can run a series of Slave nodes,
taking their configuration from the master. This allows you to ping a single
target from multiple locations.
* Standard Deviation
The standard deviation is now used in several places to give a number for
the variation in round trip times as depicted by the smoke.
See http://oss.oetiker.ch/smokeping/pub/CHANGES for all the details.
OK'ed bouyer@
diffstat:
net/smokeping/MESSAGE | 26 +++++++++++++++-----
net/smokeping/Makefile | 38 +++++++++++++++++++++++++----
net/smokeping/PLIST | 47 +++++++++++++++++++++++++++++++++++++-
net/smokeping/distinfo | 16 ++++++------
net/smokeping/files/smokeping.conf | 12 +++++++++
net/smokeping/patches/patch-aa | 10 ++++----
net/smokeping/patches/patch-ab | 6 ++--
net/smokeping/patches/patch-ac | 43 ++++++++++++++++-----------------
net/smokeping/patches/patch-ad | 8 +++---
9 files changed, 150 insertions(+), 56 deletions(-)
diffs (truncated from 465 to 300 lines):
diff -r e5e2e7e4de89 -r 8cd29a263ccb net/smokeping/MESSAGE
--- a/net/smokeping/MESSAGE Thu Nov 22 20:25:20 2007 +0000
+++ b/net/smokeping/MESSAGE Thu Nov 22 20:25:54 2007 +0000
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2006/08/09 21:48:53 adrianp Exp $
+$NetBSD: MESSAGE,v 1.4 2007/11/22 20:25:54 adrianp Exp $
Smokeping is now installed.
The documentation can be found at ${PREFIX}/share/doc/smokeping/
@@ -7,14 +7,26 @@
A sample config file can be found in:
${PREFIX}/share/examples/smokeping/config.dist
-Please copy it as ${PKG_SYSCONFDIR}/config and adjust it as needed.
-You may also want to have a look at basepage.html and smokemail in
-this directory.
+A copy has been installed as ${PKG_SYSCONFDIR}/config and you will
+need to adjust it as needed. You may also want to have a look at
+basepage.html and smokemail in this directory.
-Also, make sure that your web's server /cgi-bin/smokeping.cgi refers to
+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
-changed available on the smokeping homepage.
+You will need to make smokeping accessible through your HTTP server.
+If you are running Apache then you may add the following lines to httpd.conf:
+
+ Include ${PKG_SYSCONFDIR}/smokeping.conf
+
+to make smokeping accessible through:
+
+ http://localhost/cgi-bin/smokeping.cgi
+
+Please remember to grant write permissions to the following directory for
+the user your web server runs as:
+
+ ${PREFIX}/share/smokeping/.simg
+
===========================================================================
diff -r e5e2e7e4de89 -r 8cd29a263ccb net/smokeping/Makefile
--- a/net/smokeping/Makefile Thu Nov 22 20:25:20 2007 +0000
+++ b/net/smokeping/Makefile Thu Nov 22 20:25:54 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:59 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/11/22 20:25:54 adrianp Exp $
-DISTNAME= smokeping-2.0.9
+DISTNAME= smokeping-2.2.7
CATEGORIES= net
MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/
@@ -19,12 +19,15 @@
PKG_SYSCONFSUBDIR?= smokeping
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
@@ -33,13 +36,17 @@
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
+ etc/config.dist etc/smokemail.dist bin/tSmoke.dist \
+ etc/basepage.html.dist smokeping.conf
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_SED.files+= -e "s|@SPDIR@|${SPDIR}|g"
+SUBST_SED.files+= -e "s|cropper/|/smokeping/cropper/|g"
+SUBST_SED.files+= -e "s|= cache|= /smokeping/.simg|g"
SUBST_MESSAGE.files= Fixing configuration files.
OWN_DIRS+= ${SMOKEPING_HOME}
@@ -48,14 +55,22 @@
.include "options.mk"
+post-extract:
+ ${CP} ${FILESDIR}/smokeping.conf ${WRKSRC}
+
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping
${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Config
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Config/Grammar
${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Smokeping
${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Smokeping/matchers
${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Smokeping/probes
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Smokeping/sorters
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/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; \
@@ -66,7 +81,7 @@
done
for FILE in ${WRKSRC}/doc/examples/config.*; do \
- ${INSTALL_DATA} $$FILE ${PREFIX}/share/examples/smokeping; \
+ ${INSTALL_DATA} $$FILE ${EGDIR}; \
done
${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping.dist ${PREFIX}/bin/smokeping
@@ -83,6 +98,10 @@
${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; \
+ done
+
for FILE in ${WRKSRC}/lib/Smokeping/*.pm; do \
${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping; \
done
@@ -95,12 +114,19 @@
${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; \
+ 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 ${PREFIX}/share/examples/smokeping; \
+ ${INSTALL_DATA} $$FILE ${EGDIR}; \
done
.include "../../mk/bsd.pkg.mk"
diff -r e5e2e7e4de89 -r 8cd29a263ccb net/smokeping/PLIST
--- a/net/smokeping/PLIST Thu Nov 22 20:25:20 2007 +0000
+++ b/net/smokeping/PLIST Thu Nov 22 20:25:54 2007 +0000
@@ -1,19 +1,28 @@
-@comment $NetBSD: PLIST,v 1.7 2006/08/09 21:48:53 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/11/22 20:25:54 adrianp Exp $
bin/smokeping
bin/tSmoke
lib/smokeping/BER.pm
lib/smokeping/Config/Grammar.pm
+lib/smokeping/Config/Grammar/Document.pm
+lib/smokeping/Config/Grammar/Dynamic.pm
lib/smokeping/SNMP_Session.pm
lib/smokeping/SNMP_util.pm
lib/smokeping/Smokeping.pm
+lib/smokeping/Smokeping/Colorspace.pm
+lib/smokeping/Smokeping/Config.pm
lib/smokeping/Smokeping/Examples.pm
+lib/smokeping/Smokeping/Graphs.pm
+lib/smokeping/Smokeping/Master.pm
+lib/smokeping/Smokeping/RRDhelpers.pm
lib/smokeping/Smokeping/RRDtools.pm
+lib/smokeping/Smokeping/Slave.pm
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/matchers/Medratio.pm
lib/smokeping/Smokeping/probes/AnotherDNS.pm
lib/smokeping/Smokeping/probes/AnotherSSH.pm
lib/smokeping/Smokeping/probes/CiscoRTTMonDNS.pm
@@ -23,13 +32,18 @@
lib/smokeping/Smokeping/probes/DNS.pm
lib/smokeping/Smokeping/probes/EchoPing.pm
lib/smokeping/Smokeping/probes/EchoPingChargen.pm
+lib/smokeping/Smokeping/probes/EchoPingDNS.pm
lib/smokeping/Smokeping/probes/EchoPingDiscard.pm
lib/smokeping/Smokeping/probes/EchoPingHttp.pm
lib/smokeping/Smokeping/probes/EchoPingHttps.pm
lib/smokeping/Smokeping/probes/EchoPingIcp.pm
+lib/smokeping/Smokeping/probes/EchoPingLDAP.pm
+lib/smokeping/Smokeping/probes/EchoPingPlugin.pm
lib/smokeping/Smokeping/probes/EchoPingSmtp.pm
+lib/smokeping/Smokeping/probes/EchoPingWhois.pm
lib/smokeping/Smokeping/probes/FPing.pm
lib/smokeping/Smokeping/probes/FPing6.pm
+lib/smokeping/Smokeping/probes/FTPtransfer.pm
lib/smokeping/Smokeping/probes/IOSPing.pm
lib/smokeping/Smokeping/probes/LDAP.pm
lib/smokeping/Smokeping/probes/Radius.pm
@@ -37,12 +51,35 @@
lib/smokeping/Smokeping/probes/SSH.pm
lib/smokeping/Smokeping/probes/TacacsPlus.pm
lib/smokeping/Smokeping/probes/TelnetIOSPing.pm
+lib/smokeping/Smokeping/probes/TelnetJunOSPing.pm
+lib/smokeping/Smokeping/probes/WebProxyFilter.pm
lib/smokeping/Smokeping/probes/base.pm
lib/smokeping/Smokeping/probes/basefork.pm
lib/smokeping/Smokeping/probes/basevars.pm
lib/smokeping/Smokeping/probes/passwordchecker.pm
lib/smokeping/Smokeping/probes/skel.pm
+lib/smokeping/Smokeping/sorters/Loss.pm
+lib/smokeping/Smokeping/sorters/Max.pm
+lib/smokeping/Smokeping/sorters/Median.pm
+lib/smokeping/Smokeping/sorters/StdDev.pm
+lib/smokeping/Smokeping/sorters/base.pm
libexec/cgi-bin/smokeping.cgi
+share/smokeping/cropper/cropper.css
+share/smokeping/cropper/cropper.js
+share/smokeping/cropper/cropper.uncompressed.js
+share/smokeping/cropper/lib/builder.js
+share/smokeping/cropper/lib/controls.js
+share/smokeping/cropper/lib/dragdrop.js
+share/smokeping/cropper/lib/effects.js
+share/smokeping/cropper/lib/prototype.js
+share/smokeping/cropper/lib/prototype.js.LICENSE
+share/smokeping/cropper/lib/scriptaculous.js
+share/smokeping/cropper/lib/slider.js
+share/smokeping/cropper/lib/unittest.js
+share/smokeping/cropper/licence.txt
+share/smokeping/cropper/marqueeHoriz.gif
+share/smokeping/cropper/marqueeVert.gif
+share/smokeping/cropper/smokeping-zoom.js
share/doc/smokeping/CHANGES
share/doc/smokeping/CONTRIBUTORS
share/doc/smokeping/COPYING
@@ -56,6 +93,7 @@
share/doc/smokeping/smokeping_examples.txt
share/doc/smokeping/smokeping_extend.txt
share/doc/smokeping/smokeping_install.txt
+share/doc/smokeping/smokeping_master_slave.txt
share/doc/smokeping/smokeping_upgrade.txt
share/doc/smokeping/tSmoke.txt
share/examples/rc.d/smokeping
@@ -67,12 +105,19 @@
share/examples/smokeping/config.simple
share/examples/smokeping/config.targetvars-with-Curl
share/examples/smokeping/config.template
+share/examples/smokeping/smokeping.conf
share/examples/smokeping/smokemail.dist
share/examples/smokeping/tmail.dist
@dirrm share/examples/smokeping
@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
+@dirrm lib/smokeping/Smokeping/sorters
@dirrm lib/smokeping/Smokeping
+@dirrm lib/smokeping/Config/Grammar
@dirrm lib/smokeping/Config
@dirrm lib/smokeping
diff -r e5e2e7e4de89 -r 8cd29a263ccb net/smokeping/distinfo
--- a/net/smokeping/distinfo Thu Nov 22 20:25:20 2007 +0000
+++ b/net/smokeping/distinfo Thu Nov 22 20:25:54 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2006/08/09 21:48:53 adrianp Exp $
+$NetBSD: distinfo,v 1.9 2007/11/22 20:25:54 adrianp Exp $
-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) = f512f9964d81d0231d01a8c0c80e7b193ecb757a
+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) = 0a6afc983a48da77369b45220b69589901c7b93a
+SHA1 (patch-ac) = cb822e28a25672e08a9e0255615a580bbaee7432
+SHA1 (patch-ad) = 7726e0c3697e32d93218358078800fce5428b1b2
diff -r e5e2e7e4de89 -r 8cd29a263ccb net/smokeping/files/smokeping.conf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/smokeping/files/smokeping.conf Thu Nov 22 20:25:54 2007 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: smokeping.conf,v 1.1 2007/11/22 20:25:54 adrianp Exp $
+#
+# smokeping configuration file fragment for Apache
+
Home |
Main Index |
Thread Index |
Old Index