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 @@ -1,41 +1,41 @@ # Created by: Veniamin Gvozdikov PORTNAME= server PORTVERSION= ${GLPI_VER}.${FUNV_VER} PORTEPOCH= 1 CATEGORIES= net-mgmt PKGNAMEPREFIX= glpi-plugins-fusioninventory- MAINTAINER= rodrigo@FreeBSD.org COMMENT= Plugin of glpi to get information of networking devices LICENSE= AGPLv3 RUN_DEPENDS= glpi>=9.5:www/glpi USES= gettext php shebangfix USE_GITHUB= yes GH_ACCOUNT= fusioninventory GH_PROJECT= fusioninventory-for-glpi 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 SHEBANG_FILES= lib/mustache.js-2.0.0/hooks/install-hooks.sh \ scripts/get_agent_jobs.php scripts/cleanup_repository.php \ scripts/prepare_jobs.php scripts/get_job_logs.php \ tools/extract_template.sh PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} GLPIPLUGINDIR?= www/glpi/plugins .include do-install: @${MKDIR} -m 0755 ${STAGEDIR}${PREFIX}/${GLPIPLUGINDIR} @${CP} -R ${WRKSRC} ${STAGEDIR}${PREFIX}/${GLPIPLUGINDIR}/fusioninventory .include 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,101 +1,100 @@ # Created by: Lars Thegler PORTNAME= smokeping -PORTVERSION= 2.7.3 -PORTREVISION= 2 +PORTVERSION= 2.8.2 CATEGORIES= net-mgmt www MAINTAINER= rodrigo@FreeBSD.org COMMENT= Latency logging and graphing system LICENSE= GPLv2 LIB_DEPENDS= librrd.so:databases/rrdtool BUILD_DEPENDS= p5-CGI-Fast>=0:www/p5-CGI-Fast \ p5-CGI-Session>=0:www/p5-CGI-Session \ p5-Digest-HMAC>=0:security/p5-Digest-HMAC \ p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \ p5-Net-DNS>=0:dns/p5-Net-DNS \ p5-IO-Pty-Easy>=0:devel/p5-IO-Pty-Easy \ p5-SNMP_Session>=0:net-mgmt/p5-SNMP_Session \ p5-libwww>=0:www/p5-libwww \ p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \ p5-CGI>=0:www/p5-CGI \ p5-FCGI>=0:www/p5-FCGI \ p5-Config-Grammar>=0:devel/p5-Config-Grammar \ p5-Socket6>=0:net/p5-Socket6 \ p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \ p5-Net-Telnet>=0:net/p5-Net-Telnet \ p5-Net-OpenSSH>=0:net/p5-Net-OpenSSH \ p5-perl-ldap>=0:net/p5-perl-ldap \ p5-OrePAN2>=0:devel/p5-OrePAN2 \ curl>=0:ftp/curl RUN_DEPENDS:= ${BUILD_DEPENDS} USES= cpe gmake perl5 autoreconf CONFLICTS_INSTALL= nfsping SUB_FILES= pkg-deinstall pkg-message SUB_LIST= USERS=${USERS} \ GROUPS=${GROUPS} NO_ARCH= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= PERL=${PERL} PERL5LIB=${PREFIX}/smokeping/lib CONFIGURE_ARGS+= \ --sysconfdir=${ETCDIR} \ --localstatedir="${PREFIX}/var" \ --with-htdocs-dir=${PREFIX}/smokeping/htdocs \ --libdir=${PREFIX}/smokeping/lib HTDOCSDIR= ${PREFIX}/smokeping/htdocs USE_RC_SUBR= smokeping PKGDEINSTALL= ${WRKDIR}/pkg-deinstall USERS= smokeping GROUPS= smokeping OPTIONS_DEFINE= ECHOPING RADIUS TELNET DNS FPING EXAMPLES OPTIONS_DEFAULT= FPING FPING_DESC= Support for fping probes FPING_RUN_DEPENDS= ${LOCALBASE}/sbin/fping:net/fping ECHOPING_DESC= Support for EchoPing probes ECHOPING_RUN_DEPENDS= ${LOCALBASE}/bin/echoping:net/echoping RADIUS_DESC= Support for Radius probes RADIUS_RUN_DEPENDS= p5-Authen-Radius>=0:security/p5-Authen-Radius TELNET_DESC= Support for TelnetIOSPing probes TELNET_RUN_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet DNS_DESC= Support for AnotherDNS probes DNS_RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS USE_GITHUB= yes GH_ACCOUNT= oetiker GH_PROJECT= SmokePing # We will take these from CPAN instead post-extract: cd ${WRKSRC}/lib ; ${RM} BER.pm SNMP_util.pm SNMP_Session.pm post-patch: ${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/doc/Makefile.am \ ${WRKSRC}/bin/smokeping \ ${WRKSRC}/bin/smokeping_cgi \ ${WRKSRC}/bin/tSmoke @for a in ${WRKSRC}/etc/*.dist; do \ ${MV} $$a $${a%.dist}.sample; \ done ${MV} ${WRKSRC}/etc/config.dist.in ${WRKSRC}/etc/config.sample.in post-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/smokeping/htdocs/img ${MKDIR} ${STAGEDIR}/${PREFIX}/var/smokeping .include 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,20 +1,20 @@ ---- 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 -use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR +use lib "/usr/local/smokeping/lib"; 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 my $cfg; 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,47 +1,38 @@ ---- 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 - kill_smoke $cfg->{General}{piddir}."/smokeping.pid", SIGHUP; + kill_smoke $cfg->{General}{piddir}."/pid", SIGHUP; 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 }; } - if($opt{restart}) { kill_smoke $cfg->{General}{piddir}."/smokeping.pid", SIGINT;}; + if($opt{restart}) { kill_smoke $cfg->{General}{piddir}."/pid", SIGINT;}; 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}); } - daemonize_me $cfg->{General}{piddir}."/smokeping.pid"; + daemonize_me $cfg->{General}{piddir}."/pid"; } 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'); - kill_smoke $cfg->{General}{piddir}."/smokeping.pid", SIGHUP; + kill_smoke $cfg->{General}{piddir}."/pid", SIGHUP; # wait until the parent signals back if it didn't already sleep if (!$gothup); if (!$gothup) {