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.7.3
details: https://anonhg.NetBSD.org/pkgsrc/rev/2ff71104df6e
branches: trunk
changeset: 428418:2ff71104df6e
user: bouyer <bouyer%pkgsrc.org@localhost>
date: Mon Apr 27 18:05:18 2020 +0000
description:
Update to 2.7.3
pkgsrc change: js/css files are now installed in share/smokeping/{js,css}
Changes since 2.6.7:
handle servers actually implementing OPTIONS
fork alert handlers, so that smokeping does not block
HTTP auth user template support
Added new probe SendEmail
A probe to use the EOS "ping" cli command
Adds a Qstat probe plugin
Added IPv6 (ipversion) and TCP (protocol) support
Add a custom Curl probe.
New TraceroutePing probe module
Add the FPingContinuous probe
Initial revision of IRTT probe
diffstat:
net/smokeping/Makefile | 24 +++++++++----
net/smokeping/PLIST | 50 +++++++++++++++++++---------
net/smokeping/distinfo | 27 ++++++++-------
net/smokeping/files/smokeping.conf | 6 +--
net/smokeping/patches/patch-Makefile.in | 21 ++++++++++++
net/smokeping/patches/patch-aa | 14 +++++--
net/smokeping/patches/patch-ab | 8 ++--
net/smokeping/patches/patch-ac | 12 +++---
net/smokeping/patches/patch-ad | 6 +-
net/smokeping/patches/patch-ae | 12 +++---
net/smokeping/patches/patch-af | 8 ++--
net/smokeping/patches/patch-ag | 41 +++++++++++++++--------
net/smokeping/patches/patch-bin_Makefile.in | 13 +++++++
13 files changed, 157 insertions(+), 85 deletions(-)
diffs (truncated from 443 to 300 lines):
diff -r b685c329dab5 -r 2ff71104df6e net/smokeping/Makefile
--- a/net/smokeping/Makefile Mon Apr 27 17:58:51 2020 +0000
+++ b/net/smokeping/Makefile Mon Apr 27 18:05:18 2020 +0000
@@ -1,28 +1,36 @@
-# $NetBSD: Makefile,v 1.43 2019/11/03 11:45:53 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2020/04/27 18:05:18 bouyer Exp $
-DISTNAME= smokeping-2.6.7
-PKGREVISION= 8
+DISTNAME= smokeping-2.7.3
CATEGORIES= net
MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/
MAINTAINER= bouyer%NetBSD.org@localhost
HOMEPAGE= https://oss.oetiker.ch/smokeping/index.en.html
COMMENT= Latency/packet loss monitoring/graphing tool
+LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${VARBASE}/db/smokeping
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --with-htdocs-dir=${PREFIX}/share/httpd/htdocs
+CONFIGURE_ARGS+= --with-htdocs-dir=${PREFIX}/share/smokeping
DEPENDS+= rrdtool>=1.0:../../databases/rrdtool
DEPENDS+= fping>=2.4b2:../../net/fping
#DEPENDS+= {perl>=5.8.0,p5-Digest-MD5>=2.20}:../../security/p5-Digest-MD5
+DEPENDS+= p5-Config-Grammar>=1.10:../../devel/p5-Config-Grammar
+DEPENDS+= p5-Path-Tiny>=0.108:../../filesystems/p5-Path-Tiny
+DEPENDS+= p5-Socket6>=0.29:../../net/p5-Socket6
+DEPENDS+= p5-Net-Telnet>=3.04:../../net/p5-Net-Telnet
+DEPENDS+= p5-Net-SNMP>=v6.0.1:../../net/p5-Net-SNMP
+DEPENDS+= p5-Net-DNS>=1.23:../../net/p5-Net-DNS
DEPENDS+= p5-Digest-HMAC>=1.03:../../security/p5-Digest-HMAC
-DEPENDS+= p5-libwww>=5.64:../../www/p5-libwww
+DEPENDS+= p5-Net-OpenSSH>=0.78:../../security/p5-Net-OpenSSH
+DEPENDS+= p5-IO-Socket-SSL>=2.067:../../security/p5-IO-Socket-SSL
+DEPENDS+= p5-Digest-HMAC>=1.03:../../security/p5-Digest-HMAC
DEPENDS+= p5-FCGI>=0.74:../../www/p5-FCGI
DEPENDS+= p5-CGI>=4.20:../../www/p5-CGI
DEPENDS+= p5-CGI-Fast>=2.09:../../www/p5-CGI-Fast
-DEPENDS+= p5-Config-Grammar>=1.10:../../devel/p5-Config-Grammar
+DEPENDS+= p5-libwww>=6.43:../../www/p5-libwww
USE_TOOLS+= pax gmake perl:run
@@ -68,7 +76,7 @@
OWN_DIRS+= ${SMOKEPING_HOME}
OWN_DIRS+= ${SPDIR}/.simg
-INSTALLATION_DIRS= bin libexec/cgi-bin share/httpd/htdocs
+INSTALLATION_DIRS= bin libexec/cgi-bin share/smokeping
post-extract:
${CP} ${FILESDIR}/smokeping.conf ${WRKSRC}
@@ -81,7 +89,7 @@
${INSTALL_DATA} ${WRKSRC}/smokeping.conf ${DESTDIR}${EGDIR}
- ${MV} ${DESTDIR}${PREFIX}/share/httpd/htdocs/smokeping.fcgi.dist \
+ ${MV} ${DESTDIR}${PREFIX}/share/smokeping/smokeping.fcgi.dist \
${DESTDIR}${PREFIX}/libexec/cgi-bin/smokeping.cgi
${MV} ${DESTDIR}${PKG_SYSCONFDIR}/*.dist ${DESTDIR}${EGDIR}/
${MV} ${DESTDIR}${PKG_SYSCONFDIR}/examples/* ${DESTDIR}${EGDIR}/
diff -r b685c329dab5 -r 2ff71104df6e net/smokeping/PLIST
--- a/net/smokeping/PLIST Mon Apr 27 17:58:51 2020 +0000
+++ b/net/smokeping/PLIST Mon Apr 27 18:05:18 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2018/01/01 22:29:49 rillig Exp $
+@comment $NetBSD: PLIST,v 1.15 2020/04/27 18:05:18 bouyer Exp $
bin/smokeinfo
bin/smokeping
bin/smokeping_cgi
@@ -25,6 +25,7 @@
lib/smokeping/Smokeping/matchers/Medratio.pm
lib/smokeping/Smokeping/matchers/base.pm
lib/smokeping/Smokeping/pingMIB.pm
+lib/smokeping/Smokeping/probes/AnotherCurl.pm
lib/smokeping/Smokeping/probes/AnotherDNS.pm
lib/smokeping/Smokeping/probes/AnotherSSH.pm
lib/smokeping/Smokeping/probes/CiscoRTTMonDNS.pm
@@ -46,19 +47,25 @@
lib/smokeping/Smokeping/probes/EchoPingWhois.pm
lib/smokeping/Smokeping/probes/FPing.pm
lib/smokeping/Smokeping/probes/FPing6.pm
+lib/smokeping/Smokeping/probes/FPingContinuous.pm
lib/smokeping/Smokeping/probes/FTPtransfer.pm
lib/smokeping/Smokeping/probes/IOSPing.pm
+lib/smokeping/Smokeping/probes/IRTT.pm
lib/smokeping/Smokeping/probes/LDAP.pm
lib/smokeping/Smokeping/probes/NFSping.pm
+lib/smokeping/Smokeping/probes/OpenSSHEOSPing.pm
lib/smokeping/Smokeping/probes/OpenSSHJunOSPing.pm
+lib/smokeping/Smokeping/probes/Qstat.pm
lib/smokeping/Smokeping/probes/Radius.pm
lib/smokeping/Smokeping/probes/RemoteFPing.pm
lib/smokeping/Smokeping/probes/SSH.pm
+lib/smokeping/Smokeping/probes/SendEmail.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
lib/smokeping/Smokeping/probes/TelnetJunOSPing.pm
+lib/smokeping/Smokeping/probes/TraceroutePing.pm
lib/smokeping/Smokeping/probes/WebProxyFilter.pm
lib/smokeping/Smokeping/probes/base.pm
lib/smokeping/Smokeping/probes/basefork.pm
@@ -81,6 +88,7 @@
man/man3/Smokeping_matchers_Median.3
man/man3/Smokeping_matchers_Medratio.3
man/man3/Smokeping_matchers_base.3
+man/man3/Smokeping_probes_AnotherCurl.3
man/man3/Smokeping_probes_AnotherDNS.3
man/man3/Smokeping_probes_AnotherSSH.3
man/man3/Smokeping_probes_CiscoRTTMonDNS.3
@@ -102,19 +110,25 @@
man/man3/Smokeping_probes_EchoPingWhois.3
man/man3/Smokeping_probes_FPing.3
man/man3/Smokeping_probes_FPing6.3
+man/man3/Smokeping_probes_FPingContinuous.3
man/man3/Smokeping_probes_FTPtransfer.3
man/man3/Smokeping_probes_IOSPing.3
+man/man3/Smokeping_probes_IRTT.3
man/man3/Smokeping_probes_LDAP.3
man/man3/Smokeping_probes_NFSping.3
+man/man3/Smokeping_probes_OpenSSHEOSPing.3
man/man3/Smokeping_probes_OpenSSHJunOSPing.3
+man/man3/Smokeping_probes_Qstat.3
man/man3/Smokeping_probes_Radius.3
man/man3/Smokeping_probes_RemoteFPing.3
man/man3/Smokeping_probes_SSH.3
+man/man3/Smokeping_probes_SendEmail.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_TraceroutePing.3
man/man3/Smokeping_probes_WebProxyFilter.3
man/man3/Smokeping_probes_base.3
man/man3/Smokeping_probes_basefork.3
@@ -150,19 +164,21 @@
share/examples/smokeping/smokeping.conf
share/examples/smokeping/smokeping_secrets.dist
share/examples/smokeping/tmail.dist
-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
+share/smokeping/css/smokeping-print.css
+share/smokeping/css/smokeping-screen.css
+share/smokeping/js/cropper/cropper.css
+share/smokeping/js/cropper/cropper.js
+share/smokeping/js/cropper/cropper.uncompressed.js
+share/smokeping/js/cropper/licence.txt
+share/smokeping/js/cropper/marqueeHoriz.gif
+share/smokeping/js/cropper/marqueeVert.gif
+share/smokeping/js/prototype.js
+share/smokeping/js/scriptaculous/builder.js
+share/smokeping/js/scriptaculous/controls.js
+share/smokeping/js/scriptaculous/dragdrop.js
+share/smokeping/js/scriptaculous/effects.js
+share/smokeping/js/scriptaculous/scriptaculous.js
+share/smokeping/js/scriptaculous/slider.js
+share/smokeping/js/scriptaculous/sound.js
+share/smokeping/js/scriptaculous/unittest.js
+share/smokeping/js/smokeping.js
diff -r b685c329dab5 -r 2ff71104df6e net/smokeping/distinfo
--- a/net/smokeping/distinfo Mon Apr 27 17:58:51 2020 +0000
+++ b/net/smokeping/distinfo Mon Apr 27 18:05:18 2020 +0000
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.16 2015/11/04 00:35:37 agc Exp $
+$NetBSD: distinfo,v 1.17 2020/04/27 18:05:18 bouyer Exp $
-SHA1 (smokeping-2.6.7.tar.gz) = bc0b118164f00f79f6264f46ccb129acd1962dfc
-RMD160 (smokeping-2.6.7.tar.gz) = 126adae8ec55d7119ce57daf135327b56625ba3b
-SHA512 (smokeping-2.6.7.tar.gz) = 482c6e7fe5de4a3b3dd5b936eead6fca817932d032fcec7050ee258bf5e7718e677f14ad2660099661837041a5f6d4894b8cf832f248d036b3b36e8bf5737095
-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
-SHA1 (patch-lib_Smokeping.pm) = 19ab8a169b1db99686bbe7af24dec1b5c2b6fb77
+SHA1 (smokeping-2.7.3.tar.gz) = a57dbd201b3d9142b15dcf63a906a265989a2929
+RMD160 (smokeping-2.7.3.tar.gz) = 54ebc0f840a7c52e4610a7409fa3213e1a90b647
+SHA512 (smokeping-2.7.3.tar.gz) = d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830
+Size (smokeping-2.7.3.tar.gz) = 6614710 bytes
+SHA1 (patch-Makefile.in) = 9eceb69c516a50b0b48ca5afad8fb8a8a1550d72
+SHA1 (patch-aa) = e1bec9750bcb3dfd9e38e4d5dea5e4bf6359e077
+SHA1 (patch-ab) = 9a14917909b6bfee57109d01dec4b9a89c56f448
+SHA1 (patch-ac) = e0420ee1108e3aa332c7e77970920cce3cc5dafd
+SHA1 (patch-ad) = bfc0d914ef24249dd01651caab27023ef2ac9d89
+SHA1 (patch-ae) = 9529ab685db10d7a4b19d4ccd0f10d0621d2cccf
+SHA1 (patch-af) = 95541f07c1e4bb77c58a9a215d6deae849523fec
+SHA1 (patch-ag) = cacfb3403115cbef3bb211a918482d5ed112fc9a
+SHA1 (patch-bin_Makefile.in) = 434300b628a1db9a583eb61a4389ad79428f98b3
diff -r b685c329dab5 -r 2ff71104df6e net/smokeping/files/smokeping.conf
--- a/net/smokeping/files/smokeping.conf Mon Apr 27 17:58:51 2020 +0000
+++ b/net/smokeping/files/smokeping.conf Mon Apr 27 18:05:18 2020 +0000
@@ -1,13 +1,11 @@
-# $NetBSD: smokeping.conf,v 1.2 2012/02/02 18:54:35 bouyer Exp $
+# $NetBSD: smokeping.conf,v 1.3 2020/04/27 18:05:18 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@">
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
diff -r b685c329dab5 -r 2ff71104df6e net/smokeping/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/smokeping/patches/patch-Makefile.in Mon Apr 27 18:05:18 2020 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/04/27 18:05:18 bouyer Exp $
+
+--- Makefile.in.orig 2020-04-23 11:52:35.396108377 +0200
++++ Makefile.in 2020-04-23 11:53:14.548543368 +0200
+@@ -313,7 +313,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = thirdparty doc etc htdocs lib bin
++SUBDIRS = doc etc htdocs lib bin
+ EXTRA_DIST = COPYRIGHT CHANGES CONTRIBUTORS LICENSE PERL_MODULES
+ THIRDPARTY_DIR := $(shell pwd)/thirdparty
+ all: all-recursive
+@@ -781,7 +781,6 @@
+ $(PERL) -i -p -e '"$(PACKAGE_VERSION)" =~ /(\d+)\.(\d+)\.(\d+)/ and $$v = sprintf("%d.%03d%03d",$$1,$$2,$$3) and s/^\$$VERSION\s*=\s*".*?"/\$$VERSION = "$$v"/' $(distdir)/lib/Smokeping.pm
+
+ install-exec-hook:
+- [ ! -d $(THIRDPARTY_DIR)/lib/perl5 ] || $(CP) -fr $(THIRDPARTY_DIR)/lib/perl5/* $(DESTDIR)$(libdir)
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff -r b685c329dab5 -r 2ff71104df6e net/smokeping/patches/patch-aa
--- a/net/smokeping/patches/patch-aa Mon Apr 27 17:58:51 2020 +0000
+++ b/net/smokeping/patches/patch-aa Mon Apr 27 18:05:18 2020 +0000
@@ -1,12 +1,16 @@
-$NetBSD: patch-aa,v 1.11 2012/02/02 18:54:35 bouyer Exp $
+$NetBSD: patch-aa,v 1.12 2020/04/27 18:05:18 bouyer Exp $
---- 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 @@
+--- bin/smokeping.orig 2018-04-13 14:13:05.000000000 +0200
++++ bin/smokeping 2020-04-26 12:13:00.964611375 +0200
+@@ -6,11 +6,11 @@
+
+ use lib (split /:/, q{}); # PERL5LIB
+ use FindBin;
+ use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
use Smokeping;
--Smokeping::main("$FindBin::Bin/../etc/config");
+-Smokeping::main("$FindBin::RealBin/../etc/config");
+Smokeping::main("@PKG_SYSCONFDIR@/config");
=head1 NAME
diff -r b685c329dab5 -r 2ff71104df6e net/smokeping/patches/patch-ab
--- a/net/smokeping/patches/patch-ab Mon Apr 27 17:58:51 2020 +0000
+++ b/net/smokeping/patches/patch-ab Mon Apr 27 18:05:18 2020 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2012/02/02 18:54:35 bouyer Exp $
+$NetBSD: patch-ab,v 1.12 2020/04/27 18:05:18 bouyer Exp $
---- 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 @@
+--- bin/smokeping_cgi.orig 2020-04-26 12:26:58.308638086 +0200
++++ bin/smokeping_cgi 2020-04-26 12:27:17.592838363 +0200
+@@ -17,7 +17,7 @@
use CGI::Fast;
diff -r b685c329dab5 -r 2ff71104df6e net/smokeping/patches/patch-ac
--- a/net/smokeping/patches/patch-ac Mon Apr 27 17:58:51 2020 +0000
+++ b/net/smokeping/patches/patch-ac Mon Apr 27 18:05:18 2020 +0000
@@ -1,7 +1,7 @@
Home |
Main Index |
Thread Index |
Old Index