[pkgsrc/trunk]: pkgsrc/net/smokeping Update smokeping from 2.4.2 to 2.6.7, fi...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/smokeping Update smokeping from 2.4.2 to 2.6.7, fi...
From: bouyer <bouyer%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 11:52:15 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ade5a4e8f73
branches:  trunk
changeset: 598975:4ade5a4e8f73
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Thu Feb 02 18:54:34 2012 +0000

description:
Update smokeping from 2.4.2 to 2.6.7, fixing SA47678.

Major changes between 2.4 and 2.6:
New in Version 2.6

    Added automake support for easy "configure, make install" installation
    fixed strftime bug when sending alert mails

New in Version 2.5

    Switched from SpeedyCGI to FastCGI
    DismanPing probe by Bill Fenner
    OpenSSHJunOSPing (Sponsoerd by Juniper)
    SIP Ping Probe (Sponsored by ANI Networks)
    Support alert patterns with upper AND lower limit: (>a<b)
    SmokeTrace removed. Check out remOcular.
    Updated Prototype and scriptaculous libraries
    ExpLoss matcher by Konoplev V.Konoplev
    Improved slave update performance

diffstat:

 net/smokeping/MESSAGE              |    3 +-
 net/smokeping/Makefile             |   95 ++++++++-----------
 net/smokeping/PLIST                |  180 ++++++++++++++++++------------------
 net/smokeping/distinfo             |   20 ++-
 net/smokeping/files/smokeping.conf |    3 +-
 net/smokeping/patches/patch-aa     |   40 +------
 net/smokeping/patches/patch-ab     |   49 +--------
 net/smokeping/patches/patch-ac     |   33 +++---
 net/smokeping/patches/patch-ad     |   53 +---------
 net/smokeping/patches/patch-ae     |   22 ++--
 net/smokeping/patches/patch-af     |   13 ++
 net/smokeping/patches/patch-ag     |   19 +++
 12 files changed, 224 insertions(+), 306 deletions(-)

diffs (truncated from 763 to 300 lines):

diff -r 49ce3c8270bf -r 4ade5a4e8f73 net/smokeping/MESSAGE
--- a/net/smokeping/MESSAGE     Thu Feb 02 18:50:08 2012 +0000
+++ b/net/smokeping/MESSAGE     Thu Feb 02 18:54:34 2012 +0000
@@ -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 @@
 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 -r 49ce3c8270bf -r 4ade5a4e8f73 net/smokeping/Makefile
--- a/net/smokeping/Makefile    Thu Feb 02 18:50:08 2012 +0000
+++ b/net/smokeping/Makefile    Thu Feb 02 18:54:34 2012 +0000
@@ -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 @@
 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 @@
 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}
 
+post-install:
+       for FILE in CHANGES CONTRIBUTORS COPYRIGHT LICENSE README TODO; do \
+               ${INSTALL_DATA} \
+               ${WRKSRC}/$$FILE ${DESTDIR}${PREFIX}/share/doc/smokeping ; \
+       done
+
+       ${INSTALL_DATA} ${WRKSRC}/smokeping.conf ${DESTDIR}${EGDIR}
+
+       ${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
+
+.include "options.mk"
+
 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 \
-               ${INSTALL_DATA} \
-                       ${WRKSRC}/$$FILE ${DESTDIR}${PREFIX}/share/doc/smokeping; \
-       done
-
-       for FILE in ${WRKSRC}/doc/*.txt; do \
-               ${INSTALL_DATA} $$FILE ${DESTDIR}${PREFIX}/share/doc/smokeping; \
-       done
-
-       for FILE in ${WRKSRC}/doc/examples/config.*; do \
-               ${INSTALL_DATA} $$FILE ${DESTDIR}${EGDIR}; \
-       done
-
-       ${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
-
-       ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/smokeping/JSON/*.pm
-       ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/smokeping/JSON.pm
-
 .include "../../mk/bsd.pkg.mk"
diff -r 49ce3c8270bf -r 4ade5a4e8f73 net/smokeping/PLIST
--- a/net/smokeping/PLIST       Thu Feb 02 18:50:08 2012 +0000
+++ b/net/smokeping/PLIST       Thu Feb 02 18:54:34 2012 +0000
@@ -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/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/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/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/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/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
Prev by Date: [pkgsrc/trunk]: pkgsrc remove G_DISABLE_DEPRECATED from Makefile to fix build...
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/ghc Allow perl-5.14. Not that it helps me, but pe...
Previous by Thread: [pkgsrc/trunk]: pkgsrc remove G_DISABLE_DEPRECATED from Makefile to fix build...
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/ghc Allow perl-5.14. Not that it helps me, but pe...
Indexes:
Home | Main Index | Thread Index | Old Index