- Update to 1.4.1

PR:		ports/84506
Submitted by:	maintainer

7 files changed, 139 insertions, 166 deletions

diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 54281c2d90f6..e0592299b615 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nagios-plugins
-PORTVERSION=	1.4
-PORTREVISION=	3
+PORTVERSION=	1.4.1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
diff --git a/net-mgmt/nagios-plugins/distinfo b/net-mgmt/nagios-plugins/distinfo
index 3eb87ba430d2..34b0f33de492 100644
--- a/net-mgmt/nagios-plugins/distinfo
+++ b/net-mgmt/nagios-plugins/distinfo
@@ -1,2 +1,2 @@
-MD5 (nagios-plugins-1.4.tar.gz) = 9b21b92acc4b2b0dbb2d12bca6b27582
-SIZE (nagios-plugins-1.4.tar.gz) = 972810
+MD5 (nagios-plugins-1.4.1.tar.gz) = 5bdd5dd7fca92a2aeb29683866ee42f1
+SIZE (nagios-plugins-1.4.1.tar.gz) = 967552
diff --git a/net-mgmt/nagios-plugins/files/patch-check_mysql.c b/net-mgmt/nagios-plugins/files/patch-check_mysql.c
deleted file mode 100644
index 998ad4788797..000000000000
--- a/net-mgmt/nagios-plugins/files/patch-check_mysql.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/check_mysql.c.orig	Sun Dec 26 00:17:44 2004
-+++ plugins/check_mysql.c	Sun Feb 20 14:12:10 2005
-@@ -123,8 +123,16 @@
- 				die (STATE_CRITICAL, "%s\n", slaveresult);
- 			}
- 
-+		} else if (mysql_field_count (&mysql) == 33) {
-+			/* mysql >= 4.1.1 */
-+			snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s", row[10], row[11]);
-+			if (strcmp (row[10], "Yes") != 0 || strcmp (row[11], "Yes") != 0) {
-+				mysql_free_result (res);
-+				mysql_close (&mysql);
-+				die (STATE_CRITICAL, "%s\n", slaveresult);
-+			}
- 		} else {
--			/* mysql 4.x.x */
-+			/* mysql 4.0.x or 4.1.0 */
- 			snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s", row[9], row[10]);
- 			if (strcmp (row[9], "Yes") != 0 || strcmp (row[10], "Yes") != 0) {
- 				mysql_free_result (res);
diff --git a/net-mgmt/nagios-plugins/files/patch-check_ntp.pl b/net-mgmt/nagios-plugins/files/patch-check_ntp.pl
index 39c6ad2c0a5f..cd9dd606d452 100644
--- a/net-mgmt/nagios-plugins/files/patch-check_ntp.pl
+++ b/net-mgmt/nagios-plugins/files/patch-check_ntp.pl
@@ -1,20 +1,10 @@
---- plugins-scripts/check_ntp.pl.orig	Fri Nov 19 04:59:43 2004
-+++ plugins-scripts/check_ntp.pl	Fri Dec  3 23:54:19 2004
-@@ -274,7 +274,7 @@
+--- plugins-scripts/check_ntp.pl.orig	Wed May 25 16:05:41 2005
++++ plugins-scripts/check_ntp.pl	Wed Aug  3 10:23:37 2005
+@@ -309,7 +309,6 @@
+ 				}
+ 			} else {
+ 				print "No match!\n" if $verbose;
+-				$jitter = '(not parsed)';
  			}
  			
