Index: head/net-mgmt/nagios-plugins/Makefile =================================================================== --- head/net-mgmt/nagios-plugins/Makefile (revision 519614) +++ head/net-mgmt/nagios-plugins/Makefile (revision 519615) @@ -1,157 +1,156 @@ # Created by: Blaz Zupan # $FreeBSD$ PORTNAME= nagios-plugins -PORTVERSION= 2.2.1 -PORTREVISION= 8 +DISTVERSION= 2.3.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 ssl 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 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_BASE_DESC= Use drill for check_dig, check_dns not available DNS_BINDTOOLS_DESC= Use dig and nslookup from dns/bind-tools 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 -t %d -c %d %s" \ --with-ping6-command="/sbin/ping6 -n -X %d -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_USES= mysql 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_RUN_DEPENDS= ${DNS_BINDTOOLS_BUILD_DEPENDS} DNS_BINDTOOLS_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 ${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 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 519614) +++ head/net-mgmt/nagios-plugins/distinfo (revision 519615) @@ -1,3 +1,3 @@ -TIMESTAMP = 1493720605 -SHA256 (nagios-plugins-2.2.1.tar.gz) = 647c0ba4583d891c965fc29b77c4ccfeccc21f409fdf259cb8af52cb39c21e18 -SIZE (nagios-plugins-2.2.1.tar.gz) = 2728818 +TIMESTAMP = 1575890689 +SHA256 (nagios-plugins-2.3.0.tar.gz) = 18dff0152120e904b16b4b5562867c18ba6e17d66046656d33730427790bcfff +SIZE (nagios-plugins-2.3.0.tar.gz) = 2833054 Index: head/net-mgmt/nagios-plugins/files/patch-plugins_common.h =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins_common.h (revision 519614) +++ head/net-mgmt/nagios-plugins/files/patch-plugins_common.h (nonexistent) @@ -1,24 +0,0 @@ -From 930ede8378245eb6bd31eaf1d9103f027df0f7a0 Mon Sep 17 00:00:00 2001 -From: Bernard Spil -Date: Sun, 5 Nov 2017 10:43:56 +0100 -Subject: [PATCH] plugins/common.h: Set default MySQL port - -As of MariaDB 10.2 the headers for client no longer set the -default MySQL port. Patch fixes this for any version of MariaDB -or MySQL into the future. - -See also: https://bugs.freebsd.org/223387 ---- plugins/common.h.orig 2017-01-19 16:01:31 UTC -+++ plugins/common.h -@@ -168,6 +168,11 @@ - # endif - #endif - -+/* MariaDB 10.2 client does not set MYSQL_PORT */ -+#ifndef MYSQL_PORT -+# define MYSQL_PORT 3306 -+#endif -+ - /* - * - * Standard Values Property changes on: head/net-mgmt/nagios-plugins/files/patch-plugins_common.h ___________________________________________________________________ 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-check_ntp_time.c =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins-check_ntp_time.c (revision 519614) +++ head/net-mgmt/nagios-plugins/files/patch-plugins-check_ntp_time.c (nonexistent) @@ -1,15 +0,0 @@ -Obtained from: -https://github.com/nagios-plugins/nagios-plugins/commit/df485c74f582708d6ce37cdf99880fe75215498a - ---- plugins/check_ntp_time.c.orig 2018-01-04 12:59:01.422087000 -0800 -+++ plugins/check_ntp_time.c 2018-01-04 13:05:56.317152000 -0800 -@@ -415,6 +415,9 @@ - } - } - /* lather, rinse, repeat. */ -+ /* break if we have one response but other ntp servers doesn't response */ -+ /* greater than timeout_interval/2 */ -+ if (servers_completed && now_time-start_ts > timeout_interval/2) break; - } - - if (one_read == 0) { Property changes on: head/net-mgmt/nagios-plugins/files/patch-plugins-check_ntp_time.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_check__procs.c =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c (revision 519614) +++ head/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c (nonexistent) @@ -1,107 +0,0 @@ ---- plugins/check_procs.c.orig 2017-01-16 17:24:03 UTC -+++ plugins/check_procs.c -@@ -71,6 +71,7 @@ int options = 0; /* bitmask of filter cr - #define ELAPSED 512 - #define EREG_ARGS 1024 - #define CGROUP_HIERARCHY 2048 -+#define JID 4096 - - #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads: - ppid of procs are compared to pid of this proc*/ -@@ -103,6 +104,7 @@ char *fails; - char tmp[MAX_INPUT_BUFFER]; - int kthread_filter = 0; - int usepid = 0; /* whether to test for pid or /proc/pid/exe */ -+int jid; - - FILE *ps_input = NULL; - -@@ -133,6 +135,7 @@ main (int argc, char **argv) - int procuid = 0; - pid_t procpid = 0; - pid_t procppid = 0; -+ int procjid = 0; - pid_t kthread_ppid = 0; - int procvsz = 0; - int procrss = 0; -@@ -236,9 +239,9 @@ main (int argc, char **argv) - procseconds = convert_to_seconds(procetime); - - if (verbose >= 3) { -- printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s", -++ printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", - procs, procuid, procvsz, procrss, -- procpid, procppid, procpcpu, procstat, -+ procpid, procppid, procjid, procpcpu, procstat, - procetime, procprog, procargs); - if (strstr(PS_COMMAND, "cgroup") != NULL) { - printf(" proc_cgroup_hierarchy=%s\n", proc_cgroup_hierarchy); -@@ -287,6 +290,8 @@ main (int argc, char **argv) - resultsum |= PROG; - if ((options & PPID) && (procppid == ppid)) - resultsum |= PPID; -+ if ((options & JID) && (procjid == jid)) -+ resultsum |= JID; - if ((options & USER) && (procuid == uid)) - resultsum |= USER; - if ((options & VSZ) && (procvsz >= vsz)) -@@ -315,9 +320,9 @@ main (int argc, char **argv) - - procs++; - if (verbose >= 2) { -- printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s", -++ printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", - procuid, procvsz, procrss, -- procpid, procppid, procpcpu, procstat, -+ procpid, procppid, procjid, procpcpu, procstat, - procetime, procprog, procargs); - if (strstr(PS_COMMAND, "cgroup") != NULL) { - printf(" cgroup_hierarchy=%s\n", cgroup_hierarchy); -@@ -438,6 +443,7 @@ process_arguments (int argc, char **argv - {"no-kthreads", required_argument, 0, 'k'}, - {"traditional-filter", no_argument, 0, 'T'}, - {"cgroup-hierarchy", required_argument, 0, 'g'}, -+ {"jid", required_argument, 0, 'j'}, - {0, 0, 0, 0} - }; - -@@ -446,7 +452,7 @@ process_arguments (int argc, char **argv - strcpy (argv[c], "-t"); - - while (1) { -- c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tg:", -+ c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tg:j:", - longopts, &option); - - if (c == -1 || c == EOF) -@@ -477,6 +483,12 @@ process_arguments (int argc, char **argv - break; - } - usage4 (_("Parent Process ID must be an integer!")); -+ case 'j': /* jail id */ -+ if (sscanf (optarg, "%d%[^0-9]", &jid, tmp) == 1) { -+ asprintf (&fmt, "%s%sJID = %d", (fmt ? fmt : "") , (options ? ", " : ""), jid); -+ options |= JID; -+ break; -+ } - case 's': /* status */ - if (statopts) - break; -@@ -766,6 +778,8 @@ print_help (void) - printf (" %s\n", _("RSZDT, plus others based on the output of your 'ps' command).")); - printf (" %s\n", "-p, --ppid=PPID"); - printf (" %s\n", _("Only scan for children of the parent process ID indicated.")); -+ printf (" %s\n", "-j, --jid=JID"); -+ printf (" %s\n", _("Only scan for process running in jail which ID is JID.")); - printf (" %s\n", "-z, --vsz=VSZ"); - printf (" %s\n", _("Only scan for processes with VSZ higher than indicated.")); - printf (" %s\n", "-r, --rss=RSS"); -@@ -818,7 +832,7 @@ void - print_usage (void) - { - printf ("%s\n", _("Usage:")); -- printf ("%s -w -c [-m metric] [-s state] [-p ppid]\n", progname); -+ printf ("%s -w -c [-m metric] [-s state] [-p ppid] [-j jid]\n", progname); - printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n"); - printf (" [-C command] [-k] [-t timeout] [-v]\n"); - } Property changes on: head/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.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 519614) +++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl (nonexistent) @@ -1,57 +0,0 @@ -commit d56818f5121b05439c7b7a1655d96ab39e066797 -Author: Filias Heidt -Date: 2017-04-24 11:00:43 +0200 - - add support for opensmtpd - ---- plugins-scripts/check_mailq.pl.orig 2017-04-19 16:03:12 UTC -+++ plugins-scripts/check_mailq.pl -@@ -558,6 +558,39 @@ elsif ( $mailq eq "nullmailer" ) { - } - } # end of ($mailq eq "nullmailer") - -+elsif ( $mailq eq "opensmtp" ) { -+ ## open mailq -+ if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) { -+ if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) { -+ print "ERROR: could not open $utils::PATH_TO_MAILQ \n"; -+ exit $ERRORS{'UNKNOWN'}; -+ } -+ }elsif( defined $utils::PATH_TO_MAILQ){ -+ unless (-x $utils::PATH_TO_MAILQ) { -+ print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n"; -+ exit $ERRORS{'UNKNOWN'}; -+ } -+ } else { -+ print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n"; -+ exit $ERRORS{'UNKNOWN'}; -+ } -+ -+ $msg_q++ while (); -+ -+ close(MAILQ) ; -+ if ($msg_q < $opt_w) { -+ $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; -+ $state = $ERRORS{'OK'}; -+ }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { -+ $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; -+ $state = $ERRORS{'WARNING'}; -+ }else { -+ $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; -+ $state = $ERRORS{'CRITICAL'}; -+ } -+} # end of ($mailq eq "opensmtp") -+ -+ - # Perfdata support - print "$msg|unsent=$msg_q;$opt_w;$opt_c;0\n"; - exit $state; -@@ -618,7 +651,7 @@ sub process_arguments(){ - } - - if (defined $opt_M) { -- if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) { -+ if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer|opensmtp)$/) { - $mailq = $opt_M ; - }elsif( $opt_M eq ''){ - $mailq = 'sendmail'; Property changes on: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.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_check__nagios.c =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c (revision 519614) +++ head/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c (nonexistent) @@ -1,10 +0,0 @@ ---- plugins/check_nagios.c.orig 2017-01-19 16:01:31 UTC -+++ plugins/check_nagios.c -@@ -64,6 +64,7 @@ main (int argc, char **argv) - int procuid = 0; - int procpid = 0; - int procppid = 0; -+ int procjid = 0; - int procvsz = 0; - int procrss = 0; - char proc_cgroup_hierarchy[MAX_INPUT_BUFFER]; Property changes on: head/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.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_sslutils.c =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c (revision 519614) +++ head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c (nonexistent) @@ -1,21 +0,0 @@ ---- plugins/sslutils.c.orig 2017-04-19 16:03:12 UTC -+++ plugins/sslutils.c -@@ -211,9 +211,6 @@ int np_net_ssl_check_cert(int days_till_ - int time_remaining; - time_t tm_t; - -- // Prefix whatever we're about to print with SSL -- printf("SSL "); -- - certificate=SSL_get_peer_certificate(s); - if (!certificate) { - printf("%s\n",_("CRITICAL - Cannot retrieve server certificate.")); -@@ -304,7 +301,7 @@ int np_net_ssl_check_cert(int days_till_ - else - status = STATE_CRITICAL; - } else { -- printf(_("OK - Certificate '%s' will expire on %s. "), cn, timestamp); -+ printf(_("OK - Certificate '%s' will expire on %s.\n"), cn, timestamp); - status = STATE_OK; - } - X509_free(certificate); 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-plugins_check__http.c =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c (revision 519614) +++ head/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c (nonexistent) @@ -1,17 +0,0 @@ ---- plugins/check_http.c.orig 2017-04-19 16:03:12 UTC -+++ plugins/check_http.c -@@ -1026,11 +1026,9 @@ check_http (void) - elapsed_time_ssl = (double)microsec_ssl / 1.0e6; - if (check_cert == TRUE) { - result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit); -- if (result != STATE_OK) { -- np_net_ssl_cleanup(); -- if (sd) close(sd); -- return result; -- } -+ np_net_ssl_cleanup(); -+ if (sd) close(sd); -+ return result; - } - } - #endif /* HAVE_SSL */ Property changes on: head/net-mgmt/nagios-plugins/files/patch-plugins_check__http.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 519614) +++ head/net-mgmt/nagios-plugins/files/patch-configure (revision 519615) @@ -1,27 +1,18 @@ ---- configure.orig 2017-04-19 16:03:27 UTC +--- configure.orig 2019-12-04 21:53:36 UTC +++ configure -@@ -21973,6 +21973,15 @@ $as_echo "$as_me: error: I don't know ho +@@ -22045,6 +22045,15 @@ $as_echo "$as_me: error: I don't know how to build a 6 fi +elif ps -axwo 'stat comm vsz rss user uid pid ppid jid args' 2>/dev/null | \ + egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +JID +COMMAND" > /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:$LINENO: result: $ac_cv_ps_command" >&5 + $as_echo "$ac_cv_ps_command" >&6; } elif ps axwwo 'stat comm vsz rss user uid pid ppid args cgroup:256' 2>/dev/null | \ egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND +CGROUP" > /dev/null then -@@ -23798,7 +23807,7 @@ then - - if $PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null - then -- ac_cv_swap_format="%*s %f %*d %f" -+ ac_cv_swap_format="%*s %lf %*d %lf" - ac_cv_swap_conv=1024 - { $as_echo "$as_me:$LINENO: result: using FreeBSD format swapinfo" >&5 - $as_echo "using FreeBSD format swapinfo" >&6; } 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 519614) +++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ntp.pl (revision 519615) @@ -1,19 +1,19 @@ ---- plugins-scripts/check_ntp.pl.orig 2016-08-01 16:27:46 UTC +--- plugins-scripts/check_ntp.pl.orig 2019-12-04 21:53:08 UTC +++ plugins-scripts/check_ntp.pl @@ -314,7 +314,6 @@ if ($have_ntpq) { } } else { print "No match!\n" if $verbose; - $jitter = '(not parsed)'; } } -@@ -428,7 +427,7 @@ if ($ntpdate_error != $ERRORS{'OK'}) { - foreach my $key (keys %ERRORS) { +@@ -429,7 +428,7 @@ 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"); + print ("NTP $key: $answer|offset=$offset"); + if ($have_ntpq) { +- print (", jitter=" . $jitter/1000 . ",peer_stratum=$stratum"); ++ print (", jitter=" . ($jitter || 0)/1000 . ",peer_stratum=$stratum"); + } + print ("\n"); last; - } - } Index: head/net-mgmt/nagios-plugins/files/patch-plugins_check__load.c =================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins_check__load.c (nonexistent) +++ head/net-mgmt/nagios-plugins/files/patch-plugins_check__load.c (revision 519615) @@ -0,0 +1,10 @@ +--- plugins/check_load.c.orig 2019-12-09 11:57:36 UTC ++++ plugins/check_load.c +@@ -351,6 +351,7 @@ int cmpstringp(const void *p1, const void *p2) { + pid_t kthread_ppid = 0; + int procvsz = 0; + int procrss = 0; ++ int procjid = 0; + float procpcpu = 0; + char procstat[8]; + #ifdef PS_USES_PROCETIME Property changes on: head/net-mgmt/nagios-plugins/files/patch-plugins_check__load.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/nagios-plugins/pkg-plist =================================================================== --- head/net-mgmt/nagios-plugins/pkg-plist (revision 519614) +++ head/net-mgmt/nagios-plugins/pkg-plist (revision 519615) @@ -1,71 +1,73 @@ libexec/nagios/check_apt libexec/nagios/check_breeze %%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 %%CHECK_DNS%%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_ssl_validity 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_users libexec/nagios/check_wave libexec/nagios/negate +libexec/nagios/remove_perfdata libexec/nagios/urlize libexec/nagios/utils.pm libexec/nagios/utils.sh %%NLS%%share/locale/fr/LC_MESSAGES/nagios-plugins.mo %%NLS%%share/locale/de/LC_MESSAGES/nagios-plugins.mo