diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile index 5cd812054a03..c0a4d0d52fa1 100644 --- a/net-mgmt/monitoring-plugins/Makefile +++ b/net-mgmt/monitoring-plugins/Makefile @@ -1,141 +1,140 @@ PORTNAME= monitoring-plugins -PORTVERSION= 2.4.0 -PORTREVISION= 0 +PORTVERSION= 3.0.1 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ \ LOCAL/mat/${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Monitoring Plugins for Nagios WWW= https://www.monitoring-plugins.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING USES= charsetfix gmake libtool perl5 ssl USE_SUBMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${PREFIX}/share \ --libexecdir=${PREFIX}/libexec/nagios \ --localstatedir=${NAGIOSDIR} \ --prefix=${PREFIX} \ --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \ --sysconfdir=${PREFIX}/etc/nagios \ --with-cgiurl=${NAGIOSCGIURL} \ --with-perl=${PERL} # Also, force some commands with their expected paths so that they don't get # disabled. CONFIGURE_ARGS+= --with-ping-command="/sbin/ping -n -t %d -c %d %s" \ --with-ping6-command="${_PING6_CMD}" \ ac_cv_path_PATH_TO_PING6=/sbin/ping6 \ ac_cv_path_PATH_TO_PING=/sbin/ping \ ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \ ac_cv_path_PATH_TO_SMBCLIENT=${LOCALBASE}/bin/smbclient \ ac_cv_path_PATH_TO_SUDO=${LOCALBASE}/bin/sudo CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CONFLICTS_INSTALL= nagios-plugins OPTIONS_DEFINE= DBI EXTRAOPTS FPING IPV6 LDAP MYSQL NETSNMP NLS PGSQL \ QSTAT RADIUS SSH_PORTABLE OPTIONS_DEFAULT= DNS_BASE EXTRAOPTS OPTIONS_SINGLE= DNS OPTIONS_SINGLE_DNS= DNS_BASE DNS_BINDTOOLS OPTIONS_SUB= yes DBI_DESC= Check database using DBI DNS_BASE_DESC= Use drill for check_dig and no check_dns DNS_BINDTOOLS_DESC= Use dig and nslookup from dns/bind-tools DNS_DESC= Configuration of check_dig and check_dns (see help) EXTRAOPTS_DESC= Parsing of plugins ini config files for extra options FPING_DESC= Support for non-flooding fast ping (check_fping) LDAP_DESC= OpenLDAP support (check_ldap) MYSQL_DESC= MySQL support (check_mysql) NETSNMP_DESC= SNMP support (check_snmp) PGSQL_DESC= PostgreSQL support (check_pgsql) QSTAT_DESC= Game server query support (check_game) RADIUS_DESC= Radius support (check_radius) SSH_PORTABLE_DESC= Build check_ssh with ports openssh (instead of base) DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CONFIGURE_WITH= dbi DNS_BASE_CONFIGURE_ON= --with-dig-command=/usr/bin/drill \ ac_cv_path_PATH_TO_NSLOOKUP= DNS_BASE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-dig-to-drill.diff DNS_BINDTOOLS_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind-tools DNS_BINDTOOLS_RUN_DEPENDS= ${DNS_BINDTOOLS_BUILD_DEPENDS} DNS_BINDTOOLS_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \ --with-nslookup-command=${LOCALBASE}/bin/nslookup EXTRAOPTS_CONFIGURE_ENABLE= extra-opts FPING_BUILD_DEPENDS= fping:net/fping FPING_RUN_DEPENDS= fping:net/fping FPING_CONFIGURE_OFF= ac_cv_path_PATH_TO_FPING6= \ ac_cv_path_PATH_TO_FPING= IPV6_CONFIGURE_WITH= ipv6 LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql=${LOCALBASE} NETSNMP_BUILD_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \ snmpcheck:net-mgmt/net-snmp NETSNMP_RUN_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \ snmpcheck:net-mgmt/net-snmp NETSNMP_CONFIGURE_OFF= ac_cv_path_PATH_TO_SNMPGET= \ ac_cv_path_PATH_TO_SNMPGETNEXT= NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql=${LOCALBASE} QSTAT_BUILD_DEPENDS= qstat:games/qstat QSTAT_RUN_DEPENDS= qstat:games/qstat QSTAT_CONFIGURE_OFF= ac_cv_path_PATH_TO_QSTAT= \ ac_cv_path_PATH_TO_QUAKESTAT= RADIUS_LIB_DEPENDS= libradiusclient-ng.so:net/radiusclient RADIUS_CONFIGURE_WITH= radius SSH_PORTABLE_BUILD_DEPENDS= ${LOCALBASE}/bin/ssh:security/openssh-portable SSH_PORTABLE_RUN_DEPENDS:= ${SSH_PORTABLE_BUILD_DEPENDS} SSH_PORTABLE_CONFIGURE_ON= --with-ssh-command=${LOCALBASE}/bin/ssh NAGIOSDIR?= /var/spool/nagios NAGIOSWWWDIR?= www/nagios NAGIOSHTMURL?= /nagios NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin .include _PING6_CMD= /sbin/ping6 -n -t %d -c %d %s .if !exists(/usr/bin/ssh) && empty(PORT_OPTIONS:MSSH_PORTABLE) PLIST_SUB+= SSH="@comment " .else PLIST_SUB+= SSH="" .endif post-patch: .for file in check_by_ssh.c check_disk.c check_http.c check_mrtgtraf.c \ - check_nagios.c check_ntp.c check_ntp_peer.c check_ntp_time.c \ + check_nagios.c check_ntp_peer.c check_ntp_time.c \ check_pgsql.c check_snmp.c check_ssh.c check_swap.c check_time.c \ check_users.c @${REINPLACE_CMD} -e 's|setlocale (LC_ALL, "");|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");|g' ${WRKSRC}/plugins/${file} .endfor .include diff --git a/net-mgmt/monitoring-plugins/distinfo b/net-mgmt/monitoring-plugins/distinfo index 027b58d41c98..7cd6564e03af 100644 --- a/net-mgmt/monitoring-plugins/distinfo +++ b/net-mgmt/monitoring-plugins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1762615052 -SHA256 (monitoring-plugins-2.4.0.tar.gz) = e5dfd4ad8fde0a40da50aab3aff6d9a27020b8f283e332bc4da6ef9914f4028c -SIZE (monitoring-plugins-2.4.0.tar.gz) = 2746382 +TIMESTAMP = 1782979824 +SHA256 (monitoring-plugins-3.0.1.tar.gz) = 683aaf6108a545a39e9c431e8fac04a1873a695041c66378f924bd54cbb225cc +SIZE (monitoring-plugins-3.0.1.tar.gz) = 3005747 diff --git a/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff b/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff index afc32e94e22c..e20e94575040 100644 --- a/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff +++ b/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff @@ -1,13 +1,15 @@ ---- plugins/check_dig.c.orig 2016-11-29 08:45:08 UTC +--- plugins/check_dig.c.orig 2026-07-01 15:57:44 UTC +++ plugins/check_dig.c -@@ -94,8 +94,8 @@ main (int argc, char **argv) - timeout_interval_dig = timeout_interval / number_tries + number_tries; +@@ -88,9 +88,9 @@ int main(int argc, char **argv) { - /* get the command to run */ -- xasprintf (&command_line, "%s %s %s -p %d @%s %s %s +retry=%d +time=%d", -- PATH_TO_DIG, dig_args, query_transport, server_port, dns_server, query_address, record_type, number_tries, timeout_interval_dig); -+ xasprintf (&command_line, "%s %s %s -p %d @%s %s %s", -+ PATH_TO_DIG, dig_args, query_transport, server_port, dns_server, query_address, record_type); + char *command_line; + /* get the command to run */ +- xasprintf(&command_line, "%s %s %s -p %d @%s %s %s +retry=%d +time=%d", PATH_TO_DIG, +- config.dig_args, config.query_transport, config.server_port, config.dns_server, +- config.query_address, config.record_type, config.number_tries, timeout_interval_dig); ++ xasprintf(&command_line, "%s %s %s -p %d @%s %s %s", PATH_TO_DIG, ++ config.dig_args, config.query_transport, config.server_port, config.dns_server, ++ config.query_address, config.record_type); - alarm (timeout_interval); - gettimeofday (&tv, NULL); + alarm(timeout_interval); + struct timeval start_time; diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins_check__http.c b/net-mgmt/monitoring-plugins/files/patch-plugins_check__http.c deleted file mode 100644 index a96b08af9a54..000000000000 --- a/net-mgmt/monitoring-plugins/files/patch-plugins_check__http.c +++ /dev/null @@ -1,17 +0,0 @@ ---- plugins/check_http.c.orig 2025-11-08 16:43:35.500239000 +0100 -+++ plugins/check_http.c 2025-11-08 17:09:19.591784000 +0100 -@@ -1476,7 +1476,13 @@ char *unchunk_content(const char *content) { - result = calloc(1, sizeof(char)); - // No error handling here, we can only return NULL anyway - } else { -- result[overall_size] = '\0'; -+ if (overall_size == 0 && result == NULL) { -+ // We might just have received the end chunk without previous content, so result is never allocated -+ result = calloc(1, sizeof(char)); -+ // No error handling here, we can only return NULL anyway -+ } else { -+ result[overall_size] = '\0'; -+ } - } - return result; - } diff --git a/net-mgmt/monitoring-plugins/pkg-plist b/net-mgmt/monitoring-plugins/pkg-plist index bd61d3c4a132..767f0b6c5530 100644 --- a/net-mgmt/monitoring-plugins/pkg-plist +++ b/net-mgmt/monitoring-plugins/pkg-plist @@ -1,71 +1,67 @@ libexec/nagios/check_apt libexec/nagios/check_breeze libexec/nagios/check_mssql %%SSH%%libexec/nagios/check_by_ssh libexec/nagios/check_clamd libexec/nagios/check_cluster %%DBI%%libexec/nagios/check_dbi @(,,04555) libexec/nagios/check_dhcp libexec/nagios/check_dig libexec/nagios/check_disk libexec/nagios/check_disk_smb %%DNS_BINDTOOLS%%libexec/nagios/check_dns libexec/nagios/check_dummy libexec/nagios/check_file_age libexec/nagios/check_flexlm %%FPING%%libexec/nagios/check_fping libexec/nagios/check_ftp %%QSTAT%%libexec/nagios/check_game %%NETSNMP%%libexec/nagios/check_hpjd libexec/nagios/check_http @(,,04555) libexec/nagios/check_icmp libexec/nagios/check_ifoperstatus libexec/nagios/check_ifstatus libexec/nagios/check_imap libexec/nagios/check_ircd libexec/nagios/check_jabber %%LDAP%%libexec/nagios/check_ldap %%LDAP%%libexec/nagios/check_ldaps libexec/nagios/check_load libexec/nagios/check_log libexec/nagios/check_mailq libexec/nagios/check_mrtg libexec/nagios/check_mrtgtraf %%MYSQL%%libexec/nagios/check_mysql %%MYSQL%%libexec/nagios/check_mysql_query libexec/nagios/check_nagios libexec/nagios/check_nntp libexec/nagios/check_nntps -libexec/nagios/check_nt -libexec/nagios/check_ntp libexec/nagios/check_ntp_peer libexec/nagios/check_ntp_time -libexec/nagios/check_nwstat libexec/nagios/check_oracle -libexec/nagios/check_overcr %%PGSQL%%libexec/nagios/check_pgsql libexec/nagios/check_ping libexec/nagios/check_pop libexec/nagios/check_procs %%RADIUS%%libexec/nagios/check_radius libexec/nagios/check_real libexec/nagios/check_rpc libexec/nagios/check_sensors libexec/nagios/check_simap libexec/nagios/check_smtp %%NETSNMP%%libexec/nagios/check_snmp libexec/nagios/check_spop libexec/nagios/check_ssh libexec/nagios/check_ssmtp libexec/nagios/check_swap libexec/nagios/check_tcp libexec/nagios/check_time libexec/nagios/check_udp libexec/nagios/check_ups libexec/nagios/check_uptime libexec/nagios/check_users libexec/nagios/check_wave libexec/nagios/negate libexec/nagios/urlize libexec/nagios/utils.pm libexec/nagios/utils.sh