Date: Sun, 14 Nov 2021 23:31:46 GMT From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 87b65fba1881 - main - net-mgmt/smokeping: update to 2.8.2 Message-ID: <202111142331.1AENVkK7046970@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=87b65fba1881f63aabd73f1909ee08f22a90e607 commit 87b65fba1881f63aabd73f1909ee08f22a90e607 Author: Rodrigo Osorio <rodrigo@FreeBSD.org> AuthorDate: 2021-11-14 17:41:04 +0000 Commit: Rodrigo Osorio <rodrigo@FreeBSD.org> CommitDate: 2021-11-14 22:45:26 +0000 net-mgmt/smokeping: update to 2.8.2 Major changes: * support for influxdb * AnotherDNS update * new matcher ConsecutiveLoss * lots of spelling fixes * update FPing commandline * better handling of return codes from probe binaries * drop SSHv1 and rsa1 from SSH.pm * fix config reload for slaves * fix edgetrigger functionality * fping protocol parameter optional * exploss matcher fixes * interface parameter for fping probe * pass 6th argument to edgetrigger external alerts * red background for 100% loss * make loss colors more distinctive * calculate loss buckets based on number of 'pings' Full changelog: calculate loss buckets based on number of 'pings' --- .../glpi-plugins-fusioninventory-server/Makefile | 2 +- .../glpi-plugins-fusioninventory-server/distinfo | 6 +++--- net-mgmt/smokeping/Makefile | 3 +-- net-mgmt/smokeping/distinfo | 6 +++--- net-mgmt/smokeping/files/patch-Makefile.am | 12 ++---------- net-mgmt/smokeping/files/patch-bin_smokeping | 14 +++++++------- net-mgmt/smokeping/files/patch-bin_smokeping__cgi | 13 +++++++------ net-mgmt/smokeping/files/patch-bin_tSmoke | 10 +++++----- net-mgmt/smokeping/files/patch-lib_Smokeping.pm | 21 ++++++--------------- 9 files changed, 35 insertions(+), 52 deletions(-) diff --git a/net-mgmt/glpi-plugins-fusioninventory-server/Makefile b/net-mgmt/glpi-plugins-fusioninventory-server/Makefile index 9342bd6b9450..c4ce8b544bf0 100644 --- a/net-mgmt/glpi-plugins-fusioninventory-server/Makefile +++ b/net-mgmt/glpi-plugins-fusioninventory-server/Makefile @@ -21,7 +21,7 @@ GH_TAGNAME= glpi090+${FUNV_VER} USE_PHP= fileinfo simplexml GLPI_VER= 9.5.0 -FUNV_VER= 1.0 +FUNV_VER= 1.5 NO_BUILD= yes NO_ARCH= yes diff --git a/net-mgmt/glpi-plugins-fusioninventory-server/distinfo b/net-mgmt/glpi-plugins-fusioninventory-server/distinfo index 91e1a2418171..c482beb2bdca 100644 --- a/net-mgmt/glpi-plugins-fusioninventory-server/distinfo +++ b/net-mgmt/glpi-plugins-fusioninventory-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1610723586 -SHA256 (fusioninventory-fusioninventory-for-glpi-9.5.0.1.0-glpi090+1.0_GH0.tar.gz) = 5b2b14680bb2ad024506b0ee506518789a7921c2f4cc1b05b7db1697e1c8f6b5 -SIZE (fusioninventory-fusioninventory-for-glpi-9.5.0.1.0-glpi090+1.0_GH0.tar.gz) = 10782642 +TIMESTAMP = 1636756663 +SHA256 (fusioninventory-fusioninventory-for-glpi-9.5.0.1.5-glpi090+1.5_GH0.tar.gz) = 114f320da829d34318a1a86d86dde94b02287c3f915076520ff48e5270e3c022 +SIZE (fusioninventory-fusioninventory-for-glpi-9.5.0.1.5-glpi090+1.5_GH0.tar.gz) = 11157523 diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index 5321dc5fc948..e51c2da7fd2d 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -1,8 +1,7 @@ # Created by: Lars Thegler <lars@thegler.dk> PORTNAME= smokeping -PORTVERSION= 2.7.3 -PORTREVISION= 2 +PORTVERSION= 2.8.2 CATEGORIES= net-mgmt www MAINTAINER= rodrigo@FreeBSD.org diff --git a/net-mgmt/smokeping/distinfo b/net-mgmt/smokeping/distinfo index b794bbd15459..2f92e6205a5f 100644 --- a/net-mgmt/smokeping/distinfo +++ b/net-mgmt/smokeping/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551246685 -SHA256 (oetiker-SmokePing-2.7.3_GH0.tar.gz) = 6bd90e9a9c44a03789519cf21bd2c977476f0c11267fd55f7d14015f92b93a05 -SIZE (oetiker-SmokePing-2.7.3_GH0.tar.gz) = 323143 +TIMESTAMP = 1636906084 +SHA256 (oetiker-SmokePing-2.8.2_GH0.tar.gz) = 2f21e4d2c0e03040d46c477f20b9fbed5e5b33318a5b3e8bdd55a1f4e7bf9761 +SIZE (oetiker-SmokePing-2.8.2_GH0.tar.gz) = 373312 diff --git a/net-mgmt/smokeping/files/patch-Makefile.am b/net-mgmt/smokeping/files/patch-Makefile.am index 0a9a25c5505c..abc9b7c35e87 100644 --- a/net-mgmt/smokeping/files/patch-Makefile.am +++ b/net-mgmt/smokeping/files/patch-Makefile.am @@ -1,18 +1,10 @@ --- Makefile.am.orig 2019-01-30 16:17:01 UTC +++ Makefile.am -@@ -16,14 +16,9 @@ +@@ -16,6 +16,6 @@ AUTOMAKE_OPTIONS = foreign --SUBDIRS = thirdparty doc etc htdocs lib bin +-SUBDIRS = lib thirdparty bin doc etc htdocs +SUBDIRS = doc etc htdocs lib bin EXTRA_DIST = COPYRIGHT CHANGES CONTRIBUTORS LICENSE PERL_MODULES - --THIRDPARTY_DIR := $(shell pwd)/thirdparty -- - dist-hook: - $(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) diff --git a/net-mgmt/smokeping/files/patch-bin_smokeping b/net-mgmt/smokeping/files/patch-bin_smokeping index c68eb5d98cd2..c456336ecf28 100644 --- a/net-mgmt/smokeping/files/patch-bin_smokeping +++ b/net-mgmt/smokeping/files/patch-bin_smokeping @@ -1,18 +1,18 @@ ---- bin/smokeping.orig 2018-02-02 21:14:55 UTC -+++ bin/smokeping -@@ -5,12 +5,11 @@ use strict; +--- /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/bin/smokeping.orig 2021-11-14 17:05:16.825182000 +0000 ++++ /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/bin/smokeping 2021-11-14 17:06:25.201316000 +0000 +@@ -4,13 +4,12 @@ + use strict; use warnings; - use lib (split /:/, q{}); # PERL5LIB -use FindBin; + use lib (split /:/, q{}); # PERL5LIB -use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR +use lib "/usr/local/smokeping/lib"; use Smokeping; -- + -Smokeping::main("$FindBin::RealBin/../etc/config"); -+ -+Smokeping::main("/usr/local/etc/smokeping/config"); ++Smokeping::main("/usr/local/etc/smokeping/config"); =head1 NAME diff --git a/net-mgmt/smokeping/files/patch-bin_smokeping__cgi b/net-mgmt/smokeping/files/patch-bin_smokeping__cgi index 7900ba0d2bf6..a84fc44a2ed2 100644 --- a/net-mgmt/smokeping/files/patch-bin_smokeping__cgi +++ b/net-mgmt/smokeping/files/patch-bin_smokeping__cgi @@ -1,21 +1,22 @@ ---- bin/smokeping_cgi.orig 2018-02-02 21:14:55 UTC -+++ bin/smokeping_cgi -@@ -5,8 +5,7 @@ use strict; +--- /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/bin/smokeping_cgi.orig 2021-11-14 17:14:45.367218000 +0000 ++++ /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/bin/smokeping_cgi 2021-11-14 17:15:26.603427000 +0000 +@@ -4,9 +4,8 @@ + use strict; use warnings; - use lib (split /:/, q{}); # PERL5LIB -use FindBin; + use lib (split /:/, q{}); # PERL5LIB -use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR +use lib "/usr/local/smokeping/lib"; # don't bother with zombies $SIG{CHLD} = 'IGNORE'; -@@ -17,7 +16,7 @@ use Smokeping; +@@ -17,7 +16,7 @@ use CGI::Fast; -my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config"; -+my $cfg = (shift @ARGV) || "/usr/local/etc/smokeping/config"; ++My $cfg = (shift @ARGV) || "/usr/local/etc/smokeping/config"; while (my $q = new CGI::Fast) { diff --git a/net-mgmt/smokeping/files/patch-bin_tSmoke b/net-mgmt/smokeping/files/patch-bin_tSmoke index 7d7826389708..88b3fe14ebbc 100644 --- a/net-mgmt/smokeping/files/patch-bin_tSmoke +++ b/net-mgmt/smokeping/files/patch-bin_tSmoke @@ -1,6 +1,6 @@ ---- bin/tSmoke.orig 2018-02-02 21:14:55 UTC -+++ bin/tSmoke -@@ -53,7 +53,7 @@ use warnings; +--- /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/bin/tSmoke.orig 2021-11-14 17:17:07.113198000 +0000 ++++ /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/bin/tSmoke 2021-11-14 17:18:49.556960000 +0000 +@@ -53,7 +53,7 @@ # Point the lib variables to your implementation use lib (split /:/, q{}); # PERL5LIB @@ -9,11 +9,11 @@ use Smokeping; -@@ -63,7 +63,7 @@ use Pod::Usage; +@@ -63,7 +63,7 @@ use RRDs; # Point to your Smokeping config file --my $cfgfile = "etc/config.dist"; +-my $cfgfile = (shift @ARGV) || "$FindBin::Bin/../etc/config"; +my $cfgfile = "/usr/local/etc/smokeping/config"; # global variables diff --git a/net-mgmt/smokeping/files/patch-lib_Smokeping.pm b/net-mgmt/smokeping/files/patch-lib_Smokeping.pm index 7bd29e38f851..2b9b501e330e 100644 --- a/net-mgmt/smokeping/files/patch-lib_Smokeping.pm +++ b/net-mgmt/smokeping/files/patch-lib_Smokeping.pm @@ -1,15 +1,6 @@ ---- lib/Smokeping.pm.orig 2021-02-01 12:05:21 UTC -+++ lib/Smokeping.pm -@@ -1889,7 +1889,7 @@ sub check_alerts { - $gotalert = $match unless $gotalert; - my $edgetrigger = $alert->{edgetrigger} eq 'yes'; - my $what; -- if ($edgetrigger and $prevmatch != $match) { -+ if ($edgetrigger and ($prevmatch ? 0 : 1 ) != ($match ? 0 : 1)) { - $what = ($prevmatch == 0 ? "was raised" : "was cleared"); - } - if (not $edgetrigger and $match) { -@@ -4306,7 +4306,7 @@ sub main (;$) { +--- /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/lib/Smokeping.pm.orig 2021-11-14 17:22:44.574583000 +0000 ++++ /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/lib/Smokeping.pm 2021-11-14 17:26:17.422305000 +0000 +@@ -4631,7 +4631,7 @@ if(defined $opt{'check'}) { verify_cfg($cfgfile); exit 0; } if($opt{reload}) { load_cfg $cfgfile, 'noinit'; # we need just the piddir @@ -18,7 +9,7 @@ print "HUP signal sent to the running SmokePing process, exiting.\n"; exit 0; }; -@@ -4315,7 +4315,7 @@ sub main (;$) { +@@ -4640,7 +4640,7 @@ if(defined $opt{'static-pages'}) { makestaticpages $cfg, $opt{'static-pages'}; exit 0 }; if($opt{email}) { enable_dynamic $cfg, $cfg->{Targets},"",""; exit 0 }; } @@ -27,7 +18,7 @@ if($opt{logfile}) { initialize_filelog($opt{logfile}) }; -@@ -4328,7 +4328,7 @@ sub main (;$) { +@@ -4653,7 +4653,7 @@ initialize_syslog($cfg->{General}{syslogfacility}, $cfg->{General}{syslogpriority}); } @@ -36,7 +27,7 @@ } do_log "Smokeping version $VERSION successfully launched."; -@@ -4514,7 +4514,7 @@ KID: +@@ -4839,7 +4839,7 @@ my $new_conf = Smokeping::Slave::submit_results $slave_cfg,$cfg,$myprobe,$probes; if ($new_conf && !$gothup){ do_log('server has new config for me ... HUPing the parent');
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111142331.1AENVkK7046970>