pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/smokeping Update smokeping 2.3.5->2.4.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/40b9738c04e1
branches: trunk
changeset: 545923:40b9738c04e1
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Sun Aug 17 11:09:10 2008 +0000
description:
Update smokeping 2.3.5->2.4.2
* better master/slave secrets documentation
* first cut at mtr integration
* use localtime to construct the rawlog filename
New in 2.4:
* SmokeTrace: An Ajax Traceroute tool.
* The 'blazemode' option for the FPing probe, so that the first (slow) ping packet can be ignored.
Ok'ed bouyer@
diffstat:
net/smokeping/Makefile | 54 +++----------
net/smokeping/PLIST | 160 ++++++++++++++++++++++++++++++++--------
net/smokeping/distinfo | 17 ++--
net/smokeping/patches/patch-aa | 17 ++--
net/smokeping/patches/patch-ab | 22 +++--
net/smokeping/patches/patch-ac | 6 +-
net/smokeping/patches/patch-ad | 16 ++--
net/smokeping/patches/patch-ae | 13 +++
8 files changed, 195 insertions(+), 110 deletions(-)
diffs (truncated from 481 to 300 lines):
diff -r 37cc0ea429f1 -r 40b9738c04e1 net/smokeping/Makefile
--- a/net/smokeping/Makefile Sun Aug 17 10:03:37 2008 +0000
+++ b/net/smokeping/Makefile Sun Aug 17 11:09:10 2008 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2008/05/26 02:13:23 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2008/08/17 11:09:10 adrianp Exp $
-DISTNAME= smokeping-2.3.5
+DISTNAME= smokeping-2.4.2
CATEGORIES= net
MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/
@@ -38,7 +38,7 @@
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/basepage.html.dist smokeping.conf
+ etc/basepage.html.dist smokeping.conf htdocs/tr.cgi.dist
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"
@@ -62,16 +62,12 @@
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} ${EGDIR}
${INSTALL_DATA_DIR} ${SPDIR}
${INSTALL_DATA_DIR} ${SPDIR}/cropper
+ ${INSTALL_DATA_DIR} ${SPDIR}/resource
+ ${INSTALL_DATA_DIR} ${SPDIR}/script
for FILE in CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO; do \
${INSTALL_DATA} \
@@ -91,39 +87,14 @@
${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
-
- for FILE in ${WRKSRC}/lib/Config/*.pm; do \
- ${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
-
- for FILE in ${WRKSRC}/lib/Smokeping/matchers/*.pm; do \
- ${INSTALL_DATA} \
- $$FILE ${PREFIX}/lib/smokeping/Smokeping/matchers; \
- done
-
- for FILE in ${WRKSRC}/lib/Smokeping/probes/*.pm; do \
- ${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
+ ${INSTALL_SCRIPT} ${WRKSRC}/htdocs/tr.cgi.dist \
+ ${PREFIX}/libexec/cgi-bin/tr.cgi
cd ${WRKSRC}/htdocs/cropper && pax -rw -pm . ${SPDIR}/cropper
+ cd ${WRKSRC}/htdocs/resource && pax -rw -pm . ${SPDIR}/resource
+ cd ${WRKSRC}/htdocs/script && pax -rw -pm . ${SPDIR}/script
+ cd ${WRKSRC}/lib && pax -rw -pm . ${PREFIX}/lib/smokeping
+ ${INSTALL_DATA} ${WRKSRC}/htdocs/tr.html ${SPDIR}
for FILE in ${WRKSRC}/etc/config.dist \
${WRKSRC}/etc/basepage.html.dist \
@@ -134,4 +105,7 @@
${INSTALL_DATA} $$FILE ${EGDIR}; \
done
+ ${CHMOD} ${SHAREMODE} ${PREFIX}/lib/smokeping/JSON/*.pm
+ ${CHMOD} ${SHAREMODE} ${PREFIX}/lib/smokeping/JSON.pm
+
.include "../../mk/bsd.pkg.mk"
diff -r 37cc0ea429f1 -r 40b9738c04e1 net/smokeping/PLIST
--- a/net/smokeping/PLIST Sun Aug 17 10:03:37 2008 +0000
+++ b/net/smokeping/PLIST Sun Aug 17 11:09:10 2008 +0000
@@ -1,10 +1,41 @@
-@comment $NetBSD: PLIST,v 1.9 2008/04/06 21:47:00 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/08/17 11:09:10 adrianp Exp $
bin/smokeping
bin/tSmoke
lib/smokeping/BER.pm
+lib/smokeping/CGI/Session.pm
+lib/smokeping/CGI/Session/Driver.pm
+lib/smokeping/CGI/Session/Driver/DBI.pm
+lib/smokeping/CGI/Session/Driver/db_file.pm
+lib/smokeping/CGI/Session/Driver/file.pm
+lib/smokeping/CGI/Session/Driver/mysql.pm
+lib/smokeping/CGI/Session/Driver/postgresql.pm
+lib/smokeping/CGI/Session/Driver/sqlite.pm
+lib/smokeping/CGI/Session/ErrorHandler.pm
+lib/smokeping/CGI/Session/ID/incr.pm
+lib/smokeping/CGI/Session/ID/md5.pm
+lib/smokeping/CGI/Session/ID/static.pm
+lib/smokeping/CGI/Session/Serialize/default.pm
+lib/smokeping/CGI/Session/Serialize/freezethaw.pm
+lib/smokeping/CGI/Session/Serialize/json.pm
+lib/smokeping/CGI/Session/Serialize/storable.pm
+lib/smokeping/CGI/Session/Serialize/yaml.pm
+lib/smokeping/CGI/Session/Test/Default.pm
+lib/smokeping/CGI/Session/Tutorial.pm
lib/smokeping/Config/Grammar.pm
lib/smokeping/Config/Grammar/Document.pm
lib/smokeping/Config/Grammar/Dynamic.pm
+lib/smokeping/Digest/HMAC.LICENSE
+lib/smokeping/Digest/HMAC.pm
+lib/smokeping/Digest/HMAC_MD5.pm
+lib/smokeping/Digest/HMAC_SHA1.pm
+lib/smokeping/JSON.pm
+lib/smokeping/JSON/Converter.pm
+lib/smokeping/JSON/PP.pm
+lib/smokeping/JSON/PP5005.pm
+lib/smokeping/JSON/PP56.pm
+lib/smokeping/JSON/Parser.pm
+lib/smokeping/Qooxdoo/JSONRPC.pm
+lib/smokeping/Qooxdoo/Services/Tr.pm
lib/smokeping/SNMP_Session.pm
lib/smokeping/SNMP_util.pm
lib/smokeping/Smokeping.pm
@@ -18,11 +49,11 @@
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/Median.pm
lib/smokeping/Smokeping/matchers/Medratio.pm
+lib/smokeping/Smokeping/matchers/base.pm
lib/smokeping/Smokeping/probes/AnotherDNS.pm
lib/smokeping/Smokeping/probes/AnotherSSH.pm
lib/smokeping/Smokeping/probes/CiscoRTTMonDNS.pm
@@ -65,6 +96,36 @@
lib/smokeping/Smokeping/sorters/StdDev.pm
lib/smokeping/Smokeping/sorters/base.pm
libexec/cgi-bin/smokeping.cgi
+libexec/cgi-bin/tr.cgi
+share/doc/smokeping/CHANGES
+share/doc/smokeping/CONTRIBUTORS
+share/doc/smokeping/COPYING
+share/doc/smokeping/COPYRIGHT
+share/doc/smokeping/README
+share/doc/smokeping/Smokeping.txt
+share/doc/smokeping/TODO
+share/doc/smokeping/smokeping.cgi.txt
+share/doc/smokeping/smokeping.txt
+share/doc/smokeping/smokeping_config.txt
+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/smoketrace.txt
+share/doc/smokeping/tSmoke.txt
+share/examples/rc.d/smokeping
+share/examples/smokeping/basepage.html.dist
+share/examples/smokeping/config.dist
+share/examples/smokeping/config.echoping
+share/examples/smokeping/config.fping-instances
+share/examples/smokeping/config.multiple-probes
+share/examples/smokeping/config.simple
+share/examples/smokeping/config.targetvars-with-Curl
+share/examples/smokeping/config.template
+share/examples/smokeping/smokemail.dist
+share/examples/smokeping/smokeping.conf
+share/examples/smokeping/tmail.dist
share/smokeping/cropper/cropper.css
share/smokeping/cropper/cropper.js
share/smokeping/cropper/cropper.uncompressed.js
@@ -81,43 +142,74 @@
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
-share/doc/smokeping/COPYRIGHT
-share/doc/smokeping/README
-share/doc/smokeping/Smokeping.txt
-share/doc/smokeping/TODO
-share/doc/smokeping/smokeping.cgi.txt
-share/doc/smokeping/smokeping.txt
-share/doc/smokeping/smokeping_config.txt
-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
-share/examples/smokeping/basepage.html.dist
-share/examples/smokeping/config.dist
-share/examples/smokeping/config.echoping
-share/examples/smokeping/config.fping-instances
-share/examples/smokeping/config.multiple-probes
-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
+share/smokeping/resource/Tr/image/ajax-loader.gif
+share/smokeping/resource/qx/icon/CrystalClear/16/actions/view-refresh.png
+share/smokeping/resource/qx/icon/Nuvola/16/actions/view-refresh.png
+share/smokeping/resource/qx/static/image/blank.gif
+share/smokeping/resource/qx/static/image/dotted_white.gif
+share/smokeping/resource/qx/widget/Windows/arrows/down.gif
+share/smokeping/resource/qx/widget/Windows/arrows/down_small.gif
+share/smokeping/resource/qx/widget/Windows/arrows/next.gif
+share/smokeping/resource/qx/widget/Windows/arrows/up.gif
+share/smokeping/resource/qx/widget/Windows/arrows/up_small.gif
+share/smokeping/resource/qx/widget/Windows/cursors/alias.gif
+share/smokeping/resource/qx/widget/Windows/cursors/copy.gif
+share/smokeping/resource/qx/widget/Windows/cursors/move.gif
+share/smokeping/resource/qx/widget/Windows/cursors/nodrop.gif
+share/smokeping/resource/qx/widget/Windows/menu/checkbox.gif
+share/smokeping/resource/qx/widget/Windows/menu/radiobutton.gif
+share/smokeping/resource/qx/widget/Windows/splitpane/knob-horizontal.png
+share/smokeping/resource/qx/widget/Windows/splitpane/knob-vertical.png
+share/smokeping/resource/qx/widget/Windows/table/ascending.png
+share/smokeping/resource/qx/widget/Windows/table/descending.png
+share/smokeping/resource/qx/widget/Windows/table/selectColumnOrder.png
+share/smokeping/resource/qx/widget/Windows/window/close.gif
+share/smokeping/resource/qx/widget/Windows/window/maximize.gif
+share/smokeping/resource/qx/widget/Windows/window/minimize.gif
+share/smokeping/resource/qx/widget/Windows/window/restore.gif
+share/smokeping/script/Tr.js
+share/smokeping/tr.html
+@dirrm share/smokeping/script
+@dirrm share/smokeping/resource/qx/widget/Windows/window
+@dirrm share/smokeping/resource/qx/widget/Windows/table
+@dirrm share/smokeping/resource/qx/widget/Windows/splitpane
+@dirrm share/smokeping/resource/qx/widget/Windows/menu
+@dirrm share/smokeping/resource/qx/widget/Windows/cursors
+@dirrm share/smokeping/resource/qx/widget/Windows/arrows
+@dirrm share/smokeping/resource/qx/widget/Windows
+@dirrm share/smokeping/resource/qx/widget
+@dirrm share/smokeping/resource/qx/static/image
+@dirrm share/smokeping/resource/qx/static
+@dirrm share/smokeping/resource/qx/icon/Nuvola/16/actions
+@dirrm share/smokeping/resource/qx/icon/Nuvola/16
+@dirrm share/smokeping/resource/qx/icon/Nuvola
+@dirrm share/smokeping/resource/qx/icon/CrystalClear/16/actions
+@dirrm share/smokeping/resource/qx/icon/CrystalClear/16
+@dirrm share/smokeping/resource/qx/icon/CrystalClear
+@dirrm share/smokeping/resource/qx/icon
+@dirrm share/smokeping/resource/qx
+@dirrm share/smokeping/resource/Tr/image
+@dirrm share/smokeping/resource/Tr
+@dirrm share/smokeping/resource
@dirrm share/smokeping/cropper/lib
@dirrm share/smokeping/cropper
@dirrm share/smokeping
+@dirrm share/examples/smokeping
+@dirrm share/doc/smokeping
+@dirrm lib/smokeping/Smokeping/sorters
@dirrm lib/smokeping/Smokeping/probes
@dirrm lib/smokeping/Smokeping/matchers
-@dirrm lib/smokeping/Smokeping/sorters
@dirrm lib/smokeping/Smokeping
+@dirrm lib/smokeping/Qooxdoo/Services
+@dirrm lib/smokeping/Qooxdoo
+@dirrm lib/smokeping/JSON
+@dirrm lib/smokeping/Digest
@dirrm lib/smokeping/Config/Grammar
@dirrm lib/smokeping/Config
+@dirrm lib/smokeping/CGI/Session/Test
+@dirrm lib/smokeping/CGI/Session/Serialize
+@dirrm lib/smokeping/CGI/Session/ID
+@dirrm lib/smokeping/CGI/Session/Driver
+@dirrm lib/smokeping/CGI/Session
+@dirrm lib/smokeping/CGI
@dirrm lib/smokeping
diff -r 37cc0ea429f1 -r 40b9738c04e1 net/smokeping/distinfo
--- a/net/smokeping/distinfo Sun Aug 17 10:03:37 2008 +0000
+++ b/net/smokeping/distinfo Sun Aug 17 11:09:10 2008 +0000
Home |
Main Index |
Thread Index |
Old Index