diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index 90549e2e3e4e..8b5475886398 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -1,95 +1,94 @@ PORTNAME= smokeping -PORTVERSION= 2.8.2 -PORTREVISION= 7 +PORTVERSION= 2.9.0 CATEGORIES= net-mgmt www MASTER_SITES= https://oss.oetiker.ch/smokeping/pub/ MAINTAINER= rodrigo@FreeBSD.org COMMENT= Latency logging and graphing system WWW= https://oss.oetiker.ch/smokeping/ LICENSE= GPLv2 BUILD_DEPENDS= curl>=0:ftp/curl \ p5-CGI-Fast>=0:www/p5-CGI-Fast \ p5-CGI-Session>=0:www/p5-CGI-Session \ p5-CGI>=0:www/p5-CGI \ p5-Config-Grammar>=0:devel/p5-Config-Grammar \ p5-Digest-HMAC>=0:security/p5-Digest-HMAC \ p5-FCGI>=0:www/p5-FCGI \ p5-IO-Pty-Easy>=0:devel/p5-IO-Pty-Easy \ p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \ p5-libwww>=0:www/p5-libwww \ p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \ p5-Net-DNS>=0:dns/p5-Net-DNS \ p5-Net-OpenSSH>=0:net/p5-Net-OpenSSH \ p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \ p5-Net-Telnet>=0:net/p5-Net-Telnet \ p5-OrePAN2>=0:devel/p5-OrePAN2 \ p5-perl-ldap>=0:net/p5-perl-ldap \ p5-SNMP_Session>=0:net-mgmt/p5-SNMP_Session \ p5-Socket6>=0:net/p5-Socket6 LIB_DEPENDS= librrd.so:databases/rrdtool RUN_DEPENDS:= ${BUILD_DEPENDS} USES= autoreconf cpe gmake perl5 USE_RC_SUBR= smokeping GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS+= --libdir=${PREFIX}/smokeping/lib \ --localstatedir="${PREFIX}/var" \ --sysconfdir=${ETCDIR} \ --with-htdocs-dir=${PREFIX}/smokeping/htdocs CONFIGURE_ENV+= PERL5LIB=${PREFIX}/smokeping/lib \ PERL=${PERL} CONFLICTS_INSTALL= nfsping NO_ARCH= yes SUB_FILES= pkg-deinstall pkg-message SUB_LIST= GROUPS=${GROUPS} \ USERS=${USERS} HTDOCSDIR= ${PREFIX}/smokeping/htdocs USERS= smokeping GROUPS= smokeping PKGDEINSTALL= ${WRKDIR}/pkg-deinstall OPTIONS_DEFINE= DNS ECHOPING EXAMPLES FPING RADIUS TELNET OPTIONS_DEFAULT= FPING DNS_DESC= Support for AnotherDNS probes ECHOPING_DESC= Support for EchoPing probes FPING_DESC= Support for fping probes RADIUS_DESC= Support for Radius probes TELNET_DESC= Support for TelnetIOSPing probes DNS_RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS ECHOPING_RUN_DEPENDS= ${LOCALBASE}/bin/echoping:net/echoping FPING_RUN_DEPENDS= ${LOCALBASE}/sbin/fping:net/fping RADIUS_RUN_DEPENDS= p5-Authen-Radius>=0:security/p5-Authen-Radius TELNET_RUN_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet # 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 5c1be134baa9..d799accb1fcc 100644 --- a/net-mgmt/smokeping/distinfo +++ b/net-mgmt/smokeping/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668638007 -SHA256 (smokeping-2.8.2.tar.gz) = 29e61118b455e23b969ada5f8e2ab432d3e2ef87d4afe2c86de4a03d7188b6ea -SIZE (smokeping-2.8.2.tar.gz) = 582311 +TIMESTAMP = 1740347538 +SHA256 (smokeping-2.9.0.tar.gz) = f1be35bfccc2ba1c9f75f76d222b29b57024efe89c5b564b86c1a37ce2d1ddb1 +SIZE (smokeping-2.9.0.tar.gz) = 555734 diff --git a/net-mgmt/smokeping/files/patch-bin_tSmoke b/net-mgmt/smokeping/files/patch-bin_tSmoke index 9f4d0916aa21..16cfc2fc6475 100644 --- a/net-mgmt/smokeping/files/patch-bin_tSmoke +++ b/net-mgmt/smokeping/files/patch-bin_tSmoke @@ -1,20 +1,20 @@ ---- bin/tSmoke.orig 2021-11-14 17:05:16 UTC +--- bin/tSmoke.orig 2025-02-23 21:59:54 UTC +++ bin/tSmoke -@@ -53,7 +53,7 @@ - # Point the lib variables to your implementation +@@ -54,7 +54,6 @@ use lib (split /:/, q{}); # PERL5LIB --use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR +-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 @@ +@@ -64,7 +64,7 @@ use RRDs; # Point to your Smokeping config file -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_probes_FPingContinuous.pm b/net-mgmt/smokeping/files/patch-lib_Smokeping_probes_FPingContinuous.pm deleted file mode 100644 index 04aa39c2fab9..000000000000 --- a/net-mgmt/smokeping/files/patch-lib_Smokeping_probes_FPingContinuous.pm +++ /dev/null @@ -1,13 +0,0 @@ ---- lib/Smokeping/probes/FPingContinuous.pm.orig 2021-08-13 06:20:13 UTC -+++ lib/Smokeping/probes/FPingContinuous.pm -@@ -72,8 +72,8 @@ sub new($$$) - my $binary = join(" ", $self->binary); - my $testhost = $self->testhost; - my $return = `$binary -C 1 $testhost 2>&1`; -- $self->{enable}{S} = (`$binary -h 2>&1` =~ /\s-S\s/); -- $self->{enable}{O} = (`$binary -h 2>&1` =~ /\s-O\s/); -+ $self->{enable}{S} = (`$binary -h 2>&1` =~ /\s-S[,\s]/); -+ $self->{enable}{O} = (`$binary -h 2>&1` =~ /\s-O[,\s]/); - croak "ERROR: fping ('$binary -C 1 $testhost') could not be run: $return" - if $return =~ m/not found/; - croak "ERROR: FPing must be installed setuid root or it will not work\n"