Index: head/sysutils/munin-common/distinfo =================================================================== --- head/sysutils/munin-common/distinfo (revision 528286) +++ head/sysutils/munin-common/distinfo (revision 528287) @@ -1,3 +1,3 @@ -TIMESTAMP = 1581933398 -SHA256 (munin-2.0.56.tar.gz) = 62e1d9ed9b7fac0ff92edda84a5367f28cb95a2e3582122e2fa874069559d7f2 -SIZE (munin-2.0.56.tar.gz) = 2264291 +TIMESTAMP = 1583926528 +SHA256 (munin-2.0.57.tar.gz) = b51ca4fd73c3ceb232c17ef4d8ba96ae2d39482df6532109ae2baaf2da0eb297 +SIZE (munin-2.0.57.tar.gz) = 2266092 Index: head/sysutils/munin-common/files/patch-node_lib_Munin_Node_Server.pm =================================================================== --- head/sysutils/munin-common/files/patch-node_lib_Munin_Node_Server.pm (revision 528286) +++ head/sysutils/munin-common/files/patch-node_lib_Munin_Node_Server.pm (revision 528287) @@ -1,14 +1,14 @@ Backporting: https://github.com/munin-monitoring/munin/commit/8ff5d5a9ec8b7ffd99dce61fee42defe7bda3b29 See also: http://munin-monitoring.org/ticket/1451 ---- node/lib/Munin/Node/Server.pm.orig 2018-12-19 20:56:49 UTC +--- node/lib/Munin/Node/Server.pm.orig 2020-03-09 01:59:44 UTC +++ node/lib/Munin/Node/Server.pm -@@ -340,7 +340,7 @@ sub _print_service { +@@ -343,7 +343,7 @@ sub _print_service { sub _list_services { my ($session, $node) = @_; - $node ||= $config->{fqdn}; + $node ||= lc($config->{fqdn}); if (exists $nodes{$node}) { my @services = @{$nodes{$node}}; Index: head/sysutils/munin-common/files/patch-node_sbin_munin-node =================================================================== --- head/sysutils/munin-common/files/patch-node_sbin_munin-node (revision 528286) +++ head/sysutils/munin-common/files/patch-node_sbin_munin-node (revision 528287) @@ -1,16 +1,16 @@ plugins run in taint mode because the uid is changed, so the path must not contain writable directories. ---- node/sbin/munin-node.orig 2014-11-24 21:46:24 UTC +--- node/sbin/munin-node.orig 2020-03-09 01:59:44 UTC +++ node/sbin/munin-node -@@ -54,6 +54,10 @@ sub main +@@ -55,6 +55,10 @@ sub main $ENV{$key} = $1; } + # plugins run in taint mode because the uid is changed, so the path + # must not contain writable directories. + $ENV{PATH}='/bin:/sbin:/usr/bin:/usr/sbin:%%PREFIX%%/bin:%%PREFIX%%/sbin'; + parse_args(); my $config = Munin::Node::Config->instance(); Index: head/sysutils/munin-common/files/patch-node_sbin_munin-run =================================================================== --- head/sysutils/munin-common/files/patch-node_sbin_munin-run (revision 528286) +++ head/sysutils/munin-common/files/patch-node_sbin_munin-run (revision 528287) @@ -1,15 +1,15 @@ plugins run in taint mode because the uid is changed, so the path must not contain writable directories. ---- node/sbin/munin-run.orig 2020-01-20 19:32:33 UTC +--- node/sbin/munin-run.orig 2020-03-09 01:59:44 UTC +++ node/sbin/munin-run -@@ -115,6 +115,9 @@ sub main +@@ -118,6 +118,9 @@ sub main $ENV{$key} =~ /^(.*)$/s; $ENV{$key} = $1; } + # plugins run in taint mode because the uid is changed, so the path + # must not contain writable directories. + $ENV{PATH}='/bin:/sbin:/usr/bin:/usr/sbin:%%PREFIX%%/bin:%%PREFIX%%/sbin'; $0 =~ /^(.*)$/; $0 = $1; Index: head/sysutils/munin-common/munin.mk =================================================================== --- head/sysutils/munin-common/munin.mk (revision 528286) +++ head/sysutils/munin-common/munin.mk (revision 528287) @@ -1,38 +1,38 @@ LICENSE= GPLv2 -MUNIN_VERSION= 2.0.56 +MUNIN_VERSION= 2.0.57 MUNIN_SITES= http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/ DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files PORTSCOUT= limitw:1,even DBDIR?= /var/${PORTNAME} DBDIRNODE?= /var/${PORTNAME} LOGDIR?= /var/log/${PORTNAME} STATEDIR?= /var/run/${PORTNAME} SPOOLDIR?= /var/spool/${PORTNAME} MUNIN_DIRS= BINDIR=${PREFIX}/bin \ CGIDIR=${PREFIX}/www/cgi-bin \ CONFDIR=${ETCDIR} \ DBDIR=${DBDIR} \ DBDIRNODE=${DBDIRNODE} \ DOCDIR=${DOCSDIR} \ HTMLDIR=${WWWDIR} \ LIBDIR=${DATADIR} \ LOGDIR=${LOGDIR} \ MANDIR=${MANPREFIX}/man \ SBINDIR=${PREFIX}/sbin \ STATEDIR=${STATEDIR} \ SPOOLDIR=${SPOOLDIR} MAKE_ARGS= ${MUNIN_DIRS} \ BASH=${LOCALBASE}/bin/bash \ PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL} USERS= munin GROUPS= munin PLIST_SUB= ${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS} SUB_LIST= ${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS} CPE_VENDOR= munin-monitoring MAKE_JOBS_UNSAFE= Try to use things before making thems. Index: head/sysutils/munin-common/pkg-plist =================================================================== --- head/sysutils/munin-common/pkg-plist (revision 528286) +++ head/sysutils/munin-common/pkg-plist (revision 528287) @@ -1,18 +1,20 @@ %%SITE_PERL%%/Munin/Common/Config.pm +%%SITE_PERL%%/Munin/Common/Daemon.pm %%SITE_PERL%%/Munin/Common/Defaults.pm %%SITE_PERL%%/Munin/Common/DictFile.pm %%SITE_PERL%%/Munin/Common/SyncDictFile.pm %%SITE_PERL%%/Munin/Common/TLS.pm %%SITE_PERL%%/Munin/Common/TLSClient.pm %%SITE_PERL%%/Munin/Common/TLSServer.pm %%SITE_PERL%%/Munin/Common/Timeout.pm man/man3/Munin::Common::Config.3.gz +man/man3/Munin::Common::Daemon.3.gz man/man3/Munin::Common::Defaults.3.gz man/man3/Munin::Common::TLS.3.gz man/man3/Munin::Common::TLSClient.3.gz man/man3/Munin::Common::TLSServer.3.gz man/man3/Munin::Common::Timeout.3.gz @dir(%%USER%%,%%GROUP%%,) %%LOGDIR%% @dir(%%USER%%,%%GROUP%%,) %%STATEDIR%% @dir(%%USER%%,%%GROUP%%,) %%SPOOLDIR%% @dir(%%USER%%,%%GROUP%%,) %%DBDIR%%