Index: head/sysutils/munin-common/distinfo =================================================================== --- head/sysutils/munin-common/distinfo (revision 523618) +++ head/sysutils/munin-common/distinfo (revision 523619) @@ -1,3 +1,3 @@ -TIMESTAMP = 1575893190 -SHA256 (munin-2.0.52.tar.gz) = c7e2aa4e4aff175d30addbed6faf779f176f036bba2d8a3e3a44bf801c77d77e -SIZE (munin-2.0.52.tar.gz) = 2259116 +TIMESTAMP = 1579522454 +SHA256 (munin-2.0.53.tar.gz) = 30579d1249b420d4d890aafac00ce0f52afba5e74104ced40f9821c49abcd493 +SIZE (munin-2.0.53.tar.gz) = 2263588 Index: head/sysutils/munin-common/files/patch-node_sbin_munin-run =================================================================== --- head/sysutils/munin-common/files/patch-node_sbin_munin-run (revision 523618) +++ head/sysutils/munin-common/files/patch-node_sbin_munin-run (revision 523619) @@ -1,12 +1,12 @@ ---- node/sbin/munin-run.orig 2014-11-24 21:46:24 UTC +--- node/sbin/munin-run.orig 2020-01-15 21:12:19 UTC +++ node/sbin/munin-run -@@ -52,6 +52,9 @@ sub main - $ENV{$key} =~ /^(.*)$/; +@@ -110,6 +110,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 523618) +++ head/sysutils/munin-common/munin.mk (revision 523619) @@ -1,38 +1,38 @@ LICENSE= GPLv2 -MUNIN_VERSION= 2.0.52 +MUNIN_VERSION= 2.0.53 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-node/pkg-plist =================================================================== --- head/sysutils/munin-node/pkg-plist (revision 523618) +++ head/sysutils/munin-node/pkg-plist (revision 523619) @@ -1,264 +1,266 @@ bin/munin-get +bin/munindoc @sample %%ETCDIR%%/munin-node.conf.sample @dir %%ETCDIR%%/plugin-conf.d @sample %%ETCDIR%%/plugins.conf.sample %%ETCDIR%%/plugin-conf.d/plugins.conf @comment the directory exists in STAGEDIR because it is present in @comment BSD.local.dist but if not registered here, it will not exist in PREFIX @comment when the package is installed. @dir etc/newsyslog.conf.d @sample %%ETCDIR%%/munin-node.newsyslog etc/newsyslog.conf.d/munin-node.conf %%SITE_PERL%%/Munin/Node/Config.pm %%SITE_PERL%%/Munin/Node/Configure/Debug.pm %%SITE_PERL%%/Munin/Node/Configure/History.pm %%SITE_PERL%%/Munin/Node/Configure/HostEnumeration.pm %%SITE_PERL%%/Munin/Node/Configure/Plugin.pm %%SITE_PERL%%/Munin/Node/Configure/PluginList.pm %%SITE_PERL%%/Munin/Node/Logger.pm %%SITE_PERL%%/Munin/Node/OS.pm %%SITE_PERL%%/Munin/Node/SNMPConfig.pm %%SITE_PERL%%/Munin/Node/Server.pm %%SITE_PERL%%/Munin/Node/Service.pm %%SITE_PERL%%/Munin/Node/Session.pm %%SITE_PERL%%/Munin/Node/SpoolReader.pm %%SITE_PERL%%/Munin/Node/SpoolWriter.pm %%SITE_PERL%%/Munin/Node/Utils.pm %%SITE_PERL%%/Munin/Plugin.pm %%SITE_PERL%%/Munin/Plugin/Pgsql.pm %%SITE_PERL%%/Munin/Plugin/SNMP.pm man/man1/munin-get.1.gz man/man1/munin-node-configure.1.gz man/man1/munin-node.1.gz man/man1/munin-run.1.gz +man/man1/munindoc.1.gz man/man3/Munin::Node::Config.3.gz man/man3/Munin::Node::Configure::Debug.3.gz man/man3/Munin::Node::Configure::History.3.gz man/man3/Munin::Node::Configure::HostEnumeration.3.gz man/man3/Munin::Node::Configure::Plugin.3.gz man/man3/Munin::Node::Configure::PluginList.3.gz man/man3/Munin::Node::Logger.3.gz man/man3/Munin::Node::OS.3.gz man/man3/Munin::Node::SNMPConfig.3.gz man/man3/Munin::Node::Server.3.gz man/man3/Munin::Node::Service.3.gz man/man3/Munin::Node::Session.3.gz man/man3/Munin::Node::SpoolReader.3.gz man/man3/Munin::Node::SpoolWriter.3.gz man/man3/Munin::Node::Utils.3.gz man/man3/Munin::Plugin.3.gz man/man3/Munin::Plugin::Pgsql.3.gz man/man3/Munin::Plugin::SNMP.3.gz man/man5/munin-node.conf.5.gz man/man8/munin.8.gz sbin/munin-node sbin/munin-node-configure sbin/munin-run %%DATADIR%%/munin-async %%DATADIR%%/munin-asyncd %%JAVA%%%%DATADIR%%/munin-jmx-plugins.jar %%DATADIR%%/plugins/amavis %%DATADIR%%/plugins/apache_accesses %%DATADIR%%/plugins/apache_processes %%DATADIR%%/plugins/apache_volume %%DATADIR%%/plugins/apc_envunit_ %%DATADIR%%/plugins/apc_nis %%DATADIR%%/plugins/asterisk_channels %%DATADIR%%/plugins/asterisk_channelstypes %%DATADIR%%/plugins/asterisk_codecs %%DATADIR%%/plugins/asterisk_meetme %%DATADIR%%/plugins/asterisk_meetmeusers %%DATADIR%%/plugins/asterisk_sipchannels %%DATADIR%%/plugins/asterisk_sippeers %%DATADIR%%/plugins/asterisk_voicemail %%DATADIR%%/plugins/bind9 %%DATADIR%%/plugins/bind9_rndc %%DATADIR%%/plugins/cmc_tc_sensor_ %%DATADIR%%/plugins/coretemp %%DATADIR%%/plugins/courier_ %%DATADIR%%/plugins/courier_mta_mailqueue %%DATADIR%%/plugins/courier_mta_mailstats %%DATADIR%%/plugins/courier_mta_mailvolume %%DATADIR%%/plugins/cpu %%DATADIR%%/plugins/cupsys_pages %%DATADIR%%/plugins/dev_cpu_ %%DATADIR%%/plugins/df %%DATADIR%%/plugins/df_inode %%DATADIR%%/plugins/dhcpd3 %%DATADIR%%/plugins/digitemp_ %%DATADIR%%/plugins/ejabberd_ %%DATADIR%%/plugins/exim_mailqueue %%DATADIR%%/plugins/exim_mailqueue_alt %%DATADIR%%/plugins/exim_mailstats %%DATADIR%%/plugins/fail2ban %%DATADIR%%/plugins/foldingathome %%DATADIR%%/plugins/foldingathome_rank %%DATADIR%%/plugins/foldingathome_wu %%DATADIR%%/plugins/freeradius_acct %%DATADIR%%/plugins/freeradius_auth %%DATADIR%%/plugins/freeradius_proxy_acct %%DATADIR%%/plugins/freeradius_proxy_auth %%DATADIR%%/plugins/haproxy_ %%DATADIR%%/plugins/haproxy_ng %%DATADIR%%/plugins/hddtemp %%DATADIR%%/plugins/hddtemp2 %%DATADIR%%/plugins/hddtemp_smartctl %%DATADIR%%/plugins/hddtempd %%PERL%%%%DATADIR%%/plugins/hp2000_ %%DATADIR%%/plugins/http_loadtime %%DATADIR%%/plugins/if_ %%DATADIR%%/plugins/if_errcoll_ %%DATADIR%%/plugins/if_packets_ %%DATADIR%%/plugins/ifx_concurrent_sessions_ %%DATADIR%%/plugins/iostat %%DATADIR%%/plugins/ipac-ng %%DATADIR%%/plugins/ipmi_ %%PYTHON%%%%DATADIR%%/plugins/ipmi_sensor_ %%DATADIR%%/plugins/ircu %%JAVA%%%%DATADIR%%/plugins/jmx_ %%JAVA%%%%DATADIR%%/plugins/jmx_tomcat_dbpools %%DATADIR%%/plugins/load %%DATADIR%%/plugins/loggrep %%DATADIR%%/plugins/lpstat %%DATADIR%%/plugins/mailman %%DATADIR%%/plugins/mailscanner %%DATADIR%%/plugins/mbmon_ %%DATADIR%%/plugins/memcached_ %%DATADIR%%/plugins/memory %%DATADIR%%/plugins/mhttping %%DATADIR%%/plugins/multiping %%DATADIR%%/plugins/multips %%DATADIR%%/plugins/multips_memory %%DATADIR%%/plugins/munin_stats %%DATADIR%%/plugins/munin_update %%DATADIR%%/plugins/mysql_ %%DATADIR%%/plugins/mysql_bytes %%DATADIR%%/plugins/mysql_innodb %%DATADIR%%/plugins/mysql_isam_space_ %%DATADIR%%/plugins/mysql_queries %%DATADIR%%/plugins/mysql_slowqueries %%DATADIR%%/plugins/mysql_threads %%DATADIR%%/plugins/named %%DATADIR%%/plugins/netopia %%DATADIR%%/plugins/netstat %%DATADIR%%/plugins/nginx_request %%DATADIR%%/plugins/nginx_status %%DATADIR%%/plugins/nomadix_users_ %%PERL%%%%DATADIR%%/plugins/ntp_ %%DATADIR%%/plugins/ntp_kernel_err %%DATADIR%%/plugins/ntp_kernel_pll_freq %%DATADIR%%/plugins/ntp_kernel_pll_off %%DATADIR%%/plugins/ntp_offset %%PERL%%%%DATADIR%%/plugins/ntp_states %%DATADIR%%/plugins/nut_misc %%DATADIR%%/plugins/nut_volts %%DATADIR%%/plugins/nutups_ %%DATADIR%%/plugins/nvidia_ %%DATADIR%%/plugins/open_files %%DATADIR%%/plugins/openvpn %%DATADIR%%/plugins/perdition %%PERL%%%%DATADIR%%/plugins/pgbouncer_connections %%PERL%%%%DATADIR%%/plugins/pgbouncer_requests %%DATADIR%%/plugins/ping_ %%DATADIR%%/plugins/plugin.sh %%DATADIR%%/plugins/plugins.history %%DATADIR%%/plugins/pm3users_ %%DATADIR%%/plugins/pop_stats %%DATADIR%%/plugins/postfix_mailqueue %%DATADIR%%/plugins/postfix_mailstats %%DATADIR%%/plugins/postfix_mailvolume %%PERL%%%%DATADIR%%/plugins/postgres_autovacuum %%PERL%%%%DATADIR%%/plugins/postgres_bgwriter %%PERL%%%%DATADIR%%/plugins/postgres_cache_ %%PERL%%%%DATADIR%%/plugins/postgres_checkpoints %%PERL%%%%DATADIR%%/plugins/postgres_connections_ %%PERL%%%%DATADIR%%/plugins/postgres_connections_db %%PERL%%%%DATADIR%%/plugins/postgres_locks_ %%PERL%%%%DATADIR%%/plugins/postgres_oldest_prepared_xact_ %%PERL%%%%DATADIR%%/plugins/postgres_prepared_xacts_ %%PERL%%%%DATADIR%%/plugins/postgres_querylength_ %%PERL%%%%DATADIR%%/plugins/postgres_scans_ %%PERL%%%%DATADIR%%/plugins/postgres_size_ %%PERL%%%%DATADIR%%/plugins/postgres_streaming_ %%PERL%%%%DATADIR%%/plugins/postgres_transactions_ %%PERL%%%%DATADIR%%/plugins/postgres_tuples_ %%PERL%%%%DATADIR%%/plugins/postgres_users %%PERL%%%%DATADIR%%/plugins/postgres_xlog %%DATADIR%%/plugins/processes %%DATADIR%%/plugins/proxy_plugin %%DATADIR%%/plugins/ps_ %%DATADIR%%/plugins/psu_ %%DATADIR%%/plugins/qmailqstat %%DATADIR%%/plugins/qmailscan %%DATADIR%%/plugins/qmailscan-simple %%DATADIR%%/plugins/samba %%DATADIR%%/plugins/sendmail_mailqueue %%DATADIR%%/plugins/sendmail_mailstats %%DATADIR%%/plugins/sendmail_mailtraffic %%DATADIR%%/plugins/slapd_ %%DATADIR%%/plugins/slapd_bdb_cache_ %%PERL%%%%DATADIR%%/plugins/slony_lag_ %%PYTHON%%%%DATADIR%%/plugins/smart_ %%SNMP%%%%DATADIR%%/plugins/snmp__cpuload %%SNMP%%%%DATADIR%%/plugins/snmp__df %%SNMP%%%%DATADIR%%/plugins/snmp__df_ram %%SNMP%%%%DATADIR%%/plugins/snmp__fc_if_ %%SNMP%%%%DATADIR%%/plugins/snmp__fc_if_err_ %%SNMP%%%%DATADIR%%/plugins/snmp__if_ %%SNMP%%%%DATADIR%%/plugins/snmp__if_err_ %%SNMP%%%%DATADIR%%/plugins/snmp__if_multi %%SNMP%%%%DATADIR%%/plugins/snmp__load %%SNMP%%%%DATADIR%%/plugins/snmp__memory %%SNMP%%%%DATADIR%%/plugins/snmp__netapp_diskusage_ %%SNMP%%%%DATADIR%%/plugins/snmp__netapp_inodeusage_ %%SNMP%%%%DATADIR%%/plugins/snmp__netstat %%SNMP%%%%DATADIR%%/plugins/snmp__print_pages %%SNMP%%%%DATADIR%%/plugins/snmp__print_supplies %%SNMP%%%%DATADIR%%/plugins/snmp__processes %%SNMP%%%%DATADIR%%/plugins/snmp__rdp_users %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_bx_fan %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_bx_temp %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_fan %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_temp %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_mbm_fan %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_mbm_temp %%SNMP%%%%DATADIR%%/plugins/snmp__sensors_mbm_volt %%SNMP%%%%DATADIR%%/plugins/snmp__swap %%SNMP%%%%DATADIR%%/plugins/snmp__uptime %%SNMP%%%%DATADIR%%/plugins/snmp__users %%SNMP%%%%DATADIR%%/plugins/snmp__winload %%SNMP%%%%DATADIR%%/plugins/snmp__winmem %%DATADIR%%/plugins/snort_alerts %%DATADIR%%/plugins/snort_bytes_pkt %%DATADIR%%/plugins/snort_drop_rate %%DATADIR%%/plugins/snort_pattern_match %%DATADIR%%/plugins/snort_pkts %%DATADIR%%/plugins/snort_traffic %%DATADIR%%/plugins/spamstats %%DATADIR%%/plugins/squeezebox_ %%DATADIR%%/plugins/squid_cache %%DATADIR%%/plugins/squid_icp %%DATADIR%%/plugins/squid_objectsize %%DATADIR%%/plugins/squid_requests %%DATADIR%%/plugins/squid_traffic %%DATADIR%%/plugins/surfboard %%DATADIR%%/plugins/swap %%DATADIR%%/plugins/sybase_space %%DATADIR%%/plugins/systat %%DATADIR%%/plugins/tomcat_ %%DATADIR%%/plugins/tomcat_access %%DATADIR%%/plugins/tomcat_jvm %%DATADIR%%/plugins/tomcat_threads %%DATADIR%%/plugins/tomcat_volume %%DATADIR%%/plugins/uptime %%DATADIR%%/plugins/users %%PERL%%%%DATADIR%%/plugins/varnish_ %%DATADIR%%/plugins/vmstat %%DATADIR%%/plugins/zfs_arc_compression %%DATADIR%%/plugins/zfs_compress %%DATADIR%%/plugins/zimbra_ %%DATADIR%%/plugins/zpool_chksum %%DATADIR%%/plugins/zpool_dedup @dir(%%USER%%,%%GROUP%%,) %%DBDIRNODE%%/plugin-state @dir %%ETCDIR%%/plugins @dir(%%USER%%,%%GROUP%%,) %%SPOOLDIR%%/async @comment @dir %%SPOOLDIR%% @comment @dir %%DBDIRNODE%%