[pkgsrc/trunk]: pkgsrc/net/smokeping Upgrade from smokeping 1.3.x to 2.0.4

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/smokeping Upgrade from smokeping 1.3.x to 2.0.4
From: adrianp <adrianp%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:29:32 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f3b65baecbc
branches:  trunk
changeset: 501775:7f3b65baecbc
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Fri Oct 28 21:43:18 2005 +0000

description:
Upgrade from smokeping 1.3.x to 2.0.4
Ok'ed bouyer@
Lots of changes but in brief:

new probe programming interface
allow target-specific vars get defaults from Probes section
config file examples and smokeping_examples document
documentation updates and reorganizing
new commandline options '--config=X' and '--check'
Perl 5.8.0 compatibility fix
RRDtool 1.2.x compatibility fix ("unknown RRD version: 0003" on restart)

See this URL for all the details:
 http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/CHANGES

diffstat:

 net/smokeping/MESSAGE            |   10 ++-
 net/smokeping/Makefile           |   66 +++++++++++++--------
 net/smokeping/PLIST              |  121 ++++++++++++++++----------------------
 net/smokeping/distinfo           |   15 ++--
 net/smokeping/files/smokeping.sh |    4 +-
 net/smokeping/patches/patch-aa   |   37 +++++++++--
 net/smokeping/patches/patch-ab   |   34 +++++++++-
 net/smokeping/patches/patch-ac   |   25 +++----
 net/smokeping/patches/patch-ad   |   56 ++++++++++++++++++
 9 files changed, 233 insertions(+), 135 deletions(-)

diffs (truncated from 566 to 300 lines):

diff -r e0bd0a72a29c -r 7f3b65baecbc net/smokeping/MESSAGE
--- a/net/smokeping/MESSAGE     Fri Oct 28 20:48:24 2005 +0000
+++ b/net/smokeping/MESSAGE     Fri Oct 28 21:43:18 2005 +0000
@@ -1,16 +1,20 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/03/24 15:24:39 bouyer Exp $
+$NetBSD: MESSAGE,v 1.2 2005/10/28 21:43:18 adrianp Exp $
 
 Smokeping is now installed.
 The documentation can be found at ${PREFIX}/share/doc/smokeping/
 
-A sample config file can be found in
-${PREFIX}/share/examples/smokeping/config.dist
+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.
+
 Also, 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.
 ===========================================================================
diff -r e0bd0a72a29c -r 7f3b65baecbc net/smokeping/Makefile
--- a/net/smokeping/Makefile    Fri Oct 28 20:48:24 2005 +0000
+++ b/net/smokeping/Makefile    Fri Oct 28 21:43:18 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2005/08/06 06:19:29 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/10/28 21:43:18 adrianp Exp $
 
-DISTNAME=      smokeping-1.37
+DISTNAME=      smokeping-2.0.4
 CATEGORIES=    net
 MASTER_SITES=  http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
 
@@ -8,7 +8,7 @@
 HOMEPAGE=      http://people.ee.ethz.ch/~oetiker/webtools/smokeping/index.en.html
 COMMENT=       Latency/packet loss monitoring/graphing tool
 
-DEPENDS=       rrdtool-1*:../../databases/rrdtool
+DEPENDS=       rrdtool>=1.0:../../databases/rrdtool
 DEPENDS+=      fping>=2.4b2:../../net/fping
 DEPENDS+=      p5-Digest-MD5>=2.20:../../security/p5-Digest-MD5
 DEPENDS+=      p5-libwww>=5.64:../../www/p5-libwww
@@ -20,13 +20,16 @@
 BUILD_DEFS+=   USE_INET6
 
 PKG_SYSCONFSUBDIR?=     smokeping
+SMOKEPING_HOME=                ${VARBASE}/db/smokeping
 MESSAGE_SUBST+=         PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 EGDIR=         ${PREFIX}/share/examples/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
 RCD_SCRIPTS=   smokeping
-REPLACE_PERL=  bin/smokeping.dist
+REPLACE_PERL=  bin/smokeping.dist bin/tSmoke.dist
 
 BUILD_DEFS+=   USE_SPEEDY
 
@@ -46,57 +49,70 @@
 SUBST_CLASSES+=                files
 SUBST_STAGE.files=     post-patch
 SUBST_FILES.files=     bin/smokeping.dist htdocs/smokeping.cgi.dist \
