Update nagios-plugins to 2.3.3


(sekiya)

$NetBSD: patch-lib_Makefile.in,v 1.1 2023/01/09 00:28:41 sekiya Exp $

Pull in CPPFLAGS_LFS.

--- lib/Makefile.in.orig	2020-03-12 01:57:59.000000000 +0900
+++ lib/Makefile.in	2023-01-09 08:50:52.418317845 +0900
@@ -166,7 +166,7 @@
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS_LFS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

$NetBSD: patch-plugins-scripts_Makefile.in,v 1.1 2023/01/09 00:28:41 sekiya Exp $

Exclude plugins that would require extra dependancies.
Some can be found in specific nagios plugin packages.

--- plugins-scripts/Makefile.in.orig	2020-03-12 01:58:00.000000000 +0900
+++ plugins-scripts/Makefile.in	2023-01-09 08:50:02.651881773 +0900
@@ -1348,17 +1348,12 @@
 with_trusted_path = @with_trusted_path@
 @RELEASE_PRESENT_TRUE@NP_VERSION = @NP_RELEASE@
 SUFFIXES = .pl .sh
-libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
-	check_log check_oracle check_rpc check_sensors check_wave \
-	check_ifstatus check_ifoperstatus check_mailq check_file_age \
-	check_ssl_validity \
-	utils.sh utils.pm
-
-EXTRA_DIST = check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \
-	check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \
-	check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \
-	check_ssl_validity.pl \
-	utils.sh.in utils.pm.in t
+
+libexec_SCRIPTS = check_ircd check_log check_ntp check_rpc \
+	check_mailq check_file_age utils.sh utils.pm
+
+EXTRA_DIST = check_ircd.pl check_log.sh check_ntp.pl check_rpc.pl \
+	check_mailq.pl check_file_age.pl utils.sh.in utils.pm.in t
 
 EDIT = sed \
   -e 's|[@]NP_VERSION[@]|$(NP_VERSION)|g' \

$NetBSD: patch-plugins-scripts_check_breeze.pl,v 1.1 2023/01/09 00:28:41 sekiya Exp $

Fix path to snmpget.

--- plugins-scripts/check_breeze.pl.orig	2017-01-17 02:24:03.000000000 +0900
+++ plugins-scripts/check_breeze.pl	2023-01-09 08:51:25.244526777 +0900
@@ -49,7 +49,7 @@
 ($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_ntp.pl,v 1.1 2023/01/09 00:28:41 sekiya Exp $

Unknown patch, please document.

--- plugins-scripts/check_ntp.pl.orig	2019-12-05 06:53:08.000000000 +0900
+++ plugins-scripts/check_ntp.pl	2023-01-09 08:50:43.177526601 +0900
@@ -312,6 +312,7 @@
 				} else {
 					$jitter_error = $ERRORS{'OK'};
 				}
+				last;
 			} else {
 				print "No match!\n" if $verbose;
 				$jitter = '(not parsed)';

$NetBSD: patch-plugins-scripts_check_wave.pl,v 1.1 2023/01/09 00:28:41 sekiya Exp $

Fix path to snmpget.

--- plugins-scripts/check_wave.pl.orig	2019-12-05 06:53:08.000000000 +0900
+++ plugins-scripts/check_wave.pl	2023-01-09 08:59:45.230098438 +0900
@@ -9,7 +9,7 @@
 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);
 
@@ -29,7 +29,8 @@
 	 "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@'); #'
@@ -42,6 +43,7 @@
 }
 
 $opt_H = shift unless ($opt_H);
+$opt_C = "public" unless ($opt_C);
 unless ($opt_H) { print_usage(); exit -1; }
 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]+)*)$/);
 unless ($host) { print_usage(); exit -1; }
@@ -52,7 +54,7 @@
 ($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 2>/dev/null`;
+$low1 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.8.1 2>/dev/null`;
 unless ($low1) {
 	print "UNKNOWN - Could not find the 'snmpget' command Please install\n";
 	print "the snmp commands (usually net-snmp) before using $PROGNAME\n";
@@ -61,30 +63,30 @@
 @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];
 
@@ -115,7 +117,7 @@
 
 
 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_Makefile.in,v 1.1 2023/01/09 00:28:41 sekiya Exp $

Exclude specific plugins.

--- plugins/Makefile.in.orig	2020-03-12 01:58:00.000000000 +0900
+++ plugins/Makefile.in	2023-01-09 08:50:13.328391141 +0900
@@ -33,7 +33,7 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \
+libexec_PROGRAMS = \
 	check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \
 	check_load$(EXEEXT) check_mrtg$(EXEEXT) \
 	check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \
@@ -2253,7 +2253,7 @@
 install-exec-hook:
 	cd $(DESTDIR)$(libexecdir) && \
 	for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
-	if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
+#	if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
 
 clean-local:
 	rm -f $(check_tcp_programs)

$NetBSD: patch-plugins_check_radius.c,v 1.1 2023/01/09 00:28:41 sekiya Exp $

Support radius config.

--- plugins/check_radius.c.orig	2019-12-05 06:53:08.000000000 +0900
+++ plugins/check_radius.c	2023-01-09 08:53:32.981542458 +0900
@@ -99,7 +99,7 @@
 char *nasipaddress = NULL;
 char *castid = 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;

$NetBSD: patch-plugins_check_swap.c,v 1.1 2023/01/09 00:28:41 sekiya Exp $

Disable large file support when building 32bit on SunOS.

--- plugins/check_swap.c.orig	2019-12-05 06:53:08.000000000 +0900
+++ plugins/check_swap.c	2023-01-09 08:53:18.345470217 +0900
@@ -35,6 +35,10 @@
 #include "popen.h"
 #include "utils.h"
 
+#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
+#undef _FILE_OFFSET_BITS
+#endif
+
 #ifdef HAVE_DECL_SWAPCTL
 # ifdef HAVE_SYS_PARAM_H
 #  include <sys/param.h>

$NetBSD: patch-plugins_check_ide_smart.c,v 1.3 2023/01/09 00:28:41 sekiya Exp $

__u8 and __u16 are not defined in videoio.h in NetBSD 9.99.x.

--- plugins/check_ide_smart.c.orig	2019-12-05 06:53:08.000000000 +0900
+++ plugins/check_ide_smart.c	2023-01-09 08:53:27.415335124 +0900
@@ -56,11 +56,14 @@
 #include <sys/device.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
-#include <sys/videoio.h> /* for __u8 and friends */
 #include <sys/scsiio.h>
 #include <sys/ataio.h>
 #include <dev/ata/atareg.h>
 #include <dev/ic/wdcreg.h>
+#include <stdint.h>
+
+#define __u8 uint8_t
+#define __u16 uint16_t
 
 #define SMART_ENABLE WDSM_ENABLE_OPS
 #define SMART_DISABLE WDSM_DISABLE_OPS