Index: head/net-mgmt/monitoring-plugins/Makefile =================================================================== --- head/net-mgmt/monitoring-plugins/Makefile (revision 429065) +++ head/net-mgmt/monitoring-plugins/Makefile (revision 429066) @@ -1,162 +1,161 @@ # Created by: Blaz Zupan # $FreeBSD$ PORTNAME= monitoring-plugins -PORTVERSION= 2.1.2 -PORTREVISION= 1 +PORTVERSION= 2.2 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME} MAINTAINER= mat@FreeBSD.org COMMENT= Monitoring Plugins for Nagios LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS_INSTALL= nagios-plugins-* USES= charsetfix gmake perl5 libtool USE_OPENSSL= yes USE_SUBMAKE= yes OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 NLS DBI EXTRAOPTS SSH_PORTABLE OPTIONS_SINGLE= DNS OPTIONS_SINGLE_DNS= DNS_BASE DNS_BINDTOOLS DNS_BIND99 DNS_BIND910 DNS_BIND911 OPTIONS_DEFAULT=EXTRAOPTS DNS_BASE OPTIONS_SUB= yes QSTAT_DESC= Game server query support (check_game) FPING_DESC= Support for non-flooding fast ping (check_fping) NETSNMP_DESC= SNMP support (check_snmp) RADIUS_DESC= Radius support (check_radius) MYSQL_DESC= MySQL support (check_mysql) PGSQL_DESC= PostgreSQL support (check_pgsql) LDAP_DESC= OpenLDAP support (check_ldap) DBI_DESC= Check database using DBI EXTRAOPTS_DESC= Parsing of plugins ini config files for extra options SSH_PORTABLE_DESC= Build check_ssh with ports openssh (instead of base) DNS_DESC= Configuration of check_dig and check_dns (see help) DNS_BASE_DESC= >= 10 means drill for check_dig and no check_dns DNS_BINDTOOLS_DESC= Use dig and nslookup from dns/bind-tools DNS_BIND99_DESC= Use dig and nslookup from dns/bind99 DNS_BIND910_DESC= Use dig and nslookup from dns/bind910 DNS_BIND911_DESC= Use dig and nslookup from dns/bind911 EXTRAOPTS_CONFIGURE_ENABLE= extra-opts GNU_CONFIGURE= yes NAGIOSDIR?= /var/spool/nagios NAGIOSWWWDIR?= www/nagios NAGIOSHTMURL?= /nagios NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin CONFIGURE_ARGS+=--with-cgiurl=${NAGIOSCGIURL} \ --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \ --libexecdir=${PREFIX}/libexec/nagios \ --datadir=${PREFIX}/share \ --sysconfdir=${PREFIX}/etc/nagios \ --localstatedir=${NAGIOSDIR} \ --with-perl=${PERL} \ --prefix=${PREFIX} # Also, force some commands with their expected paths so that they don't get # disabled. CONFIGURE_ARGS+=ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \ ac_cv_path_PATH_TO_PING=/sbin/ping \ ac_cv_path_PATH_TO_PING6=/sbin/ping6 \ --with-ping-command="/sbin/ping -n -c %d %s" \ --with-ping6-command="/sbin/ping6 -n -c %d %s" \ ac_cv_path_PATH_TO_SMBCLIENT=${LOCALBASE}/bin/smbclient CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib QSTAT_BUILD_DEPENDS= qstat:games/qstat QSTAT_RUN_DEPENDS= qstat:games/qstat QSTAT_CONFIGURE_OFF= ac_cv_path_PATH_TO_QUAKESTAT= \ ac_cv_path_PATH_TO_QSTAT= IPV6_CONFIGURE_WITH= ipv6 FPING_BUILD_DEPENDS= fping:net/fping FPING_RUN_DEPENDS= fping:net/fping FPING_CONFIGURE_OFF= ac_cv_path_PATH_TO_FPING= \ ac_cv_path_PATH_TO_FPING6= NETSNMP_BUILD_DEPENDS= snmpcheck:net-mgmt/net-snmp \ p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP NETSNMP_RUN_DEPENDS= snmpcheck:net-mgmt/net-snmp \ p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP NETSNMP_CONFIGURE_OFF= ac_cv_path_PATH_TO_SNMPGET= \ ac_cv_path_PATH_TO_SNMPGETNEXT= RADIUS_LIB_DEPENDS= libradiusclient-ng.so:net/radiusclient RADIUS_CONFIGURE_WITH= radius MYSQL_USE= mysql=yes MYSQL_CONFIGURE_WITH= mysql=${LOCALBASE} PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql=${LOCALBASE} LDAP_USE= openldap=yes LDAP_CONFIGURE_WITH= ldap NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CONFIGURE_WITH= dbi DNS_BINDTOOLS_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind-tools DNS_BINDTOOLS_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \ --with-nslookup-command=${LOCALBASE}/bin/nslookup DNS_BIND99_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind99 DNS_BIND99_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \ --with-nslookup-command=${LOCALBASE}/bin/nslookup DNS_BIND910_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind910 DNS_BIND910_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \ --with-nslookup-command=${LOCALBASE}/bin/nslookup DNS_BIND911_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind911 DNS_BIND911_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \ --with-nslookup-command=${LOCALBASE}/bin/nslookup 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 .include .if ${OSVERSION} > 1000055 && ${PORT_OPTIONS:MDNS_BASE} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill \ ac_cv_path_PATH_TO_NSLOOKUP= PLIST_SUB+= CHECK_DNS="@comment " .else . if ${PORT_OPTIONS:MDNS_BASE} CONFIGURE_ARGS+= --with-dig-command=/usr/bin/dig \ --with-nslookup-command=/usr/bin/nslookup . endif PLIST_SUB+= CHECK_DNS="" .endif .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_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 @${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.in .include Index: head/net-mgmt/monitoring-plugins/distinfo =================================================================== --- head/net-mgmt/monitoring-plugins/distinfo (revision 429065) +++ head/net-mgmt/monitoring-plugins/distinfo (revision 429066) @@ -1,2 +1,3 @@ -SHA256 (monitoring-plugins-2.1.2.tar.gz) = 76c6b58f0867ab7b6c8c86c7e94fcce7183618f6daab63488990d0355f5600aa -SIZE (monitoring-plugins-2.1.2.tar.gz) = 2613060 +TIMESTAMP = 1482313684 +SHA256 (monitoring-plugins-2.2.tar.gz) = 296a538f00a9cbef7f528ff2d43af357a44b384dc98a32389a675b62a6dd3665 +SIZE (monitoring-plugins-2.2.tar.gz) = 2461548 Index: head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff =================================================================== --- head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff (revision 429065) +++ head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff (revision 429066) @@ -1,13 +1,13 @@ ---- plugins/check_dig.c.orig 2014-11-30 10:36:26 UTC +--- plugins/check_dig.c.orig 2016-11-29 08:45:08 UTC +++ plugins/check_dig.c @@ -94,8 +94,8 @@ main (int argc, char **argv) timeout_interval_dig = timeout_interval / number_tries + number_tries; /* get the command to run */ -- xasprintf (&command_line, "%s %s %s -p %d @%s %s %s +tries=%d +time=%d", +- 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 -z -p %d %s %s %s", + PATH_TO_DIG, dig_args, dns_server, server_port, query_transport, query_address, record_type); alarm (timeout_interval); gettimeofday (&tv, NULL); Index: head/net-mgmt/monitoring-plugins/files/patch-configure =================================================================== --- head/net-mgmt/monitoring-plugins/files/patch-configure (revision 429065) +++ head/net-mgmt/monitoring-plugins/files/patch-configure (revision 429066) @@ -1,11 +1,11 @@ ---- configure.orig 2014-12-01 23:45:00 UTC +--- configure.orig 2016-11-29 08:48:11 UTC +++ configure -@@ -16651,7 +16651,7 @@ then +@@ -16748,7 +16748,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ - egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null + egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'" Index: head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl =================================================================== --- head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl (revision 429065) +++ head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl (revision 429066) @@ -1,19 +1,19 @@ ---- plugins-scripts/check_ircd.pl.orig 2014-11-30 10:36:26 UTC +--- plugins-scripts/check_ircd.pl.orig 2016-11-29 08:45:08 UTC +++ plugins-scripts/check_ircd.pl -@@ -66,6 +66,7 @@ sub bindRemote ($$); +@@ -65,6 +65,7 @@ sub bindRemote ($$); $ENV{'PATH'}='@TRUSTED_PATH@'; $ENV{'BASH_ENV'}=''; $ENV{'ENV'}=''; +$ENV{CDPATH} = ""; # -----------------------------------------------------------------[ Global ]-- -@@ -153,7 +154,7 @@ sub bindRemote ($$) +@@ -152,7 +153,7 @@ sub bindRemote ($$) print "IRCD UNKNOWN: Could not start socket ($!)\n"; exit $ERRORS{"UNKNOWN"}; } - $sockaddr = 'S n a4 x8'; + $sockaddr = 'x C n a4 x8'; $that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr); if (!connect(ClientSocket, $that)) { print "IRCD UNKNOWN: Could not connect socket ($!)\n"; Index: head/net-mgmt/monitoring-plugins/files/patch-plugins_check__ssh.c =================================================================== --- head/net-mgmt/monitoring-plugins/files/patch-plugins_check__ssh.c (revision 429065) +++ head/net-mgmt/monitoring-plugins/files/patch-plugins_check__ssh.c (revision 429066) @@ -1,18 +1,18 @@ ---- plugins/check_ssh.c.orig 2014-11-30 22:28:21 UTC +--- plugins/check_ssh.c.orig 2016-11-29 08:45:08 UTC +++ plugins/check_ssh.c @@ -255,6 +255,7 @@ ssh_connect (char *haddr, int hport, cha printf - (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"), + (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"), ssh_server, ssh_proto, remote_version); + recv (sd, output, BUFF_SZ, 0); close(sd); - exit (STATE_WARNING); + exit (STATE_CRITICAL); } @@ -273,6 +274,7 @@ ssh_connect (char *haddr, int hport, cha (_("SSH OK - %s (protocol %s) | %s\n"), ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s", FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout)); + recv (sd, output, BUFF_SZ, 0); close(sd); exit (STATE_OK); }