SOURCES (DEVEL): nagios-plugins-configure.patch - updated to 20051...

[glen]

Author: glen                         Date: Sat Nov  5 02:24:12 2005 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- updated to 200510310547 snap

---- Files affected:
SOURCES:
   nagios-plugins-configure.patch (1.6 -> 1.6.2.1) 

---- Diffs:

================================================================
Index: SOURCES/nagios-plugins-configure.patch
diff -u SOURCES/nagios-plugins-configure.patch:1.6 SOURCES/nagios-plugins-configure.patch:1.6.2.1
--- SOURCES/nagios-plugins-configure.patch:1.6	Sat Oct 29 16:10:05 2005
+++ SOURCES/nagios-plugins-configure.patch	Sat Nov  5 03:24:07 2005
@@ -226,9 +226,9 @@
  then
  	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary])
  	EXTRAS="$EXTRAS check_hpjd check_snmp"
---- ./configure.in~	2005-10-06 16:55:28.000000000 +0300
-+++ ./configure.in	2005-10-06 16:57:25.000000000 +0300
-@@ -595,9 +595,21 @@
+--- ./configure.in~	2005-11-05 03:21:13.000000000 +0200
++++ ./configure.in	2005-11-05 03:21:15.000000000 +0200
+@@ -640,10 +640,22 @@
  AC_PATH_PROG(PATH_TO_PS,ps)
  
  AC_MSG_CHECKING(for ps syntax)
@@ -236,21 +236,23 @@
 +AC_ARG_WITH(ps_format,--with-ps-format=<format> Format string for scanning ps output in check_procs,PS_FORMAT=$withval)
 +AC_ARG_WITH(ps_cols,--with-cols=<number> Number of columns in ps command,PS_COLS=$withval)
 +AC_ARG_WITH(ps_varlist,--with-ps-varlist=<list> Variable list for sscanf of 'ps' output,PS_VARLIST=$withval)
+ 
+-dnl Now using the pst3/kmem hack for solaris systems to avoid truncation
+ AM_CONDITIONAL(WANT_PST3, false)
+-if test "$ac_cv_uname_s" = "SunOS"; then
 +
 +if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test -n "$PS_VARLIST"; then 
-+	ac_cv_ps_varlist="$PS_VARLIST"
 +	ac_cv_ps_command="$PS_COMMAND"
 +	ac_cv_ps_format="$PS_FORMAT"
++	ac_cv_ps_varlist="$PS_VARLIST"
 +	ac_cv_ps_cols="$PS_COLS"
 +	AC_MSG_RESULT([(command-line) $ac_cv_ps_command])
 +
- 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 | \
-+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,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
++dnl Now using the pst3/kmem hack for solaris systems to avoid truncation
++elif test "$ac_cv_uname_s" = "SunOS"; then
+ 	#
+ 	# this is a very, very ugly hack, to hardcode the location for plugins
+ 	#
 --- ./configure.in~	2005-10-06 17:00:57.000000000 +0300
 +++ ./configure.in	2005-10-06 17:04:35.000000000 +0300
 @@ -1226,7 +1226,8 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nagios-plugins-configure.patch?r1=1.6&r2=1.6.2.1&f=u