Upgrade net/nagios-plugins to 2.2.1.

Clean up the package a little, and merge in patches from the shared
nagios-plugin-* packages to avoid duplication.  Changes since 2.0.3:

2.2.1 2017-04-19
	FIXES
	check_users: not accepting zero as the threshold
	check_http: reports warning where it should report ok with -e
	check_snmp: does not work with -6 --ipv6 flags
	check_swap: threshold calculation in bytes requires subtracting 65
	check_uptime: fixed backward help text for thresholds
	check_http: Don窶冲 prematurely report success when checking HTTP TLS cert validity
	check_http: fix parsing the last header
	check_mailq: Fix for Postfix and better Sudo Checking
	configure.ac: Fix spelling error
	check_ntp_peer: requires newline when there is a socket timeout (fix in netutils.c)
	check_users: segmentation fault if both thresholds are not provided
	check_dns: DNS CRITICAL - expected 窶�{hostname}.窶� but got 'name = {hostname}.'
	check_mailq: Nullmailer Regex is not working for Ubuntu 16.04
	check_swap: Downstream Fedora patch: Prevent check_swap from returning OK, if no swap activated
	Building RPMs on Amazon Linux - Add 'install-root' on line 165 of spec file

2.2.0 2017-01-19
	ENHANCEMENTS
	check_flexlm: if `-F <license file>` is not specified, will use `LM_LICENSE_FILE` environment var
	check_load: Added per cpu load average message
	check_smtp: add -L flag to support LMTP (LHLO instead of HELO/EHLO)

	FIXES
	check_http: -e breaks -f
	check_mrtg: Add state to status output
	check_ping: ping runs 30 times when host is down
	check_icmp: does not have the -p argument in the help
	check_dns: Segfaulting with timeout > 26 sec
	check_disk: missing -lrt on Solaris
	check_http: segmentation fault
	check_http: help text update for virtual hosts
	check_snmp: Thresholds were being shown twice
	check_hpjd: some jd 610 cards have a false flag that printer is offline
	check_http: Handle reference redirect like //www.site.org/test
	check_disk: alerts issued too soon
	fix: Allocator sizeof operand mismatch
	fix: Dead assignment
	Shellcheck: fix most of the shellcheck warnings.
	check_ntp: touch ntp servers at most once every seconds
	check_dns: authoritative test (-A) is broken
	check_dns: reports TXT records incorrectly
	check_file_age: does not handle filenames WITHOUT space!
	de,fr.po: fix syntax errors end-of-line within string
	lib/parse_ini.c: fix gcc warning: implicit declaration of function 窶亙dpriv_temp_drop窶� and 窶亙dpriv_temp_restore窶�
	add openssl 1.1 support

2.1.4 2016-11-17
	FIXES
	check_http: Don't include default Accept header if one is provided
	check_disk: added "fuse.gvfsd-fuse" to list of fs types to ignore
	check_http: Fixed non-text chunked-encoded decoding
	check_http: segmentation fault (FreeBSD)
	check_dns: Update IF_RECORD to not erase query_found
	check_http: SSL Certificate check returns 12:00:00AM <local timezone>
	check_http: -u is misleading. Changed help text
	check_file_age: does not handle filenames with space
	check_snmp: units label option outputs the label in the incorrect location
	plugins-root/check_dhcp.c: fix a potential segfault
    check_users: not correctly detecting thresholds

2.1.3 2016-09-12
	ENHANCEMENTS
	SNI support in check_tcp (ddbilik)
	check_disk_smb.pl: add support for -k for kerberos authentication
	check_file_age.c: allow wildcard matching

	FIXES
	check_tcp.c: tools/build_perl_modules hardcodes the perl used
	check_game.c: reports ping as number of players (Jason Rivers)
	fix some gcc5 warnings (Mario Trangoni)
	check_cluster.c: Update wording in comments (Troy Lea)
	check_nagios.c: could not locate a running nagios process
	check_swap.c: does not accept threshold of zero
	check_swap.c: uses inconsistent checks on negative thresholds
	check_snmp.c: --offset does not appear to do anything (Troy Lea)
	sslutils.c: output has first line of "SSL Version: xxxxxx"
	  effects anything using sslutils including check_http, check_dhcp
	  and others
	utils_cmd.c: when using ssh (or check-by-ssh) with ControlMaster/ControlPersist,
	  nagios times out the first time and one gets zombie processes (Gordon Messmer)

