diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile index e9652fe16219..c0fc97c87954 100644 --- a/net-mgmt/monitoring-plugins/Makefile +++ b/net-mgmt/monitoring-plugins/Makefile @@ -1,141 +1,140 @@ PORTNAME= monitoring-plugins -PORTVERSION= 3.0.1 -PORTREVISION= 1 +PORTVERSION= 3.0.3 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_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 7cd6564e03af..9f48808a1570 100644 --- a/net-mgmt/monitoring-plugins/distinfo +++ b/net-mgmt/monitoring-plugins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1782979824 -SHA256 (monitoring-plugins-3.0.1.tar.gz) = 683aaf6108a545a39e9c431e8fac04a1873a695041c66378f924bd54cbb225cc -SIZE (monitoring-plugins-3.0.1.tar.gz) = 3005747 +TIMESTAMP = 1786423683 +SHA256 (monitoring-plugins-3.0.3.tar.gz) = a1df32ef4791defd5418907b54be1549c81598fd02e339c4595d2d26107b3280 +SIZE (monitoring-plugins-3.0.3.tar.gz) = 3006770 diff --git a/net-mgmt/monitoring-plugins/files/patch-configure b/net-mgmt/monitoring-plugins/files/patch-configure index ebf2d126206d..5960995f69f0 100644 --- a/net-mgmt/monitoring-plugins/files/patch-configure +++ b/net-mgmt/monitoring-plugins/files/patch-configure @@ -1,28 +1,19 @@ ---- configure.orig 2026-07-01 12:04:19 UTC +--- configure.orig 2020-12-09 21:48:15 UTC +++ configure -@@ -20664,6 +20664,16 @@ printf '%s\n' "$ac_cv_ps_command" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 - printf '%s\n' "$ac_cv_ps_command" >&6; } +@@ -17472,6 +17472,16 @@ then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 + $as_echo "$ac_cv_ps_command" >&6; } +elif ps -axwo 'stat comm vsz rss user uid pid ppid args jid' 2>/dev/null | \ + egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND +JID" > /dev/null +then + ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procjid,&procvsz,&procrss,&procpcpu,procprog,&pos" + ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid jid vsz rss pcpu comm args'" + ac_cv_ps_format="%s %d %d %d %d %d %d %f %s %n" + ac_cv_ps_cols=10 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } + elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ - grep -E -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null + egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null then -@@ -22587,7 +22597,7 @@ then - - if $PATH_TO_SWAPINFO -k 2>/dev/null | grep -E -i "^Device +1K-blocks +Used +Avail" >/dev/null - then -- ac_cv_swap_format="%*s %lu %*d %lu" -+ ac_cv_swap_format="%*s %lf %*d %lf" - ac_cv_swap_conv=1024 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: using FreeBSD format swapinfo" >&5 - printf '%s\n' "using FreeBSD format swapinfo" >&6; } diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins_check__smtp.c b/net-mgmt/monitoring-plugins/files/patch-plugins_check__smtp.c deleted file mode 100644 index 9e9ed017120f..000000000000 --- a/net-mgmt/monitoring-plugins/files/patch-plugins_check__smtp.c +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/check_smtp.c.orig 2026-07-27 09:49:59 UTC -+++ plugins/check_smtp.c -@@ -793,7 +793,7 @@ check_smtp_config_wrapper process_arguments(int argc, - usage(_("SSL support not available - install OpenSSL and recompile")); - #endif - implicit_tls = true; -- // fallthrough -+ break; - case 's': - /* ssl */ - result.config.use_ssl = true;