- 			# match sys.peer or pps.peer
--			if (/^(\*|o)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
-+			if (/^(\*|o)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
- 				$syspeer = $2;
- 				$stratum = $4;
- 				$jitter = $11;
-@@ -299,7 +299,7 @@
- 		unless (defined $syspeer) {
- 			if ($#candidates >0) {
- 				foreach my $c (@candidates) {
--					$c =~ /^(#)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/;
-+					$c =~ /^(#)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/;
- 					$syspeer = $2;
- 					$stratum = $4;
- 					$jitter = $11;
+ 		}
diff --git a/net-mgmt/nagios-plugins/files/patch-check_tcp.c b/net-mgmt/nagios-plugins/files/patch-check_tcp.c
deleted file mode 100644
index 4b396c45c2a2..000000000000
--- a/net-mgmt/nagios-plugins/files/patch-check_tcp.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/check_tcp.c.orig	Thu Dec 30 03:41:40 2004
-+++ plugins/check_tcp.c	Thu May 12 14:02:13 2005
-@@ -196,7 +196,6 @@
- 		EXPECT = strdup("<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'");
- 		QUIT = strdup("</stream:stream>\n");
- 		PROTOCOL=TCP_PROTOCOL;
--		use_ssl=TRUE;
- 		PORT = 5222;
- 	}
-        else if (strstr (argv[0], "check_nntps")) {
diff --git a/net-mgmt/nagios-plugins/files/patch-configure.in b/net-mgmt/nagios-plugins/files/patch-configure.in
index 7962775b1037..9400d6f419ed 100644
--- a/net-mgmt/nagios-plugins/files/patch-configure.in
+++ b/net-mgmt/nagios-plugins/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	Fri Feb  4 01:44:27 2005
-+++ configure.in	Sun Feb 27 15:17:24 2005
+--- configure.in.orig	Mon Aug  1 23:24:51 2005
++++ configure.in	Wed Aug  3 09:31:30 2005
 @@ -10,7 +10,7 @@
  RELEASE=1
  AC_SUBST(RELEASE)
@@ -18,7 +18,7 @@
  
  AC_ARG_WITH(trusted_path,
  	ACX_HELP_STRING([--with-trusted-path=PATH],
-@@ -181,27 +179,35 @@
+@@ -193,27 +191,35 @@
  LIBS="$_SAVEDLIBS"
  CPPFLAGS="$_SAVEDCPPFLAGS"
  
@@ -60,7 +60,7 @@
    AC_CHECK_FUNCS(ldap_set_option)
    EXTRAS="$EXTRAS check_ldap"
  	AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
-@@ -210,6 +216,7 @@
+@@ -222,6 +228,7 @@
    AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
  fi
  LIBS="$_SAVEDLIBS"
@@ -68,63 +68,74 @@
  
  
  dnl Check for mysql libraries
-@@ -585,234 +592,11 @@
+@@ -597,247 +604,11 @@
  
  AC_PATH_PROG(PATH_TO_PS,ps)
  
 -AC_MSG_CHECKING(for ps syntax)
+-dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
+-dnl so test for this first...
+-if 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
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu comm args'"
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
+-	ac_cv_ps_cols=9
+-	AC_MSG_RESULT([$ac_cv_ps_command])
+-
 -dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
 -dnl Should also work for FreeBSD 5.2.1 and 5.3
 -dnl  STAT UCOMM              VSZ   RSS USER      PPID COMMAND
--if ps -axwo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
--	egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
+-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
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=8
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
+-	ac_cv_ps_cols=9
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4. 
 -dnl Limitation: Only first 16 chars returned for ucomm field
 -dnl Must come before ps -weo
--elif ps -axwo 'stat uid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
--	egrep -i ["^ *STAT +UID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
+-elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
+-	egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid ppid vsz rss pcpu ucomm command'"
--	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=8
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu ucomm command'"
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
+-	ac_cv_ps_cols=9
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl  STAT UCOMM              VSZ   RSS USER       UID  PPID COMMAND
--elif ps -weo 'stat comm vsz rss user uid ppid etime args' 2>/dev/null | \
--	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
+-elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \
+-	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid vsz rss pcpu etime comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %f %s %s %n"
--	ac_cv_ps_cols=9
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid pid ppid vsz rss pcpu etime comm args'"
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n"
+-	ac_cv_ps_cols=10
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl FreeBSD
--elif ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | \
--	egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PPID"] >/dev/null
+-elif ps waxco 'state command vsz rss uid user pid ppid' 2>/dev/null | \
+-	egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS waxco 'state uid ppid vsz rss pcpu command command'"
--	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=8
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS waxco 'state uid pid ppid vsz rss pcpu command command'"
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
+-	ac_cv_ps_cols=9
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl BSD-like mode in RH 6.1
--elif ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | \
--	egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
+-elif ps waxno 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \
+-	egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS waxno 'state uid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=8
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS waxno 'state uid pid ppid vsz rss pcpu comm args'"
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
+-	ac_cv_ps_cols=9
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl SunOS 4.1.3:
@@ -133,10 +144,10 @@
 -elif ps -laxnwww 2>/dev/null | head -1 | \
 -	egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
 -then
--	ac_cv_ps_varlist="[&procuid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
+-	ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
 -	ac_cv_ps_command="$PATH_TO_PS -laxnwww"
--	ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %d %d %*s %s %*s %*s %n%s"
--	ac_cv_ps_cols=8
+-	ac_cv_ps_format="%*s %d %d %d %*s %*s %*s %d %d %*s %s %*s %*s %n%s"
+-	ac_cv_ps_cols=9
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl Debian Linux / procps v1.2.9:
@@ -146,109 +157,110 @@
 -elif ps laxnwww 2>/dev/null | \
 -	egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
 -then
--	ac_cv_ps_varlist="[&procuid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]"
+-	ac_cv_ps_varlist="[&procuid,&procpid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]"
 -	ac_cv_ps_command="$PATH_TO_PS laxnwww"
--	ac_cv_ps_format="%*s %d %*s %d %*s %*s %d %d %*s %s %*s %*s %n%s"
--	ac_cv_ps_cols=8
+-	ac_cv_ps_format="%*s %d %d %d %*s %*s %d %d %*s %s %*s %*s %n%s"
+-	ac_cv_ps_cols=9
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs)
--elif ps -axo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
--	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
+-elif ps -axo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
+-	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=8
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid pid ppid vsz rss pcpu comm args'"
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
+-	ac_cv_ps_cols=9
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl Tru64 - needs %*[ +] in PS_FORMAT
--elif ps -ao 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
--	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
+-elif ps -ao 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
+-	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -ao 'stat uid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format=["%s%*[ +] %d %d %d %d %f %s %n"]
--	ac_cv_ps_cols=8
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS -ao 'stat uid pid ppid vsz rss pcpu comm args'"
+-	ac_cv_ps_format=["%s%*[ +] %d %d %d %d %d %f %s %n"]
+-	ac_cv_ps_cols=9
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
--elif ps -eo 's comm vsz rss user uid ppid args' 2>/dev/null | \
--	egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
+-XXX
+-elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null | \
+-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -eo 's uid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=8
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'"
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
+-	ac_cv_ps_cols=9
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl AIX 4.3.3 and 5.1 do not have an rss field
--elif ps -eo 'stat uid ppid vsz pcpu comm args' 2>/dev/null | \
--	egrep -i ["^ *S[TAUES]* +UID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
+-elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null | \
+-	egrep -i ["^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid ppid vsz pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %f %s %n"
--	ac_cv_ps_cols=7
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'"
+-	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
+-	ac_cv_ps_cols=8
 -	AC_MSG_RESULT([$ac_cv_ps_command - with no RSS])
 -
 -dnl Solaris 2.6
--elif ps -Ao 's comm vsz rss uid user ppid args' 2>/dev/null | \
--	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
+-elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \
+-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -Ao 's uid ppid vsz rss pcpu comm args'"
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'"
 -	# There must be no space between the %s and %n due to a wierd problem in sscanf where
 -	# it will return %n as longer than the line length
--	ac_cv_ps_format="%s %d %d %d %d %f %s%n"
--	ac_cv_ps_cols=8
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s%n"
+-	ac_cv_ps_cols=9
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
--elif ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | \
--	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
+-elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null | \
+-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=8
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'"
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
+-	ac_cv_ps_cols=9
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
--elif ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | \
--	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
+-elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \
+-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=8
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'"
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
+-	ac_cv_ps_cols=9
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl wonder who takes state instead of stat
--elif ps -ao 'state command vsz rss user ppid args' 2>/dev/null | \
--	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
+-elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null | \
+-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -ao 'state uid ppid vsz rss pcpu command args'"
--	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=7
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'"
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
+-	ac_cv_ps_cols=8
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl IRIX 53
 -elif ps -el 2>/dev/null | \
 -	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&pos,procprog]"
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procrss,&pos,procprog]"
 -	ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)"
--	ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %d %d %*s %*s %*s %n%s"
--	ac_cv_ps_cols=7
+-	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %d %d %*s %*s %*s %n%s"
+-	ac_cv_ps_cols=8
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl IRIX 63
 -elif ps -el 2>/dev/null | \
 -	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]"
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&pos,procprog]"
 -	ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)"
--	ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
--	ac_cv_ps_cols=5
+-	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
+-	ac_cv_ps_cols=6
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl AIX 4.1:
@@ -257,20 +269,20 @@
 -elif ps -el 2>/dev/null | \
 -	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]"
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&pos,procprog]"
 -	ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)"
--	ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
--	ac_cv_ps_cols=5
+-	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
+-	ac_cv_ps_cols=6
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl AIX?
 -elif ps glaxen 2>/dev/null | \
 -	egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
 -then
--	ac_cv_ps_varlist="[&procuid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
+-	ac_cv_ps_varlist="[&procuid,&procpid,&procpid,&procvsz,&procrss,procstat,&pos,procprog]"
 -	ac_cv_ps_command="$PATH_TO_PS glaxen"
--	ac_cv_ps_format="%*s %d %*s %d %*s %*s %d %d %*s %s %*s %*s %n%s"
--	ac_cv_ps_cols=7
+-	ac_cv_ps_format="%*s %d %d %d %*s %*s %d %d %*s %s %*s %*s %n%s"
+-	ac_cv_ps_cols=8
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl MacOSX / Darwin
@@ -278,24 +290,25 @@
 -dnl Some truncation will happen in UCOMM column
 -dnl STAT      VSZ    RSS   UID  PPID %CPU UCOMM            COMMAND
 -dnl Ss      52756  22496   501     1   6.9 Window Manager   /System/Library/CoreServices/WindowServer -daemon
--elif ps wwaxo 'state vsz rss uid ppid pcpu ucomm command' 2>/dev/null | \
+-elif ps wwaxo 'state vsz rss uid pid ppid pcpu ucomm command' 2>/dev/null | \
 -	egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null
 -then
--	ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid ppid pcpu ucomm command'"
--	ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procppid,&procpcpu,procprog,&pos]"
--	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=7
+-	ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid pid ppid pcpu ucomm command'"
+-	ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procpid,&procpid,&procpcpu,procprog,&pos]"
+-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
+-	ac_cv_ps_cols=8
 -	AC_MSG_RESULT([$ac_cv_ps_command])
 -
 -dnl UnixWare 
 -elif ps -Al 2>/dev/null | \
 -	egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null
 -then