-                       etc/config.dist etc/smokemail.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.0|perl|g" \
+                       -e "s|perl-5.8.4|perl|g" \
                        -e "s|/usr/bin/perl|${PERL5}|g"
 SUBST_MESSAGE.files=   "Fixing configuration files."
 
+OWN_DIRS+=             ${SMOKEPING_HOME} 
+
 INSTALLATION_DIRS=     bin libexec/cgi-bin
 
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/ISG
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/matchers
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/probes
+       ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Config
+       ${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}/share/doc/smokeping
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping/matchers
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping/probes
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/smokeping
+
        for FILE in CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO; do \
          ${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/smokeping; \
        done
+
        for FILE in ${WRKSRC}/doc/*.txt; do \
          ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/smokeping; \
        done
-       for FILE in ${WRKSRC}/doc/matchers/*.txt; do \
-         ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/smokeping/matchers; \
+
+       for FILE in ${WRKSRC}/doc/examples/config.*; do \
+         ${INSTALL_DATA} $$FILE ${PREFIX}/share/examples/smokeping; \
        done
-       for FILE in ${WRKSRC}/doc/probes/*.txt; do \
-         ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/smokeping/probes; \
-       done
-       ${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping.dist \
-               ${PREFIX}/bin/smokeping
+
+       ${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping.dist ${PREFIX}/bin/smokeping
+       ${INSTALL_SCRIPT} ${WRKSRC}/bin/tSmoke.dist ${PREFIX}/bin/tSmoke
+
        ${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/ISG/*.pm; do \
-         ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/ISG; \
+
+       for FILE in ${WRKSRC}/lib/Config/*.pm; do \
+         ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Config; \
+       done
+
+       for FILE in ${WRKSRC}/lib/Smokeping/*.pm; do \
+         ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping; \
        done
-       for FILE in ${WRKSRC}/lib/probes/*.pm; do \
-         ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/probes; \
+
+       for FILE in ${WRKSRC}/lib/Smokeping/matchers/*.pm; do \
+         ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping/matchers; \
        done
-       for FILE in ${WRKSRC}/lib/matchers/*.pm; do \
-         ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/matchers; \
+
+       for FILE in ${WRKSRC}/lib/Smokeping/probes/*.pm; do \
+         ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping/probes; \
        done
+
        for FILE in ${WRKSRC}/etc/config.dist \
            ${WRKSRC}/etc/basepage.html.dist \
-           ${WRKSRC}/etc/config-echoping.dist \
+           ${WRKSRC}/etc/tmail.dist \
+           ${WRKSRC}/etc/config.dist \
            ${WRKSRC}/etc/smokemail.dist; do \
          ${INSTALL_DATA} $$FILE ${PREFIX}/share/examples/smokeping; \
        done
diff -r e0bd0a72a29c -r 7f3b65baecbc net/smokeping/PLIST
--- a/net/smokeping/PLIST       Fri Oct 28 20:48:24 2005 +0000
+++ b/net/smokeping/PLIST       Fri Oct 28 21:43:18 2005 +0000
@@ -1,92 +1,75 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:34:04 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/10/28 21:43:18 adrianp Exp $
 bin/smokeping
+bin/tSmoke
 lib/smokeping/BER.pm
-lib/smokeping/ISG/ParseConfig.pm
+lib/smokeping/Config/Grammar.pm
 lib/smokeping/SNMP_Session.pm
 lib/smokeping/SNMP_util.pm
 lib/smokeping/Smokeping.pm
-lib/smokeping/ciscoRttMonMIB.pm
-lib/smokeping/matchers/avgratio.pm
-lib/smokeping/matchers/base.pm
-lib/smokeping/matchers/median.pm
-lib/smokeping/probes/AnotherDNS.pm
-lib/smokeping/probes/AnotherSSH.pm
-lib/smokeping/probes/CiscoRTTMonDNS.pm
-lib/smokeping/probes/CiscoRTTMonEchoICMP.pm
-lib/smokeping/probes/CiscoRTTMonTcpConnect.pm
-lib/smokeping/probes/Curl.pm
-lib/smokeping/probes/DNS.pm
-lib/smokeping/probes/EchoPing.pm
-lib/smokeping/probes/EchoPingChargen.pm
-lib/smokeping/probes/EchoPingDiscard.pm
-lib/smokeping/probes/EchoPingHttp.pm
-lib/smokeping/probes/EchoPingHttps.pm
-lib/smokeping/probes/EchoPingIcp.pm
-lib/smokeping/probes/EchoPingSmtp.pm
-lib/smokeping/probes/FPing.pm
-lib/smokeping/probes/FPing6.pm
-lib/smokeping/probes/IOSPing.pm
-lib/smokeping/probes/LDAP.pm
-lib/smokeping/probes/Radius.pm
-lib/smokeping/probes/RemoteFPing.pm
-lib/smokeping/probes/SSH.pm
-lib/smokeping/probes/base.pm
-lib/smokeping/probes/basefork.pm
-lib/smokeping/probes/basevars.pm
-lib/smokeping/probes/passwordchecker.pm
-lib/smokeping/probes/telnetIOSPing.pm
+lib/smokeping/Smokeping/Examples.pm
+lib/smokeping/Smokeping/RRDtools.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/probes/AnotherDNS.pm
+lib/smokeping/Smokeping/probes/AnotherSSH.pm
+lib/smokeping/Smokeping/probes/CiscoRTTMonDNS.pm
+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/EchoPing.pm
+lib/smokeping/Smokeping/probes/EchoPingChargen.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/EchoPingSmtp.pm
+lib/smokeping/Smokeping/probes/FPing.pm
+lib/smokeping/Smokeping/probes/FPing6.pm
+lib/smokeping/Smokeping/probes/IOSPing.pm
+lib/smokeping/Smokeping/probes/LDAP.pm
+lib/smokeping/Smokeping/probes/Radius.pm
+lib/smokeping/Smokeping/probes/RemoteFPing.pm
+lib/smokeping/Smokeping/probes/SSH.pm
+lib/smokeping/Smokeping/probes/TelnetIOSPing.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
 libexec/cgi-bin/smokeping.cgi
 share/doc/smokeping/CHANGES
 share/doc/smokeping/CONTRIBUTORS
 share/doc/smokeping/COPYING
 share/doc/smokeping/COPYRIGHT
-share/doc/smokeping/ParseConfig.pm.txt
 share/doc/smokeping/README
-share/doc/smokeping/Smokeping.pm.txt
+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/matchers/avgratio.pm.txt
-share/doc/smokeping/matchers/base.pm.txt
-share/doc/smokeping/matchers/median.pm.txt
-share/doc/smokeping/probes/AnotherDNS.pm.txt
-share/doc/smokeping/probes/AnotherSSH.pm.txt
-share/doc/smokeping/probes/CiscoRTTMonDNS.pm.txt
-share/doc/smokeping/probes/CiscoRTTMonEchoICMP.pm.txt
-share/doc/smokeping/probes/CiscoRTTMonTcpConnect.pm.txt
-share/doc/smokeping/probes/Curl.pm.txt
-share/doc/smokeping/probes/DNS.pm.txt
-share/doc/smokeping/probes/EchoPing.pm.txt
-share/doc/smokeping/probes/EchoPingChargen.pm.txt
-share/doc/smokeping/probes/EchoPingDiscard.pm.txt
-share/doc/smokeping/probes/EchoPingHttp.pm.txt
-share/doc/smokeping/probes/EchoPingHttps.pm.txt
-share/doc/smokeping/probes/EchoPingIcp.pm.txt
-share/doc/smokeping/probes/EchoPingSmtp.pm.txt
-share/doc/smokeping/probes/FPing.pm.txt
-share/doc/smokeping/probes/FPing6.pm.txt
-share/doc/smokeping/probes/IOSPing.pm.txt
-share/doc/smokeping/probes/LDAP.pm.txt
-share/doc/smokeping/probes/Radius.pm.txt
-share/doc/smokeping/probes/RemoteFPing.pm.txt
-share/doc/smokeping/probes/SSH.pm.txt
-share/doc/smokeping/probes/base.pm.txt
-share/doc/smokeping/probes/basefork.pm.txt
-share/doc/smokeping/probes/basevars.pm.txt
-share/doc/smokeping/probes/passwordchecker.pm.txt
-share/doc/smokeping/probes/telnetIOSPing.pm.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-echoping.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/tmail.dist
 @dirrm share/examples/smokeping
-@dirrm share/doc/smokeping/matchers
-@dirrm share/doc/smokeping/probes
 @dirrm share/doc/smokeping
-@dirrm lib/smokeping/probes
-@dirrm lib/smokeping/matchers
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc chmlib updated to 0.37.3.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note PKGREVISION bump for net/wap-utils.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc chmlib updated to 0.37.3.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note PKGREVISION bump for net/wap-utils.
Indexes:
Home | Main Index | Thread Index | Old Index