2.1.2 2016-08-01
	SECURITY FIXES

	ENHANCEMENTS
	check_snmp's performance data now also includes warning/critical
	  thresholds
	New check_snmp "-N" option to specify SNMPv3 context name
	New check_nt "-l" parameters: seconds|minutes|hours|days
	New check_mailq -s option which tells the plugin to use sudo(8)
	New -W/-C option for check_ldap to check number of entries (Gerhard Lausser)
	The check_http -S/--ssl option now accepts the arguments "1.1" and "1.2"
	  to force TLSv1.1 and TLSv1.2 connections, respectively
	The check_http -S/--ssl option now allows for specifying the desired
	  protocol with a "+" suffix to also accept newer versions
	New check_disk "-v" option to show troubled partition in verbose mode
	check_log.sh: Added a parameter -w (--max_warning) defining upper value to return a warning code
	check_ldap: Add support for LDAP URIs.
	check_file_age: Provide performance data
	check_by_ssh: added --hostname support
	check_ifstatus.pl: Add check_ifstatus option to ignore interfaces by name
	check_snmp: Introduce support for SNMPv3 context using "-N" option
	check_snmp.c: Added IPv6 support
	check_http: Added support for checking SSL-Websites through Proxies

	FIXES
	check_dig can now also use "drill" instead of "dig"
	check_dig honor the -4 and -6 switches
	check_ntp_peer: do not use uninitialized results for max state
	check_log.sh, check_oracle.sh, check_sensors.sh: Setting PATH at first
	check_log.sh: droping path from basename while evaluating PROGNAME
	check_tcp: Fix check_jabber to work with Openfire servers
	check_ifstatus.pl: Fix "-n" and "-u" options to ignore if either is set, not just both
	check_mrtgtraf: Fix perfdata to comply with perfdata UOM definition
	check_real, check_ntp: fix null termination
	check_apt: fix memset
	check_ssh: change warning to critical for protocal/version errors
	utils_cmd.c: avoid a segfault, if ulimit is set to unlimited
	utils_cmd.c: make constants from maxfd values
	configure.ac: Added particular ps command for HP-UX
	check_disk: Fix pthread start routine type
	check_http: Make header_value() and chunked-encoding decoding more robust
	check_http: fix Host header if explicitly set with -k
	sslutils.c: Forcing furter restriction of ciphers for current security concerns
	check_nagios, check_procs: Enable check_proc to monitor processes in PID name-spaced environments.
	check_dhcp.c: use /dev/urandom if available
	check_http.c: Don't decode page if it's not there
	check_disk.c: Prevent large tide values from truncation
	pst3.c: Fix for unclosed filehandle in pst3 on Solaris
	check_snmp: Timeticks are not being parsed correctly before performance data
        multiple *.h files: standardized header include fences
        multiple plugins/*.c files: fix unsafe signal handling
	sslutils.c: Fix compilation with GnuTLS which doesn't provide SSL_CTX_check_private_key()
	check_mailq.pl: fixed mailer names
	check_swap.c: Improving output when swap space has zero size
	check_icmp.c: Use kernel reception time on ICMP packets to compute rtt.
	check_icmp.c: make use of MSG_CONFIRM optional
	check_ldap.c: add counting of entries to check_ldap
	utils.c: add sperfdata() function which can handle threshold ranges
	sslutils.c: Check if OpenSSL supports SSLv3.
	check_dhcp.c: Fixes segfaults when running via monitoring worker (off-by-one)
	check_fping.c: autodetect ipv6 addresses
	sslutils.c: optimize output if certificate expires in less then 24h
	check_smtp.c: Let "-D" option imply "-S". Also QUIT SMTP connection when "-D" is used
	check_smtp.c: modified SSL check for use with -e
	check_tcp.c: Validate sent data size
	check_dns.c: conditional assignment
	check_dns.c: macro querytypes and auto cnames
	utils_cmd.c, utils_base.c: Multiple resource leaks
	check_http.c: Increase MAX_RE_SIZE from 256 to 2048
	check_procs.c: Changed the ps command args from axwo to axwwo allowing for longer output
	check_http.c: Allow a server to reply using only 'HTTP/1.x 200 OK' and a
		body, with no headers
	check_nt.c: check_nt does not correctly report a DNS entry it cannot resolve
	check_dhcp.c: check_dhcp broken on BSD

	TESTS
	check_procs.t: Add delay after forking in test to avoid race condition
	test.pl.in: Use "C" locale when running test suite
	check_http.t: Adjust date strings to the now-localized output
	check_dns.t - Fix Perl Warning. perl doesn't understand /d within "".
	check_snmp.t: skip extented snmp tests if snmpd has no perl support
	check_snmp.t: fix snmp test for included threshold
	check_http.t: fix tests for certificates expire date with seconds
	check_http.t: add faketime based tests for check_http

	LOCALIZATION

2.1.0 30th July 2015
	SECURITY FIXES
	ssl_utils.c - Disable SSLv3 & SSLv2 autonegotiation by default to limit poodle and other weak cipher attacks (sreinhardt)

	ENHANCEMENTS
	Timeout States Implemented - Plugins that support a timeout state will now also support specifying the exit state in case of timeout with the syntax -t <timeout>:<state> (abrist)
	Perl plugins now use FindBin for path discovery, obsoleting the nasty AWK script (evgeni, abrist)
	check_http.c - Added support for chunked transfer-encoding (koenwtje, dermoth, sreinhardt)
	check_radius.c - Added support for the FreeRADIUS Client library (weiss)
	check_snmp.c - Added thresholds to performance data (seemuellera)
	check_snmp.c - Added new option (-N) for SNMPv3 context (Johannes Engel)
	check_snmp.c - Added IPv6 support (abrist)
	check_ldap.c - Added a new option (-U) for LDAP URI support (qris)
	check_ifstatus.pl - Added new option (-n) to exclude interfaces (peelman, weiss)
	check_file_age.pl - Performance data output added (hggh)
	check_mailq.pl - Now supports sudo (Christopher Schultz, weiss)
	check_log.sh - Added a new option (-w) defining upper value to return a warning code (arvanus)

	FIXES
	check_by_ssh.c - Added --hostname support (sni)
	check_dbi.c - Spelling corrections (sreinhardt)
	check_dig.c - Fixed to work with dig/drill tools and ip version switch is now respected (abgandar)
	check_disk.c - Fix for hanging filesystems (Gerhard Lausser)
	check_disk.c - Partitions in problem state now reported in verbose mode (waja)
	check_disk.c - Prevent large tide values from truncation (JesperForsberg)
	check_dns.c - Server specific fixes and other cleanup (sreinhardt)
	check_http.c - Some small changes for readability (koenwtje)
	check_mrtgtraf.c - Added verbose output (sreinhardt)
	check_mrtgtraf.c - Perfdata now complies with UOM definition (Bobzikwick)
	check_ntp_peer.c - No longer uses uninitialized results for max state (sni)
	check_procs.c - Rare race condition fixed (Mikael Falkvidd)
	check_ssh.c - Now exits with CRITICAL when version/protocol string check fails to match (sni)
	check_tcp.c - Help description of escape characters now correct (Sebastian Herbszt)
	check_tcp.c - Fix to support Openfire servers with check_jabber (weiss)
	check_ups.c - Spelling corrections (sreinhardt)
	pst3.c - Fix for unclosed file handle in pst3 on Solaris (jwinkle01)
	plugins-scripts/*.sh - Trusted path fixes (waja)
	netutils.h - Decreased max path to 104 bytes to compensate for BSD paths (sreinhardt)
	configure.ac - Fix for HP-UX ps command (Tontonitch)
	lib/utils_cmd.c - Fix for potential segfault when ulimits are set to unlimited (nafets)
	lib/parse_ini.c - Many small fixes from coverity scans and the community (sreinhardt, weiss)
	lib/util_base.c - Code cleanup (sreinhardt)
	lib/utils_base.c - Add EIUD to state retention path for multi-user permissions support (sreinhardt)
	po/* - Spelling corrections (sreinhardt)
	Multiple resource leaks fixed (sreinhardt)
	Many other small fixes and cleanup caught by coverity (multiple contributors)

	TESTS
	Many small fixes to tests (multiple contributors)

	LOCALIZATION
	Many small fixes for locales and localizations (multiple contributors)


(jperkin)

$NetBSD: patch-plugins-scripts_check__breeze.pl,v 1.1 2017/07/04 19:45:18 jperkin Exp $

Fix path to snmpget.

--- plugins-scripts/check_breeze.pl.orig	2017-01-16 17:24:03.000000000 +0000
+++ plugins-scripts/check_breeze.pl
@@ -49,7 +49,7 @@ my $critical = $1 if ($opt_c =~ /([0-9]{
 ($opt_C) || ($opt_C = "public") ;
 
 my $sig=0;
-$sig = `/usr/bin/snmpget $host $opt_C .1.3.6.1.4.1.710.3.2.3.1.3.0`;
+$sig = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.710.3.2.3.1.3.0`;
 my @test=split(/ /,$sig);
 $sig=$test[2];
 $sig=int($sig);

$NetBSD: patch-plugins-scripts_check__wave.pl,v 1.1 2017/07/04 19:45:18 jperkin Exp $

Fix path to snmpget.

--- plugins-scripts/check_wave.pl.orig	2017-01-16 17:24:03.000000000 +0000
+++ plugins-scripts/check_wave.pl
@@ -9,7 +9,7 @@ use lib '@libexecdir@';
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 use vars qw($PROGNAME);
 use Getopt::Long;
-use vars qw($opt_V $opt_h $verbose $opt_w $opt_c $opt_H);
+use vars qw($opt_V $opt_h $verbose $opt_w $opt_c $opt_H $opt_C);
 my (@test, $low1, $med1, $high1, $snr, $low2, $med2, $high2);
 my ($low, $med, $high, $lowavg, $medavg, $highavg, $tot, $ss);
 
@@ -28,7 +28,8 @@ GetOptions
 	 "v" => \$verbose, "verbose"  => \$verbose,
 	 "w=s" => \$opt_w, "warning=s"  => \$opt_w,
 	 "c=s" => \$opt_c, "critical=s" => \$opt_c,
-	 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
+	 "H=s" => \$opt_H, "hostname=s" => \$opt_H,
+	 "C=s" => \$opt_C, "community=s" => \$opt_C);
 
 if ($opt_V) {
 	print_revision($PROGNAME,'@NP_VERSION@'); #'
@@ -41,6 +42,7 @@ if ($opt_h) {
 }
 
 $opt_H = shift unless ($opt_H);
+$opt_C = "public" unless ($opt_C);
 print_usage() unless ($opt_H);
 my $host = $1 if ($opt_H =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z][-a-zA-Z0]+(\.[a-zA-Z][-a-zA-Z0]+)*)$/);
 print_usage() unless ($host);
@@ -51,34 +53,34 @@ my $critical = $1 if ($opt_c =~ /([0-9]+
 ($opt_w) || ($opt_w = shift) || ($opt_w = 60);
 my $warning = $1 if ($opt_w =~ /([0-9]+)/);
 
-$low1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
+$low1 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
 @test = split(/ /,$low1);
 $low1 = $test[2];
 
-$med1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
+$med1 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
 @test = split(/ /,$med1);
 $med1 = $test[2];
 
-$high1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
+$high1 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
 @test = split(/ /,$high1);
 $high1 = $test[2];
 
 sleep(2);
 
-$snr = `snmpget $host public .1.3.6.1.4.1.762.2.5.2.1.17.1`;
+$snr = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.762.2.5.2.1.17.1`;
 @test = split(/ /,$snr);
 $snr = $test[2];
 $snr = int($snr*25);
 
-$low2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
+$low2 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
 @test = split(/ /,$low2);
 $low2 = $test[2];
 
-$med2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
+$med2 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
 @test = split(/ /,$med2);
 $med2 = $test[2];
 
-$high2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
+$high2 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
 @test = split(/ /,$high2);
 $high2 = $test[2];
 
@@ -109,7 +111,7 @@ if ($ss<$critical) {
 
 
 sub print_usage () {
-	print "Usage: $PROGNAME -H <host> [-w <warn>] [-c <crit>]\n";
+	print "Usage: $PROGNAME -H <host> [-C <community>] [-w <warn>] [-c <crit>]\n";
 }
 
 sub print_help () {

$NetBSD: patch-plugins_check__radius.c,v 1.1 2017/07/04 19:45:18 jperkin Exp $

Support radius config.

--- plugins/check_radius.c.orig	2017-01-16 17:24:03.000000000 +0000
+++ plugins/check_radius.c
@@ -86,7 +86,7 @@ char *password = NULL;
 char *nasid = NULL;
 char *nasipaddress = NULL;
 char *expect = NULL;
-char *config_file = NULL;
+char *config_file = "@SYSCONFDIR@/radiusclient-ng/radiusclient.conf";
 unsigned short port = PW_AUTH_UDP_PORT;
 int retries = 1;
 int verbose = FALSE;