Index: head/net-mgmt/monitoring-plugins/Makefile
===================================================================
--- head/net-mgmt/monitoring-plugins/Makefile	(revision 558277)
+++ head/net-mgmt/monitoring-plugins/Makefile	(revision 558278)
@@ -1,148 +1,146 @@
 # Created by: Blaz Zupan <blaz@si.FreeBSD.org>
 # $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}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Monitoring Plugins for Nagios
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		charsetfix gmake libtool perl5 ssl
 USE_SUBMAKE=	yes
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--localstatedir=${NAGIOSDIR} \
 		--prefix=${PREFIX} \
 		--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--with-cgiurl=${NAGIOSCGIURL} \
 		--with-perl=${PERL}
 
 # Also, force some commands with their expected paths so that they don't get
 # disabled.
 CONFIGURE_ARGS+=	--with-ping-command="/sbin/ping -n -t %d -c %d %s" \
 			--with-ping6-command="${_PING6_CMD}" \
 			ac_cv_path_PATH_TO_PING6=/sbin/ping6 \
 			ac_cv_path_PATH_TO_PING=/sbin/ping \
 			ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \
 			ac_cv_path_PATH_TO_SMBCLIENT=${LOCALBASE}/bin/smbclient \
 			ac_cv_path_PATH_TO_SUDO=${LOCALBASE}/bin/sudo
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 CONFLICTS_INSTALL=	nagios-plugins-*
 
 OPTIONS_DEFINE=		DBI EXTRAOPTS FPING IPV6 LDAP MYSQL NETSNMP NLS PGSQL \
 			QSTAT RADIUS SSH_PORTABLE
 OPTIONS_DEFAULT=	DNS_BASE EXTRAOPTS
 OPTIONS_SINGLE=		DNS
 OPTIONS_SINGLE_DNS=	DNS_BASE DNS_BINDTOOLS
 OPTIONS_SUB=		yes
 
 DBI_DESC=		Check database using DBI
 DNS_BASE_DESC=		Use drill for check_dig and no check_dns
 DNS_BINDTOOLS_DESC=	Use dig and nslookup from dns/bind-tools
 DNS_DESC=		Configuration of check_dig and check_dns (see help)
 EXTRAOPTS_DESC=		Parsing of plugins ini config files for extra options
 FPING_DESC=		Support for non-flooding fast ping (check_fping)
 LDAP_DESC=		OpenLDAP support (check_ldap)
 MYSQL_DESC=		MySQL support (check_mysql)
 NETSNMP_DESC=		SNMP support (check_snmp)
 PGSQL_DESC=		PostgreSQL support (check_pgsql)
 QSTAT_DESC=		Game server query support (check_game)
 RADIUS_DESC=		Radius support (check_radius)
 SSH_PORTABLE_DESC=	Build check_ssh with ports openssh (instead of base)
 
 DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 DBI_CONFIGURE_WITH=	dbi
 
 DNS_BASE_CONFIGURE_ON=	--with-dig-command=/usr/bin/drill \
 			ac_cv_path_PATH_TO_NSLOOKUP=
 DNS_BASE_EXTRA_PATCHES=	${FILESDIR}/extra-patch-dig-to-drill.diff
 
 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
 
 EXTRAOPTS_CONFIGURE_ENABLE=	extra-opts
 
 FPING_BUILD_DEPENDS=	fping:net/fping
 FPING_RUN_DEPENDS=	fping:net/fping
 FPING_CONFIGURE_OFF=	ac_cv_path_PATH_TO_FPING6= \
 			ac_cv_path_PATH_TO_FPING=
 
 IPV6_CONFIGURE_WITH=	ipv6
 
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_WITH=	ldap
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql=${LOCALBASE}
 
 NETSNMP_BUILD_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
 			snmpcheck:net-mgmt/net-snmp
 NETSNMP_RUN_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
 			snmpcheck:net-mgmt/net-snmp
 NETSNMP_CONFIGURE_OFF=	ac_cv_path_PATH_TO_SNMPGET= \
 			ac_cv_path_PATH_TO_SNMPGETNEXT=
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	pgsql=${LOCALBASE}
 
 QSTAT_BUILD_DEPENDS=	qstat:games/qstat
 QSTAT_RUN_DEPENDS=	qstat:games/qstat
 QSTAT_CONFIGURE_OFF=	ac_cv_path_PATH_TO_QSTAT= \
 			ac_cv_path_PATH_TO_QUAKESTAT=
 
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 RADIUS_CONFIGURE_WITH=	radius
 
 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
 
 NAGIOSDIR?=	/var/spool/nagios
 
 NAGIOSWWWDIR?=	www/nagios
 NAGIOSHTMURL?=	/nagios
 NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
 
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1300041
 _PING6_CMD=	/sbin/ping6 -n -X %d -c %d %s
 .else
 _PING6_CMD=	/sbin/ping6 -n -t %d -c %d %s
 .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
 
 .include <bsd.port.mk>
