Index: head/net-mgmt/nagios-plugins/Makefile =================================================================== --- head/net-mgmt/nagios-plugins/Makefile (revision 419524) +++ head/net-mgmt/nagios-plugins/Makefile (revision 419525) @@ -1,169 +1,173 @@ # Created by: Blaz Zupan # $FreeBSD$ PORTNAME= nagios-plugins -PORTVERSION= 2.1.1 -PORTREVISION= 5 +PORTVERSION= 2.1.2 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://www.nagios-plugins.org/download/ \ LOCAL/mat/${PORTNAME} MAINTAINER= mat@FreeBSD.org COMMENT= Plugins for Nagios LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS_INSTALL= monitoring-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 +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 NAGIOSUSER?= nagios NAGIOSGROUP?= nagios NAGIOSDIR?= /var/spool/nagios NAGIOSWWWDIR?= www/nagios NAGIOSHTMURL?= /nagios NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin CONFIGURE_ARGS+=--with-nagios-user=${NAGIOSUSER} \ --with-nagios-group=${NAGIOSGROUP} \ --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_SUDO=${LOCALBASE}/bin/sudo \ 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 # add a fake PATH so that it gets set to a correct value during build. @${REINPLACE_CMD} -e "s|$$ENV{'PATH'}=''|$$ENV{'PATH'}='foo'|; \ s|/usr/bin/|${LOCALBASE}/bin/|g" \ ${WRKSRC}/plugins-scripts/*.pl .include Index: head/net-mgmt/nagios-plugins/distinfo =================================================================== --- head/net-mgmt/nagios-plugins/distinfo (revision 419524) +++ head/net-mgmt/nagios-plugins/distinfo (revision 419525) @@ -1,2 +1,3 @@ -SHA256 (nagios-plugins-2.1.1.tar.gz) = c7daf95ecbf6909724258e55a319057b78dcca23b2a6cc0a640b90c90d4feae3 -SIZE (nagios-plugins-2.1.1.tar.gz) = 2677352 +TIMESTAMP = 1470231717 +SHA256 (nagios-plugins-2.1.2.tar.gz) = f2ed5d07b1823341f9db56b187ae5c0ee9018b6c69a152b6a240c5e14cd94ea4 +SIZE (nagios-plugins-2.1.2.tar.gz) = 2695301 Index: head/net-mgmt/nagios-plugins/files/patch-plugins-root_check__dhcp.c =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins-root_check__dhcp.c (revision 419524) +++ head/net-mgmt/nagios-plugins/files/patch-plugins-root_check__dhcp.c (nonexistent) @@ -1,21 +0,0 @@ ---- plugins-root/check_dhcp.c.orig 2015-07-30 21:40:06 UTC -+++ plugins-root/check_dhcp.c -@@ -326,7 +326,8 @@ int get_hardware_address(int sock,char * - #elif defined(__bsd__) - /* King 2004 see ACKNOWLEDGEMENTS */ - -- int mib[6], len; -+ int mib[6]; -+ size_t len; - char *buf; - unsigned char *ptr; - struct if_msghdr *ifm; -@@ -1194,7 +1195,7 @@ int call_getopt(int argc, char **argv){ - } - } - -- return i; -+ return i+1; - } - - Property changes on: head/net-mgmt/nagios-plugins/files/patch-plugins-root_check__dhcp.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl (revision 419524) +++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl (nonexistent) @@ -1,11 +0,0 @@ ---- plugins-scripts/check_mailq.pl.orig 2015-07-30 21:40:06 UTC -+++ plugins-scripts/check_mailq.pl -@@ -35,7 +35,7 @@ use FindBin; - use lib "$FindBin::Bin"; - use utils qw(%ERRORS &print_revision &support &usage ); - --my ($sudo) -+my ($sudo); - - sub print_help (); - sub print_usage (); Property changes on: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -no \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__file__age.pl =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__file__age.pl (revision 419524) +++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__file__age.pl (nonexistent) @@ -1,12 +0,0 @@ ---- plugins-scripts/check_file_age.pl.orig 2015-07-30 21:40:06 UTC -+++ plugins-scripts/check_file_age.pl -@@ -26,7 +26,8 @@ use English; - use Getopt::Long; - use File::stat; - use vars qw($PROGNAME); --use lib "."; -+use FindBin; -+use lib "$FindBin::Bin"; - use utils qw (%ERRORS &print_revision &support); - - sub print_help (); Property changes on: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__file__age.pl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c (revision 419524) +++ head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c (nonexistent) @@ -1,16 +0,0 @@ ---- plugins/sslutils.c.orig 2015-07-30 21:40:06 UTC -+++ plugins/sslutils.c -@@ -70,8 +70,13 @@ int np_net_ssl_init_with_hostname_versio - #endif - break; - case 3: /* SSLv3 protocol */ -+#if defined(OPENSSL_NO_SSL3) -+ printf(("%s\n", _("CRITICAL - SSL protocol version 3 is not supported by your SSL library."))); -+ return STATE_CRITICAL; -+#else - method = SSLv3_client_method(); - ssl_options = SSL_OP_NO_SSLv2 | SSL_OP_NO_TLSv1; -+#endif - break; - default: /* Unsupported */ - printf("%s\n", _("CRITICAL - Unsupported SSL protocol version.")); Property changes on: head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/nagios-plugins/files/patch-configure =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-configure (revision 419524) +++ head/net-mgmt/nagios-plugins/files/patch-configure (revision 419525) @@ -1,11 +1,11 @@ ---- configure.orig 2015-07-31 17:47:20 UTC +--- configure.orig 2016-08-01 16:28:00 UTC +++ configure -@@ -22224,7 +22224,7 @@ then +@@ -21947,7 +21947,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } - elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ + elif ps -axwwo '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'" + ac_cv_ps_command="$PATH_TO_PS -axwwo 'stat uid pid ppid vsz rss pcpu comm args'" Index: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ircd.pl =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ircd.pl (revision 419524) +++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ircd.pl (revision 419525) @@ -1,19 +1,19 @@ ---- plugins-scripts/check_ircd.pl.orig 2015-07-30 21:40:06 UTC +--- plugins-scripts/check_ircd.pl.orig 2016-08-01 16:27:46 UTC +++ plugins-scripts/check_ircd.pl -@@ -67,6 +67,7 @@ sub bindRemote ($$); +@@ -68,6 +68,7 @@ sub bindRemote ($$); $ENV{'PATH'}='@TRUSTED_PATH@'; $ENV{'BASH_ENV'}=''; $ENV{'ENV'}=''; +$ENV{'CDPATH'} = ""; # -----------------------------------------------------------------[ Global ]-- -@@ -154,7 +155,7 @@ sub bindRemote ($$) +@@ -155,7 +156,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/nagios-plugins/files/patch-plugins-scripts_check__ntp.pl =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ntp.pl (revision 419524) +++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ntp.pl (revision 419525) @@ -1,19 +1,19 @@ ---- plugins-scripts/check_ntp.pl.orig 2015-07-30 21:40:06 UTC +--- plugins-scripts/check_ntp.pl.orig 2016-08-01 16:27:46 UTC +++ plugins-scripts/check_ntp.pl -@@ -313,7 +313,6 @@ if ($have_ntpq) { +@@ -314,7 +314,6 @@ if ($have_ntpq) { } } else { print "No match!\n" if $verbose; - $jitter = '(not parsed)'; } } -@@ -427,7 +426,7 @@ if ($ntpdate_error != $ERRORS{'OK'}) { +@@ -428,7 +427,7 @@ if ($ntpdate_error != $ERRORS{'OK'}) { foreach my $key (keys %ERRORS) { if ($state==$ERRORS{$key}) { # print ("NTP $key: $answer"); - print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 . ",peer_stratum=$stratum\n"); + print ("NTP $key: $answer|offset=$offset, jitter=" . ($jitter || 0)/1000 . ",peer_stratum=$stratum\n"); last; } } Index: head/net-mgmt/nagios-plugins/files/patch-plugins_netutils.c =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins_netutils.c (revision 419524) +++ head/net-mgmt/nagios-plugins/files/patch-plugins_netutils.c (revision 419525) @@ -1,44 +1,46 @@ ---- plugins/netutils.c.orig 2015-07-30 21:40:06 UTC +--- plugins/netutils.c.orig 2016-08-01 16:27:46 UTC +++ plugins/netutils.c -@@ -158,7 +158,7 @@ int +@@ -179,7 +179,7 @@ int np_net_connect (const char *host_name, int port, int *sd, int proto) { struct addrinfo hints; - struct addrinfo *res; + struct addrinfo *res, *res0; struct sockaddr_un su; char port_str[6], host[MAX_HOST_ADDRESS_LENGTH]; size_t len; -@@ -185,12 +185,13 @@ np_net_connect (const char *host_name, i +@@ -206,7 +206,7 @@ np_net_connect (const char *host_name, i memcpy (host, host_name, len); host[len] = '\0'; snprintf (port_str, sizeof (port_str), "%d", port); - result = getaddrinfo (host, port_str, &hints, &res); + result = getaddrinfo (host, port_str, &hints, &res0); if (result != 0) { - printf ("%s\n", gai_strerror (result)); + if (result == EAI_NONAME) +@@ -215,6 +215,7 @@ np_net_connect (const char *host_name, i + printf ("%s\n", gai_strerror (result)); return STATE_UNKNOWN; } + res = res0; while (res) { /* attempt to create a socket */ -@@ -198,7 +199,7 @@ np_net_connect (const char *host_name, i +@@ -222,7 +223,7 @@ np_net_connect (const char *host_name, i if (*sd < 0) { printf ("%s\n", _("Socket creation failed")); - freeaddrinfo (res); + freeaddrinfo (res0); return STATE_UNKNOWN; } -@@ -221,7 +222,7 @@ np_net_connect (const char *host_name, i +@@ -245,7 +246,7 @@ np_net_connect (const char *host_name, i close (*sd); res = res->ai_next; } - freeaddrinfo (res); + freeaddrinfo (res0); } /* else the hostname is interpreted as a path to a unix socket */ else {