Update to 2.3.

11 files changed, 40 insertions, 63 deletions

diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile
index 96113ed4f60b..8b41c29040be 100644
--- a/net-mgmt/monitoring-plugins/Makefile
+++ b/net-mgmt/monitoring-plugins/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	monitoring-plugins
-PORTVERSION=	2.2
-PORTREVISION=	9
+PORTVERSION=	2.3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://www.monitoring-plugins.org/download/ \
 		LOCAL/mat/${PORTNAME}
@@ -143,6 +142,5 @@ post-patch:
 	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 <bsd.port.mk>
diff --git a/net-mgmt/monitoring-plugins/distinfo b/net-mgmt/monitoring-plugins/distinfo
index 891805f002ac..6e0165cee00d 100644
--- a/net-mgmt/monitoring-plugins/distinfo
+++ b/net-mgmt/monitoring-plugins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482313684
-SHA256 (monitoring-plugins-2.2.tar.gz) = 296a538f00a9cbef7f528ff2d43af357a44b384dc98a32389a675b62a6dd3665
-SIZE (monitoring-plugins-2.2.tar.gz) = 2461548
+TIMESTAMP = 1608199337
+SHA256 (monitoring-plugins-2.3.tar.gz) = 3fd96efaa751c7646fe3ba25f9714859a204176a155d12fe0ee420e39e90f56c
+SIZE (monitoring-plugins-2.3.tar.gz) = 2528556
diff --git a/net-mgmt/monitoring-plugins/files/patch-configure b/net-mgmt/monitoring-plugins/files/patch-configure
index d9ef14e7f6d9..5960995f69f0 100644
--- a/net-mgmt/monitoring-plugins/files/patch-configure
+++ b/net-mgmt/monitoring-plugins/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-11-29 08:48:11 UTC
+--- configure.orig	2020-12-09 21:48:15 UTC
 +++ configure
-@@ -16747,6 +16747,16 @@ then
+@@ -17472,6 +17472,16 @@ then
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5
  $as_echo "$ac_cv_ps_command" >&6; }
  