Index: head/net-mgmt/monitoring-plugins/distinfo
===================================================================
--- head/net-mgmt/monitoring-plugins/distinfo	(revision 558277)
+++ head/net-mgmt/monitoring-plugins/distinfo	(revision 558278)
@@ -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
Index: head/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c	(revision 558277)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c	(nonexistent)
@@ -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;

Property changes on: head/net-mgmt/monitoring-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/monitoring-plugins/files/patch-plugins_common.h
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins_common.h	(revision 558277)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins_common.h	(nonexistent)
@@ -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

Property changes on: head/net-mgmt/monitoring-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/monitoring-plugins/files/patch-lib_utils__base.c
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-lib_utils__base.c	(revision 558277)
+++ head/net-mgmt/monitoring-plugins/files/patch-lib_utils__base.c	(nonexistent)
@@ -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();
- 	}

Property changes on: head/net-mgmt/monitoring-plugins/files/patch-lib_utils__base.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/monitoring-plugins/files/patch-configure
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-configure	(revision 558277)
+++ head/net-mgmt/monitoring-plugins/files/patch-configure	(revision 558278)
@@ -1,19 +1,19 @@
---- 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; }
  
 +elif ps -axwo 'stat comm vsz rss user uid pid ppid args jid' 2>/dev/null | \
 +	egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND +JID" > /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:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5
 +$as_echo "$ac_cv_ps_command" >&6; }
 +
  elif ps -axwo '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
  then
Index: head/net-mgmt/monitoring-plugins/files/patch-plugins-root_Makefile.in
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins-root_Makefile.in	(nonexistent)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins-root_Makefile.in	(revision 558278)
@@ -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); \

Property changes on: head/net-mgmt/monitoring-plugins/files/patch-plugins-root_Makefile.in
___________________________________________________________________
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/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl	(revision 558277)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl	(revision 558278)
@@ -1,56 +1,56 @@
 From 94acff9f2616fbca8fd31292d374d9ce8a45263a Mon Sep 17 00:00:00 2001
 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" ) {
  	}
  } # 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 (<MAILQ>);
 +
 +	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;
-@@ -610,7 +643,7 @@ sub process_arguments(){
+@@ -612,7 +645,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';
Index: head/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c	(revision 558277)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c	(revision 558278)
@@ -1,10 +1,10 @@
---- 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;
  	int procpid = 0;
  	int procppid = 0;
 +	int procjid = 0;
  	int procvsz = 0;
  	int procrss = 0;
  	float procpcpu = 0;
Index: head/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c	(revision 558277)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c	(revision 558278)
@@ -1,107 +1,107 @@
---- 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
 +#define JID 2048
  
  #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads:
  							ppid of procs are compared to pid of this proc*/
 @@ -101,6 +102,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;
  
 @@ -130,6 +132,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;
 @@ -230,9 +233,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\n", 
 +				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);
  
  			/* Ignore self */
 @@ -275,6 +278,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))
 @@ -292,9 +297,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\n", 
 +				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);
  			}
  
-@@ -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'},
 +		{"jid", required_argument, 0, 'j'},
  		{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) {
 -		c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T",
 +		c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tj:",
  			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!"));
 +        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;
 @@ -731,6 +743,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");
-@@ -779,7 +793,7 @@ void
+@@ -784,7 +798,7 @@ void
  print_usage (void)
  {
    printf ("%s\n", _("Usage:"));
 -	printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n", progname);
 +	printf ("%s -w <range> -c <range> [-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");
  }
Index: head/net-mgmt/monitoring-plugins/pkg-plist
===================================================================
--- head/net-mgmt/monitoring-plugins/pkg-plist	(revision 558277)
+++ head/net-mgmt/monitoring-plugins/pkg-plist	(revision 558278)
@@ -1,71 +1,72 @@
 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
 %%DNS_BINDTOOLS%%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_ssmtp
 libexec/nagios/check_swap
 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
 libexec/nagios/urlize
 libexec/nagios/utils.pm
 libexec/nagios/utils.sh
 %%NLS%%share/locale/de/LC_MESSAGES/monitoring-plugins.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/monitoring-plugins.mo