--	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]"
+-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&pos,procprog]"
 -	ac_cv_ps_command="$PATH_TO_PS -Al"
--	ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
--	ac_cv_ps_cols=7
+-	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
+-	ac_cv_ps_cols=8
 -	AC_MSG_RESULT([$ac_cv_ps_command])
+-XXX
 -
 -else
 -	AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
@@ -308,7 +321,7 @@
  
  if test -n "$ac_cv_ps_varlist" ; then
  	AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist,
-@@ -1165,6 +949,8 @@
+@@ -1198,6 +969,8 @@
  AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
  	[path and arguments for invoking 'who'])
  
@@ -317,7 +330,7 @@
  AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
  if test -x "$PATH_TO_SNMPGET"
  then
-@@ -1187,7 +973,10 @@
+@@ -1220,7 +993,10 @@
  else
  	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
  fi
@@ -328,7 +341,7 @@
  AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
  AC_PATH_PROG(PATH_TO_QSTAT,qstat)
  
-@@ -1209,7 +998,10 @@
+@@ -1242,7 +1018,10 @@
  	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
  		[path to qstat/quakestat])
  fi
@@ -339,7 +352,7 @@
  AC_PATH_PROG(PATH_TO_FPING,fping)
  if test -x "$PATH_TO_FPING"
  then
-@@ -1218,6 +1010,7 @@
+@@ -1251,6 +1030,7 @@
  else
  	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
  fi
@@ -347,7 +360,7 @@
  
  AC_PATH_PROG(PATH_TO_SSH,ssh)
  
-@@ -1280,32 +1073,12 @@
+@@ -1313,32 +1093,12 @@
  dnl end if for PATH_TO_SWAP
  fi
  
diff --git a/net-mgmt/nagios-plugins/pkg-plist b/net-mgmt/nagios-plugins/pkg-plist
index 31dcb7d667ac..3bc2936e6ea8 100644
--- a/net-mgmt/nagios-plugins/pkg-plist
+++ b/net-mgmt/nagios-plugins/pkg-plist
@@ -48,6 +48,7 @@ libexec/nagios/check_smtp
 %%SUB_SNMP%%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