diff options
Diffstat (limited to 'net-mgmt/nagios-plugins/files/patch-configure.in')
| -rw-r--r-- | net-mgmt/nagios-plugins/files/patch-configure.in | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/net-mgmt/nagios-plugins/files/patch-configure.in b/net-mgmt/nagios-plugins/files/patch-configure.in index 6f4d174e02a4..a0acf7a81ffb 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 Wed Dec 15 21:54:37 2004 -+++ configure.in Fri Dec 17 12:31:43 2004 +--- configure.in.orig Thu Dec 30 15:19:37 2004 ++++ configure.in Sun Jan 30 13:16:43 2005 @@ -10,7 +10,7 @@ RELEASE=1 AC_SUBST(RELEASE) @@ -68,15 +68,16 @@ dnl Check for mysql libraries -@@ -644,221 +651,11 @@ +@@ -581,234 +588,11 @@ AC_PATH_PROG(PATH_TO_PS,ps) -AC_MSG_CHECKING(for ps syntax) -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 +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null +- egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +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'" @@ -84,6 +85,18 @@ - ac_cv_ps_cols=8 - 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 +-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_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 @@ -295,7 +308,7 @@ if test -n "$ac_cv_ps_varlist" ; then AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist, -@@ -1211,6 +1008,8 @@ +@@ -1161,6 +945,8 @@ AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who", [path and arguments for invoking 'who']) @@ -304,7 +317,7 @@ AC_PATH_PROG(PATH_TO_SNMPGET,snmpget) if test -x "$PATH_TO_SNMPGET" then -@@ -1233,7 +1032,10 @@ +@@ -1183,7 +969,10 @@ else AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins]) fi @@ -315,7 +328,7 @@ AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat) AC_PATH_PROG(PATH_TO_QSTAT,qstat) -@@ -1255,7 +1057,10 @@ +@@ -1205,7 +994,10 @@ AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat", [path to qstat/quakestat]) fi @@ -326,7 +339,7 @@ AC_PATH_PROG(PATH_TO_FPING,fping) if test -x "$PATH_TO_FPING" then -@@ -1263,6 +1068,7 @@ +@@ -1213,6 +1005,7 @@ EXTRAS="$EXTRAS check_fping" else AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin]) |