diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/smokeping/MESSAGE | 3 | ||||
| -rw-r--r-- | net/smokeping/Makefile | 87 | ||||
| -rw-r--r-- | net/smokeping/PLIST | 180 | ||||
| -rw-r--r-- | net/smokeping/distinfo | 20 | ||||
| -rw-r--r-- | net/smokeping/files/smokeping.conf | 3 | ||||
| -rw-r--r-- | net/smokeping/patches/patch-aa | 40 | ||||
| -rw-r--r-- | net/smokeping/patches/patch-ab | 49 | ||||
| -rw-r--r-- | net/smokeping/patches/patch-ac | 33 | ||||
| -rw-r--r-- | net/smokeping/patches/patch-ad | 53 | ||||
| -rw-r--r-- | net/smokeping/patches/patch-ae | 22 | ||||
| -rw-r--r-- | net/smokeping/patches/patch-af | 13 | ||||
| -rw-r--r-- | net/smokeping/patches/patch-ag | 19 |
12 files changed, 220 insertions, 302 deletions
diff --git a/net/smokeping/MESSAGE b/net/smokeping/MESSAGE index beff7a084d0..c0f5b8deaa0 100644 --- a/net/smokeping/MESSAGE +++ b/net/smokeping/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2007/11/22 20:25:54 adrianp Exp $ +$NetBSD: MESSAGE,v 1.5 2012/02/02 18:54:34 bouyer Exp $ Smokeping is now installed. The documentation can be found at ${PREFIX}/share/doc/smokeping/ @@ -14,6 +14,7 @@ basepage.html and smokemail in this directory. 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. +Also make sure that /cropper/ refers to ${PREFIX}/share/httpd/htdocs/cropper/ 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: diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile index 6ae466b34a3..1578ae6cb0f 100644 --- a/net/smokeping/Makefile +++ b/net/smokeping/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2010/01/27 17:40:30 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2012/02/02 18:54:34 bouyer Exp $ -DISTNAME= smokeping-2.4.2 +DISTNAME= smokeping-2.6.7 CATEGORIES= net MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ @@ -9,14 +9,20 @@ HOMEPAGE= http://oss.oetiker.ch/smokeping/index.en.html COMMENT= Latency/packet loss monitoring/graphing tool PKG_DESTDIR_SUPPORT= user-destdir +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --localstatedir=${VARBASE}/db/smokeping +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-htdocs-dir=${PREFIX}/share/httpd/htdocs DEPENDS+= rrdtool>=1.0:../../databases/rrdtool DEPENDS+= fping>=2.4b2:../../net/fping DEPENDS+= p5-Digest-MD5>=2.20:../../security/p5-Digest-MD5 +DEPENDS+= p5-Digest-HMAC>=1.03:../../security/p5-Digest-HMAC DEPENDS+= p5-libwww>=5.64:../../www/p5-libwww +DEPENDS+= p5-FCGI>=0.74:../../www/p5-FCGI +DEPENDS+= p5-Config-Grammar>=1.10:../../devel/p5-Config-Grammar -USE_TOOLS+= pax perl:run -NO_BUILD= YES +USE_TOOLS+= pax gmake perl:run PKG_SYSCONFSUBDIR?= smokeping SMOKEPING_HOME= ${VARBASE}/db/smokeping @@ -28,81 +34,60 @@ 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}/smokeping_secrets.dist ${PKG_SYSCONFDIR}/smokeping_secrets 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 +REPLACE_PERL= bin/smokeping_cgi bin/smokeping +REPLACE_PERL+= bin/smokeinfo bin/tSmoke .include "../../mk/bsd.prefs.mk" 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/basepage.html.dist smokeping.conf htdocs/tr.cgi.dist +SUBST_FILES.files= etc/config.dist.in bin/smokeping \ + bin/smokeping_cgi bin/tSmoke \ + htdocs/Makefile.in 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. +SUBST_CLASSES+= libs +SUBST_STAGE.libs= post-patch +SUBST_FILES.libs= bin/smokeping_cgi bin/smokeping bin/smokeinfo bin/tSmoke +SUBST_SED.libs= -e "s|FindBin::Bin/../lib|FindBin::Bin/../lib/smokeping|g" +SUBST_MESSAGE.libs= Fixing library path + OWN_DIRS+= ${SMOKEPING_HOME} OWN_DIRS+= ${SPDIR}/.simg -INSTALLATION_DIRS= bin libexec/cgi-bin - -.include "options.mk" +INSTALLATION_DIRS= bin libexec/cgi-bin share/httpd/htdocs post-extract: ${CP} ${FILESDIR}/smokeping.conf ${WRKSRC} -INSTALLATION_DIRS+= lib/smokeping share/doc/smokeping ${EGDIR} \ - ${SPDIR}/cropper ${SPDIR}/resource ${SPDIR}/script - -do-install: - for FILE in CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO; do \ +post-install: + for FILE in CHANGES CONTRIBUTORS COPYRIGHT LICENSE README TODO; do \ ${INSTALL_DATA} \ - ${WRKSRC}/$$FILE ${DESTDIR}${PREFIX}/share/doc/smokeping; \ + ${WRKSRC}/$$FILE ${DESTDIR}${PREFIX}/share/doc/smokeping ; \ done - for FILE in ${WRKSRC}/doc/*.txt; do \ - ${INSTALL_DATA} $$FILE ${DESTDIR}${PREFIX}/share/doc/smokeping; \ - done + ${INSTALL_DATA} ${WRKSRC}/smokeping.conf ${DESTDIR}${EGDIR} - for FILE in ${WRKSRC}/doc/examples/config.*; do \ - ${INSTALL_DATA} $$FILE ${DESTDIR}${EGDIR}; \ - done + ${MV} ${DESTDIR}${PREFIX}/share/httpd/htdocs/smokeping.fcgi.dist \ + ${DESTDIR}${PREFIX}/libexec/cgi-bin/smokeping.cgi + ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/*.dist ${DESTDIR}${EGDIR}/ + ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/examples/* ${DESTDIR}${EGDIR}/ + ${RMDIR} ${DESTDIR}${PKG_SYSCONFDIR}/examples - ${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping.dist ${DESTDIR}${PREFIX}/bin/smokeping - ${INSTALL_SCRIPT} ${WRKSRC}/bin/tSmoke.dist ${DESTDIR}${PREFIX}/bin/tSmoke - - ${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi.dist \ - ${DESTDIR}${PREFIX}/libexec/cgi-bin/smokeping.cgi - ${INSTALL_SCRIPT} ${WRKSRC}/htdocs/tr.cgi.dist \ - ${DESTDIR}${PREFIX}/libexec/cgi-bin/tr.cgi - - cd ${WRKSRC}/htdocs/cropper && pax -rw -pm . ${DESTDIR}${SPDIR}/cropper - cd ${WRKSRC}/htdocs/resource && pax -rw -pm . ${DESTDIR}${SPDIR}/resource - cd ${WRKSRC}/htdocs/script && pax -rw -pm . ${DESTDIR}${SPDIR}/script - cd ${WRKSRC}/lib && pax -rw -pm . ${DESTDIR}${PREFIX}/lib/smokeping - ${INSTALL_DATA} ${WRKSRC}/htdocs/tr.html ${DESTDIR}${SPDIR} - - 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 ${DESTDIR}${EGDIR}; \ - done +.include "options.mk" - ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/smokeping/JSON/*.pm - ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/smokeping/JSON.pm +INSTALLATION_DIRS+= lib/smokeping share/doc/smokeping ${EGDIR} \ + ${SPDIR}/cropper ${SPDIR}/resource ${SPDIR}/script .include "../../mk/bsd.pkg.mk" diff --git a/net/smokeping/PLIST b/net/smokeping/PLIST index 148b9bdc5b6..a89f6abe87c 100644 --- a/net/smokeping/PLIST +++ b/net/smokeping/PLIST @@ -1,41 +1,9 @@ -@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:09:43 joerg Exp $ +@comment $NetBSD: PLIST,v 1.12 2012/02/02 18:54:34 bouyer Exp $ +bin/smokeinfo bin/smokeping +bin/smokeping_cgi 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 @@ -43,6 +11,7 @@ lib/smokeping/Smokeping/Colorspace.pm lib/smokeping/Smokeping/Config.pm lib/smokeping/Smokeping/Examples.pm lib/smokeping/Smokeping/Graphs.pm +lib/smokeping/Smokeping/Info.pm lib/smokeping/Smokeping/Master.pm lib/smokeping/Smokeping/RRDhelpers.pm lib/smokeping/Smokeping/RRDtools.pm @@ -51,9 +20,11 @@ lib/smokeping/Smokeping/ciscoRttMonMIB.pm lib/smokeping/Smokeping/matchers/Avgratio.pm lib/smokeping/Smokeping/matchers/CheckLatency.pm lib/smokeping/Smokeping/matchers/CheckLoss.pm +lib/smokeping/Smokeping/matchers/ExpLoss.pm lib/smokeping/Smokeping/matchers/Median.pm lib/smokeping/Smokeping/matchers/Medratio.pm lib/smokeping/Smokeping/matchers/base.pm +lib/smokeping/Smokeping/pingMIB.pm lib/smokeping/Smokeping/probes/AnotherDNS.pm lib/smokeping/Smokeping/probes/AnotherSSH.pm lib/smokeping/Smokeping/probes/CiscoRTTMonDNS.pm @@ -61,6 +32,7 @@ lib/smokeping/Smokeping/probes/CiscoRTTMonEchoICMP.pm lib/smokeping/Smokeping/probes/CiscoRTTMonTcpConnect.pm lib/smokeping/Smokeping/probes/Curl.pm lib/smokeping/Smokeping/probes/DNS.pm +lib/smokeping/Smokeping/probes/DismanPing.pm lib/smokeping/Smokeping/probes/EchoPing.pm lib/smokeping/Smokeping/probes/EchoPingChargen.pm lib/smokeping/Smokeping/probes/EchoPingDNS.pm @@ -77,9 +49,12 @@ 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/NFSping.pm +lib/smokeping/Smokeping/probes/OpenSSHJunOSPing.pm lib/smokeping/Smokeping/probes/Radius.pm lib/smokeping/Smokeping/probes/RemoteFPing.pm lib/smokeping/Smokeping/probes/SSH.pm +lib/smokeping/Smokeping/probes/SipSak.pm lib/smokeping/Smokeping/probes/TCPPing.pm lib/smokeping/Smokeping/probes/TacacsPlus.pm lib/smokeping/Smokeping/probes/TelnetIOSPing.pm @@ -96,24 +71,73 @@ lib/smokeping/Smokeping/sorters/Median.pm lib/smokeping/Smokeping/sorters/StdDev.pm lib/smokeping/Smokeping/sorters/base.pm libexec/cgi-bin/smokeping.cgi -libexec/cgi-bin/tr.cgi +man/man1/smokeping.1 +man/man1/smokeping_cgi.1 +man/man1/tSmoke.1 +man/man3/Smokeping_matchers_Avgratio.3 +man/man3/Smokeping_matchers_CheckLatency.3 +man/man3/Smokeping_matchers_CheckLoss.3 +man/man3/Smokeping_matchers_ExpLoss.3 +man/man3/Smokeping_matchers_Median.3 +man/man3/Smokeping_matchers_Medratio.3 +man/man3/Smokeping_matchers_base.3 +man/man3/Smokeping_probes_AnotherDNS.3 +man/man3/Smokeping_probes_AnotherSSH.3 +man/man3/Smokeping_probes_CiscoRTTMonDNS.3 +man/man3/Smokeping_probes_CiscoRTTMonEchoICMP.3 +man/man3/Smokeping_probes_CiscoRTTMonTcpConnect.3 +man/man3/Smokeping_probes_Curl.3 +man/man3/Smokeping_probes_DNS.3 +man/man3/Smokeping_probes_DismanPing.3 +man/man3/Smokeping_probes_EchoPing.3 +man/man3/Smokeping_probes_EchoPingChargen.3 +man/man3/Smokeping_probes_EchoPingDNS.3 +man/man3/Smokeping_probes_EchoPingDiscard.3 +man/man3/Smokeping_probes_EchoPingHttp.3 +man/man3/Smokeping_probes_EchoPingHttps.3 +man/man3/Smokeping_probes_EchoPingIcp.3 +man/man3/Smokeping_probes_EchoPingLDAP.3 +man/man3/Smokeping_probes_EchoPingPlugin.3 +man/man3/Smokeping_probes_EchoPingSmtp.3 +man/man3/Smokeping_probes_EchoPingWhois.3 +man/man3/Smokeping_probes_FPing.3 +man/man3/Smokeping_probes_FPing6.3 +man/man3/Smokeping_probes_FTPtransfer.3 +man/man3/Smokeping_probes_IOSPing.3 +man/man3/Smokeping_probes_LDAP.3 +man/man3/Smokeping_probes_NFSping.3 +man/man3/Smokeping_probes_OpenSSHJunOSPing.3 +man/man3/Smokeping_probes_Radius.3 +man/man3/Smokeping_probes_RemoteFPing.3 +man/man3/Smokeping_probes_SSH.3 +man/man3/Smokeping_probes_SipSak.3 +man/man3/Smokeping_probes_TCPPing.3 +man/man3/Smokeping_probes_TacacsPlus.3 +man/man3/Smokeping_probes_TelnetIOSPing.3 +man/man3/Smokeping_probes_TelnetJunOSPing.3 +man/man3/Smokeping_probes_WebProxyFilter.3 +man/man3/Smokeping_probes_base.3 +man/man3/Smokeping_probes_basefork.3 +man/man3/Smokeping_probes_basevars.3 +man/man3/Smokeping_probes_passwordchecker.3 +man/man3/Smokeping_probes_skel.3 +man/man3/Smokeping_sorters_Loss.3 +man/man3/Smokeping_sorters_Max.3 +man/man3/Smokeping_sorters_Median.3 +man/man3/Smokeping_sorters_StdDev.3 +man/man3/Smokeping_sorters_base.3 +man/man5/smokeping_config.5 +man/man5/smokeping_examples.5 +man/man7/smokeping_extend.7 +man/man7/smokeping_install.7 +man/man7/smokeping_master_slave.7 +man/man7/smokeping_upgrade.7 share/doc/smokeping/CHANGES share/doc/smokeping/CONTRIBUTORS -share/doc/smokeping/COPYING share/doc/smokeping/COPYRIGHT +share/doc/smokeping/LICENSE 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 @@ -124,48 +148,22 @@ 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_secrets.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 -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/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 +share/httpd/htdocs/cropper/cropper.css +share/httpd/htdocs/cropper/cropper.js +share/httpd/htdocs/cropper/cropper.uncompressed.js +share/httpd/htdocs/cropper/lib/builder.js +share/httpd/htdocs/cropper/lib/controls.js +share/httpd/htdocs/cropper/lib/dragdrop.js +share/httpd/htdocs/cropper/lib/effects.js +share/httpd/htdocs/cropper/lib/prototype.js +share/httpd/htdocs/cropper/lib/scriptaculous.js +share/httpd/htdocs/cropper/lib/slider.js +share/httpd/htdocs/cropper/lib/sound.js +share/httpd/htdocs/cropper/lib/unittest.js +share/httpd/htdocs/cropper/licence.txt +share/httpd/htdocs/cropper/marqueeHoriz.gif +share/httpd/htdocs/cropper/marqueeVert.gif +share/httpd/htdocs/cropper/smokeping-zoom.js diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo index 56025f4437e..c018eaf2df4 100644 --- a/net/smokeping/distinfo +++ b/net/smokeping/distinfo @@ -1,10 +1,12 @@ -$NetBSD: distinfo,v 1.13 2008/08/17 11:09:10 adrianp Exp $ +$NetBSD: distinfo,v 1.14 2012/02/02 18:54:35 bouyer Exp $ -SHA1 (smokeping-2.4.2.tar.gz) = 055d65c7e3c49cd0d6e8f96242131fe69dc3110e -RMD160 (smokeping-2.4.2.tar.gz) = 4c91f1c6be77ef4d851821f5c0a8a60be0770527 -Size (smokeping-2.4.2.tar.gz) = 909514 bytes -SHA1 (patch-aa) = 71a76129c337bfb40b226503f09118204cafebec -SHA1 (patch-ab) = 0649530b924fcdc3ba0b082faada6d048a1dacfc -SHA1 (patch-ac) = 14232cf5e5ad9e90308e9541f42149bcccc4027d -SHA1 (patch-ad) = 8a41972bd8c3b6cb7bf5d8e1daa4a194b2ef9be2 -SHA1 (patch-ae) = e243eaeb2a9377647392f3501e29e210b844084b +SHA1 (smokeping-2.6.7.tar.gz) = bc0b118164f00f79f6264f46ccb129acd1962dfc +RMD160 (smokeping-2.6.7.tar.gz) = 126adae8ec55d7119ce57daf135327b56625ba3b +Size (smokeping-2.6.7.tar.gz) = 423151 bytes +SHA1 (patch-aa) = 1926aa6ebe13b06fc4cf2fae903f32b79b4f610a +SHA1 (patch-ab) = 9258886479491e991408e07ebdf23b6fcb770f96 +SHA1 (patch-ac) = fdad1384d1925cc41e200e7a95834f76e6780fb4 +SHA1 (patch-ad) = 1b5581b88054182115ce4f667dbaaeea10596acd +SHA1 (patch-ae) = 45410102cd230d4514d8d493655a3fa9302c3e0e +SHA1 (patch-af) = ecb2c6f5beed570def7e4dd830864bb82b92654f +SHA1 (patch-ag) = f200c0522db44e08d475f1a0895ee14e01663fd8 diff --git a/net/smokeping/files/smokeping.conf b/net/smokeping/files/smokeping.conf index 4ada02ffac4..1062350810c 100644 --- a/net/smokeping/files/smokeping.conf +++ b/net/smokeping/files/smokeping.conf @@ -1,9 +1,10 @@ -# $NetBSD: smokeping.conf,v 1.1 2007/11/22 20:25:54 adrianp Exp $ +# $NetBSD: smokeping.conf,v 1.2 2012/02/02 18:54:35 bouyer Exp $ # # smokeping configuration file fragment for Apache <IfModule mod_alias.c> Alias /smokeping/ "@SPDIR@/" + Alias /cropper/ "@PREFIX@/share/httpd/htdocs/cropper/" </IfModule> <Directory "@SPDIR@"> diff --git a/net/smokeping/patches/patch-aa b/net/smokeping/patches/patch-aa index 406241b6405..c1080835ca5 100644 --- a/net/smokeping/patches/patch-aa +++ b/net/smokeping/patches/patch-aa @@ -1,41 +1,13 @@ -$NetBSD: patch-aa,v 1.10 2008/08/17 11:09:10 adrianp Exp $ +$NetBSD: patch-aa,v 1.11 2012/02/02 18:54:35 bouyer Exp $ ---- bin/smokeping.dist.orig 2008-07-24 18:37:05.000000000 +0100 -+++ bin/smokeping.dist -@@ -1,13 +1,12 @@ - #!/usr/bin/perl -w - # -*-perl-*- +--- bin/smokeping.orig 2012-02-02 15:09:15.000000000 +0100 ++++ bin/smokeping 2012-02-02 15:10:46.000000000 +0100 +@@ -11,7 +11,7 @@ --use lib qw(/usr/pack/rrdtool-1.3.0-rp/lib/perl); --use lib qw(lib); -+use lib qw(@PREFIX@/lib/smokeping); - use strict; - use warnings; - use Smokeping 2.004002; + use Smokeping; --Smokeping::main("etc/config.dist"); +-Smokeping::main("$FindBin::Bin/../etc/config"); +Smokeping::main("@PKG_SYSCONFDIR@/config"); =head1 NAME -@@ -132,17 +131,17 @@ local system. Three paths have to be ent - - One pointing to your B<rrdtool> installation - -- use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); -+ use lib qw(@PREFIX@/lib/smokeping); - - One pointing to the place where you have installed the SmokePing libraries - -- use lib qw(/home/oetiker/public_html/smokeping/lib); -+ use lib qw(@PREFIX@/lib/smokeping); - - The third path is the argument to the Smokeping::main command. It points to - the SmokePing configuration file. - - use Smokeping; -- Smokeping::main("/home/oetiker/.smokeping/config"); -+ Smokeping::main("@PKG_SYSCONFDIR@/config"); - - =head1 COPYRIGHT - diff --git a/net/smokeping/patches/patch-ab b/net/smokeping/patches/patch-ab index 85c1a41ad84..b29dc3a6316 100644 --- a/net/smokeping/patches/patch-ab +++ b/net/smokeping/patches/patch-ab @@ -1,46 +1,13 @@ -$NetBSD: patch-ab,v 1.10 2008/08/17 11:09:10 adrianp Exp $ +$NetBSD: patch-ab,v 1.11 2012/02/02 18:54:35 bouyer Exp $ ---- htdocs/smokeping.cgi.dist.orig 2008-07-24 18:37:05.000000000 +0100 -+++ htdocs/smokeping.cgi.dist -@@ -1,17 +1,16 @@ --#!/usr/bin/speedy -+#!@PREFIX@/@INTERP@ -w - # -*-perl-*- +--- bin/smokeping_cgi.orig 2012-02-02 15:12:05.000000000 +0100 ++++ bin/smokeping_cgi 2012-02-02 15:12:35.000000000 +0100 +@@ -18,7 +18,7 @@ - use strict; - use warnings; + use CGI::Fast; --use lib qw(/usr/pack/rrdtool-1.3.0-rp/lib/perl); --use lib qw(/home/oetiker/checkouts/smokeping/trunk/software/lib); -+use lib qw(@PREFIX@/lib/smokeping); +-my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config"; ++my $cfg = (shift @ARGV) || "@PKG_SYSCONFDIR@/config"; - use CGI::Carp qw(fatalsToBrowser); - use Smokeping 2.004002; - --Smokeping::cgi("/home/oetiker/checkouts/smokeping/trunk/software/etc/config.dist"); -+Smokeping::cgi("@PKG_SYSCONFDIR@/config"); - - =head1 NAME - -@@ -41,17 +40,17 @@ Please refer to the installation documen - When installing SmokePing, this file has to be adjusted to fit your - local system. Three paths have to be entered. - -- use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); -+ use lib qw(@PREFIX@/lib/smokeping); - - One pointing to your B<rrdtool> installation - -- use lib qw(/home/oetiker/public_html/smokeping/lib); -+ use lib qw(@PREFIX@/lib/smokeping); - - One pointing to the place where you have installed the SmokePing libraries - - use Smokeping; - -- Smokeping::cgi("/home/oetiker/.smokeping/config"); -+ Smokeping::cgi("@PKG_SYSCONFDIR@/config"); - - The third path is the argument to the Smokeping::cgi command. It points to - the SmokePing configuration file. + while (my $q = new CGI::Fast) { diff --git a/net/smokeping/patches/patch-ac b/net/smokeping/patches/patch-ac index 23400bec39d..d8bdca4c2c7 100644 --- a/net/smokeping/patches/patch-ac +++ b/net/smokeping/patches/patch-ac @@ -1,47 +1,46 @@ -$NetBSD: patch-ac,v 1.8 2008/08/17 11:09:10 adrianp Exp $ +$NetBSD: patch-ac,v 1.9 2012/02/02 18:54:35 bouyer Exp $ ---- etc/config.dist.orig 2008-07-24 18:36:57.000000000 +0100 -+++ etc/config.dist +--- etc/config.dist.in.orig 2011-10-30 11:33:11.000000000 +0100 ++++ etc/config.dist.in 2012-02-02 16:51:40.000000000 +0100 @@ -1,19 +1,19 @@ *** General *** -owner = Peter Random -contact = some@address.nowhere -mailhost = my.mail.host --sendmail = /usr/lib/sendmail +owner = Charlie Root +contact = root@localhost +mailhost = localhost -+sendmail = /usr/sbin/sendmail + sendmail = @SENDMAIL@ # NOTE: do not put the Image Cache below cgi-bin # since all files under cgi-bin will be executed ... this is not # good for images. --imgcache = /home/oetiker/public_html/smokeping-ms/cache +-imgcache = @prefix@/cache +imgcache = @SPDIR@/.simg imgurl = cache --datadir = /tmp/smokeping-ms/data --piddir = /tmp/smokeping-ms/var +-datadir = @prefix@/data +-piddir = @prefix@/var -cgiurl = http://some.url/smokeping.cgi --smokemail = /home/oetiker/checkouts/smokeping/trunk/software/etc/smokemail.dist --tmail = /home/oetiker/checkouts/smokeping/trunk/software/etc/tmail.dist +-smokemail = @prefix@/etc/smokemail.dist +-tmail = @prefix@/etc/tmail.dist +datadir = @VARBASE@/db/smokeping +piddir = @VARBASE@/run +cgiurl = http://localhost/cgi-bin/smokeping.cgi -+smokemail = @PREFIX@/etc/smokeping/smokemail ++smokemail = @PKG_SYSCONFDIR@/smokemail +tmail = @PKG_SYSCONFDIR@/tmail # specify this to get syslog logging syslogfacility = local0 # each probe is now run in its own process -@@ -47,7 +47,7 @@ AVERAGE 0.5 144 720 +@@ -47,7 +47,7 @@ *** Presentation *** --template = /home/oetiker/checkouts/smokeping/trunk/software/etc/basepage.html.dist +-template = @prefix@/etc/basepage.html.dist +template = @PKG_SYSCONFDIR@/basepage.html + charts -@@ -105,7 +105,7 @@ unison_tolerance = 2 +@@ -105,10 +105,10 @@ + FPing @@ -49,4 +48,8 @@ $NetBSD: patch-ac,v 1.8 2008/08/17 11:09:10 adrianp Exp $ +binary = @PREFIX@/sbin/fping *** Slaves *** - secrets=/home/oetiker/checkouts/smokeping/trunk/software/etc/smokeping_secrets.dist +-secrets=@prefix@/etc/smokeping_secrets.dist ++secrets=@PKG_SYSCONFDIR@/smokeping_secrets + +boomer + display_name=boomer + color=0000ff diff --git a/net/smokeping/patches/patch-ad b/net/smokeping/patches/patch-ad index c23056122be..7e588aedc1b 100644 --- a/net/smokeping/patches/patch-ad +++ b/net/smokeping/patches/patch-ad @@ -1,56 +1,13 @@ -$NetBSD: patch-ad,v 1.5 2008/08/17 11:09:10 adrianp Exp $ +$NetBSD: patch-ad,v 1.6 2012/02/02 18:54:35 bouyer Exp $ ---- bin/tSmoke.dist.orig 2008-07-24 18:37:05.000000000 +0100 -+++ bin/tSmoke.dist -@@ -51,8 +51,7 @@ use warnings; - # -- Getopt::Long - # - # Point the lib variables to your implementation --use lib qw(lib); --use lib qw(/usr/local/rrdtool-1.0.39/lib/perl); -+use lib "@PREFIX@/lib/smokeping"; - - use Smokeping 2.004002; - use Net::SMTP; -@@ -61,7 +60,7 @@ use Pod::Usage; +--- bin/tSmoke.orig 2012-02-02 15:16:10.000000000 +0100 ++++ bin/tSmoke 2012-02-02 15:16:31.000000000 +0100 +@@ -63,7 +63,7 @@ use RRDs; # Point to your Smokeping config file -my $cfgfile = "etc/config.dist"; -+my $cfgfile = "@PKG_SYSCONFDIR@/config"; ++my $cfgfile = "@PKG_SYSCONFDIR@/config.dist"; # global variables my $cfg; -@@ -476,9 +475,9 @@ past week and past month including an ov - Typical crontab used to invoke this are - - # Quick morning alert to see what's down -- 0 6 * * * /usr/local/smokeping/bin/tSmoke.pl --q --to=mobilephone@att.net.invalid --morning -+ 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@/bin/tSmoke.pl --q --to=mailbox@company.com.invalid --weekly --detail=0 - - =head1 SETUP - -@@ -498,17 +497,16 @@ We need to use the following B<libraries - - Set up your libraries: - -- use lib "/usr/local/smokeping/lib"; -- use lib "/usr/local/rrdtool-1.0.39/lib/perl"; -+ use lib "@PREFIX@/lib/smokeping"; - - Point to your Smokeping B<config> file - -- my $cfgfile = "/usr/local/smokeping/etc/config"; -+ my $cfgfile = "@PKG_SYSCONFDIR@/config"; - - Modify the Smokeping config file to include a path for tmail in the - General section: - -- tmail = /usr/local/smokeping/etc/tmail -+ tmail = @PKG_SYSCONFDIR@/tmail - - =head1 COPYRIGHT - diff --git a/net/smokeping/patches/patch-ae b/net/smokeping/patches/patch-ae index b367b3a7062..020b9271ce1 100644 --- a/net/smokeping/patches/patch-ae +++ b/net/smokeping/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.1 2008/08/17 11:09:10 adrianp Exp $ +$NetBSD: patch-ae,v 1.2 2012/02/02 18:54:35 bouyer Exp $ ---- htdocs/tr.cgi.dist.orig 2008-07-24 19:25:28.000000000 +0100 -+++ htdocs/tr.cgi.dist -@@ -1,6 +1,6 @@ --#!/usr/sepp/bin/speedy-5.8.8 -w -+#!@PREFIX@/@INTERP@ -w - use strict; --use lib qw(/home/oposs/smokeping/software/lib); -+use lib qw(@PREFIX@/lib/smokeping); - use lib qw(perl); +--- htdocs/Makefile.in.orig 2012-02-02 15:51:17.000000000 +0100 ++++ htdocs/Makefile.in 2012-02-02 15:52:04.000000000 +0100 +@@ -424,7 +424,7 @@ + install-data-local: + $(MKDIR) -p $(DESTDIR)$(HTDOCSDIR) + $(ECHO) "#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist +- $(ECHO) "$(prefix)/bin/smokeping_cgi $(prefix)/etc/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist ++ $(ECHO) "$(prefix)/bin/smokeping_cgi @PKG_SYSCONFDIR@/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist + chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist - use CGI; + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/net/smokeping/patches/patch-af b/net/smokeping/patches/patch-af new file mode 100644 index 00000000000..90ecc6a8109 --- /dev/null +++ b/net/smokeping/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2012/02/02 18:54:35 bouyer Exp $ + +--- lib/Makefile.in.orig 2012-02-02 16:07:25.000000000 +0100 ++++ lib/Makefile.in 2012-02-02 16:07:33.000000000 +0100 +@@ -217,7 +217,7 @@ + PROBE := $(wildcard Smokeping/probes/*.pm) + MATCH := $(wildcard Smokeping/matchers/*.pm) + EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH) +-perllibdir = $(prefix)/lib ++perllibdir = $(prefix)/lib/smokeping + nobase_perllib_DATA = $(EXTRA_DIST) + all: all-am + diff --git a/net/smokeping/patches/patch-ag b/net/smokeping/patches/patch-ag new file mode 100644 index 00000000000..f43915136f3 --- /dev/null +++ b/net/smokeping/patches/patch-ag @@ -0,0 +1,19 @@ +$NetBSD: patch-ag,v 1.1 2012/02/02 18:54:35 bouyer Exp $ + +--- etc/basepage.html.dist.orig 2012-02-02 18:44:25.000000000 +0100 ++++ etc/basepage.html.dist 2012-02-02 18:44:37.000000000 +0100 +@@ -53,10 +53,10 @@ + --> + </STYLE> + +-<script src="cropper/lib/prototype.js" type="text/javascript"></script> +-<script src="cropper/lib/scriptaculous.js?load=builder,effects,dragdrop" type="text/javascript"></script> +-<script src="cropper/cropper.js" type="text/javascript"></script> +-<script src="cropper/smokeping-zoom.js" type="text/javascript"></script> ++<script src="/cropper/lib/prototype.js" type="text/javascript"></script> ++<script src="/cropper/lib/scriptaculous.js?load=builder,effects,dragdrop" type="text/javascript"></script> ++<script src="/cropper/cropper.js" type="text/javascript"></script> ++<script src="/cropper/smokeping-zoom.js" type="text/javascript"></script> + + + |