diff --git a/net-mgmt/monitoring-plugins/files/patch-lib_utils__base.c b/net-mgmt/monitoring-plugins/files/patch-lib_utils__base.c
deleted file mode 100644
index f2eea57ad561..000000000000
--- a/net-mgmt/monitoring-plugins/files/patch-lib_utils__base.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/utils_base.c.orig	2016-11-29 08:45:08 UTC
-+++ lib/utils_base.c
-@@ -87,10 +87,13 @@ void _get_monitoring_plugin( monitoring_
- void
- die (int result, const char *fmt, ...)
- {
--	va_list ap;
--	va_start (ap, fmt);
--	vprintf (fmt, ap);
--	va_end (ap);
-+	if(fmt!=NULL) {
-+		va_list ap;
-+		va_start (ap, fmt);
-+		vprintf (fmt, ap);
-+		va_end (ap);
-+	}
-+
- 	if(this_monitoring_plugin!=NULL) {
- 		np_cleanup();
- 	}
diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins-root_Makefile.in b/net-mgmt/monitoring-plugins/files/patch-plugins-root_Makefile.in
new file mode 100644
index 000000000000..535287ed402d
--- /dev/null
+++ b/net-mgmt/monitoring-plugins/files/patch-plugins-root_Makefile.in
@@ -0,0 +1,24 @@
+--- plugins-root/Makefile.in.orig	2020-12-09 21:48:11 UTC
++++ plugins-root/Makefile.in
+@@ -1357,10 +1357,6 @@ INSTALL_SUID = \
+ 	p=$$f; \
+ 	echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
+ 	$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
+-	echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
+-	chown root $(DESTDIR)$(libexecdir)/$$p; \
+-	echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
+-	chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
+ 	done
+ 
+ 
+@@ -1795,9 +1791,7 @@ install-exec-local: $(noinst_PROGRAMS)
+ 	rm -f $$TMPFILE; \
+ 	echo > $$TMPFILE; \
+ 	can_create_suid_root_executable=no; \
+-	chown root $$TMPFILE > /dev/null 2>&1 \
+-	  && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
+-	  && can_create_suid_root_executable=yes; \
++	can_create_suid_root_executable=yes; \
+ 	rm -f $$TMPFILE; \
+ 	if test $$can_create_suid_root_executable = yes; then \
+ 	  $(INSTALL_SUID); \
diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c b/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c
deleted file mode 100644
index 7925c779da78..000000000000
--- a/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- plugins-root/check_dhcp.c.orig	2015-10-16 09:06:18 UTC
-+++ plugins-root/check_dhcp.c
-@@ -323,7 +323,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;
diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl b/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl
index fad32d64cdd6..4274663ddb21 100644
--- a/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl
+++ b/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl
@@ -3,7 +3,7 @@ From: Filias Heidt <fh@netzkommune.de>
 Date: Fri, 9 Jun 2017 14:46:00 +0200
 Subject: [PATCH] add support for opensmtpd
 
---- plugins-scripts/check_mailq.pl.orig	2016-11-29 08:45:08 UTC
+--- plugins-scripts/check_mailq.pl.orig	2020-12-09 21:38:01 UTC
 +++ plugins-scripts/check_mailq.pl
 @@ -550,6 +550,39 @@ elsif ( $mailq eq "nullmailer" ) {
  	}
@@ -45,7 +45,7 @@ Subject: [PATCH] add support for opensmtpd
  # Perfdata support
  print "$msg|unsent=$msg_q;$opt_w;$opt_c;0\n";
  exit $state;
-@@ -610,7 +643,7 @@ sub process_arguments(){
+@@ -612,7 +645,7 @@ sub process_arguments(){
  	}
  
  	if (defined $opt_M) {
diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c b/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c
index 376fe088e309..4c1111451d5b 100644
--- a/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c
+++ b/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c
@@ -1,4 +1,4 @@
---- plugins/check_nagios.c.orig	2016-11-29 08:45:08 UTC
+--- plugins/check_nagios.c.orig	2020-12-17 10:11:10 UTC
 +++ plugins/check_nagios.c
 @@ -64,6 +64,7 @@ main (int argc, char **argv)
  	int procuid = 0;
diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c b/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c
index 5f71cf21e0cb..8dde83b32b9c 100644
--- a/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c
+++ b/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c
@@ -1,6 +1,6 @@
---- plugins/check_procs.c.orig	2016-11-29 08:45:08 UTC
+--- plugins/check_procs.c.orig	2020-12-09 21:38:01 UTC
 +++ plugins/check_procs.c
-@@ -70,6 +70,7 @@ int options = 0; /* bitmask of filter cr
+@@ -70,6 +70,7 @@ int options = 0; /* bitmask of filter criteria to test
  #define PCPU 256
  #define ELAPSED 512
  #define EREG_ARGS 1024
@@ -57,7 +57,7 @@
  					procetime, procprog, procargs);
  			}
  
-@@ -409,6 +414,7 @@ process_arguments (int argc, char **argv
+@@ -409,6 +414,7 @@ process_arguments (int argc, char **argv)
  		{"input-file", required_argument, 0, CHAR_MAX+2},
  		{"no-kthreads", required_argument, 0, 'k'},
  		{"traditional-filter", no_argument, 0, 'T'},
@@ -65,7 +65,7 @@
  		{0, 0, 0, 0}
  	};
  
-@@ -417,7 +423,7 @@ process_arguments (int argc, char **argv
+@@ -417,7 +423,7 @@ process_arguments (int argc, char **argv)
  			strcpy (argv[c], "-t");
  
  	while (1) {
@@ -74,7 +74,7 @@
  			longopts, &option);
  
  		if (c == -1 || c == EOF)
-@@ -451,6 +457,12 @@ process_arguments (int argc, char **argv
+@@ -451,6 +457,12 @@ process_arguments (int argc, char **argv)
  				break;
  			}
  			usage4 (_("Parent Process ID must be an integer!"));
@@ -96,7 +96,7 @@
    printf (" %s\n", "-z, --vsz=VSZ");
    printf ("   %s\n", _("Only scan for processes with VSZ higher than indicated."));
    printf (" %s\n", "-r, --rss=RSS");
-@@ -779,7 +793,7 @@ void
+@@ -784,7 +798,7 @@ void
  print_usage (void)
  {
    printf ("%s\n", _("Usage:"));
diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins_common.h b/net-mgmt/monitoring-plugins/files/patch-plugins_common.h
deleted file mode 100644
index ca5e556bf3b2..000000000000
--- a/net-mgmt/monitoring-plugins/files/patch-plugins_common.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- plugins/common.h.orig	2016-11-29 08:45:08 UTC
-+++ plugins/common.h
-@@ -174,6 +174,11 @@
-  *
-  */
- 
-+/* MariaDB 10.2 client does not set MYSQL_PORT */
-+#ifndef MYSQL_PORT
-+#  define MYSQL_PORT 3306
-+#endif
-+
- enum {
- 	OK = 0,
- 	ERROR = -1
diff --git a/net-mgmt/monitoring-plugins/pkg-plist b/net-mgmt/monitoring-plugins/pkg-plist
index 98aadb7b212e..fe7a1f9ba74e 100644
--- a/net-mgmt/monitoring-plugins/pkg-plist
+++ b/net-mgmt/monitoring-plugins/pkg-plist
@@ -61,6 +61,7 @@ libexec/nagios/check_tcp
 libexec/nagios/check_time
 libexec/nagios/check_udp
 libexec/nagios/check_ups
+libexec/nagios/check_uptime
 libexec/nagios/check_users
 libexec/nagios/check_wave
 libexec/nagios/negate