diff options
Diffstat (limited to 'net/netsaint-plugins/files/patch-aa')
| -rw-r--r-- | net/netsaint-plugins/files/patch-aa | 133 |
1 files changed, 79 insertions, 54 deletions
diff --git a/net/netsaint-plugins/files/patch-aa b/net/netsaint-plugins/files/patch-aa index a4e5f9a7fed9..b2d1f9d2dc45 100644 --- a/net/netsaint-plugins/files/patch-aa +++ b/net/netsaint-plugins/files/patch-aa @@ -1,5 +1,5 @@ ---- configure Mon Jun 26 11:49:40 2000 -+++ configure.new Wed Jul 12 12:17:48 2000 +--- configure.orig Wed Jan 3 10:03:39 2001 ++++ configure Thu Mar 1 22:34:57 2001 @@ -11,7 +11,7 @@ ac_help= ac_default_prefix=/usr/local @@ -9,7 +9,7 @@ ac_help="$ac_help --with-cgiurl=<dir> sets URL for cgi programs" ac_help="$ac_help -@@ -47,12 +47,12 @@ +@@ -53,12 +53,12 @@ x_includes=NONE x_libraries=NONE bindir='${exec_prefix}/bin' @@ -27,14 +27,28 @@ libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -@@ -3116,15 +3116,15 @@ +@@ -1133,7 +1133,7 @@ + SET_MAKE="MAKE=${MAKE-make}" + fi + +-for ac_prog in gawk mawk nawk awk ++for ac_prog in mawk gawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -3718,7 +3718,7 @@ EOF echo " ps syntax... $PATH_TO_PS -eo 's comm vsz rss user ppid args'" -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 -axo '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 then - cat >> confdefs.h <<EOF + cat >> confdefs.h <<\EOF + #define USE_PS_VARS 1 +@@ -3729,12 +3729,12 @@ + EOF + + cat >> confdefs.h <<EOF -#define PS_RAW_COMMAND "$PATH_TO_PS -Ao 's user ppid args'" +#define PS_RAW_COMMAND "$PATH_TO_PS -axo 's user ppid args'" EOF @@ -46,7 +60,7 @@ EOF cat >> confdefs.h <<EOF -@@ -3132,7 +3132,7 @@ +@@ -3742,7 +3742,7 @@ EOF cat >> confdefs.h <<EOF @@ -55,7 +69,7 @@ EOF cat >> confdefs.h <<EOF -@@ -3140,23 +3140,23 @@ +@@ -3750,15 +3750,15 @@ EOF cat >> confdefs.h <<EOF @@ -72,7 +86,12 @@ + echo " ps syntax... $PATH_TO_PS -axo 's comm vsz rss'" +elif ps -axo '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 then - cat >> confdefs.h <<EOF + cat >> confdefs.h <<\EOF + #define USE_PS_VARS 1 +@@ -3769,12 +3769,12 @@ + EOF + + cat >> confdefs.h <<EOF -#define PS_RAW_COMMAND "$PATH_TO_PS -Ao 'status user ppid args'" +#define PS_RAW_COMMAND "$PATH_TO_PS -axo 'status user ppid args'" EOF @@ -84,7 +103,7 @@ EOF cat >> confdefs.h <<EOF -@@ -3164,7 +3164,7 @@ +@@ -3782,7 +3782,7 @@ EOF cat >> confdefs.h <<EOF @@ -93,7 +112,7 @@ EOF cat >> confdefs.h <<EOF -@@ -3172,23 +3172,23 @@ +@@ -3790,15 +3790,15 @@ EOF cat >> confdefs.h <<EOF @@ -110,7 +129,12 @@ + echo " ps syntax... $PATH_TO_PS -axo 'status comm vsz rss'" +elif ps -axo '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 then - cat >> confdefs.h <<EOF + cat >> confdefs.h <<\EOF + #define USE_PS_VARS 1 +@@ -3809,12 +3809,12 @@ + EOF + + cat >> confdefs.h <<EOF -#define PS_RAW_COMMAND "$PATH_TO_PS -Ao 'state user ppid args'" +#define PS_RAW_COMMAND "$PATH_TO_PS -axo 'state user ppid args'" EOF @@ -122,7 +146,7 @@ EOF cat >> confdefs.h <<EOF -@@ -3196,7 +3196,7 @@ +@@ -3822,7 +3822,7 @@ EOF cat >> confdefs.h <<EOF @@ -131,7 +155,7 @@ EOF cat >> confdefs.h <<EOF -@@ -3204,14 +3204,14 @@ +@@ -3830,15 +3830,15 @@ EOF cat >> confdefs.h <<EOF @@ -144,11 +168,28 @@ EOF - echo " ps syntax... $PATH_TO_PS -Ao 'state comm vsz rss'" +-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 + echo " ps syntax... $PATH_TO_PS -axo 'state comm vsz rss'" - 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 -axo '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 then - cat >> confdefs.h <<EOF -@@ -3228,7 +3228,7 @@ + cat >> confdefs.h <<\EOF + #define USE_PS_VARS 1 +@@ -3849,12 +3849,12 @@ + EOF + + cat >> confdefs.h <<EOF +-#define PS_RAW_COMMAND "$PATH_TO_PS -ao 'state user ppid args'" ++#define PS_RAW_COMMAND "$PATH_TO_PS -axo 'state user ppid args'" + EOF + + EXTRAS="$EXTRAS check_netsaint" + cat >> confdefs.h <<EOF +-#define PS_COMMAND "$PATH_TO_PS -ao 'state uid ppid command args'" ++#define PS_COMMAND "$PATH_TO_PS -axo 'state uid ppid command args'" + EOF + + cat >> confdefs.h <<EOF +@@ -3862,7 +3862,7 @@ EOF cat >> confdefs.h <<EOF @@ -157,28 +198,35 @@ EOF cat >> confdefs.h <<EOF -@@ -3243,16 +3243,16 @@ +@@ -3870,15 +3870,15 @@ + EOF + + cat >> confdefs.h <<EOF +-#define RSS_COMMAND "$PATH_TO_PS -ao 'rss command'" ++#define RSS_COMMAND "$PATH_TO_PS -axo 'rss command'" + EOF + + cat >> confdefs.h <<EOF #define RSS_FORMAT "%d %s" EOF -- echo " ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'" +- echo " ps syntax... $PATH_TO_PS -ao 'state command vsz rss'" -elif ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null + echo " ps syntax... $PATH_TO_PS -axo 'state command vsz rss'" +elif ps waxo 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null then - cat >> confdefs.h <<EOF --#define PS_RAW_COMMAND "$PATH_TO_PS waxco 'state uid ppid command'" -+#define PS_RAW_COMMAND "$PATH_TO_PS waxo 'state uid ppid command'" - EOF + cat >> confdefs.h <<\EOF + #define USE_PS_VARS 1 +@@ -3894,7 +3894,7 @@ EXTRAS="$EXTRAS check_netsaint" cat >> confdefs.h <<EOF --#define PS_COMMAND "$PATH_TO_PS waxco 'state uid ppid command'" -+#define PS_COMMAND "$PATH_TO_PS waxo 'state uid ppid command'" +-#define PS_COMMAND "$PATH_TO_PS waxco 'state uid ppid command command'" ++#define PS_COMMAND "$PATH_TO_PS waxo 'state uid ppid command command'" EOF cat >> confdefs.h <<EOF -@@ -3260,7 +3260,7 @@ +@@ -3902,7 +3902,7 @@ EOF cat >> confdefs.h <<EOF @@ -187,7 +235,7 @@ EOF cat >> confdefs.h <<EOF -@@ -3268,18 +3268,18 @@ +@@ -3910,14 +3910,14 @@ EOF cat >> confdefs.h <<EOF @@ -203,36 +251,13 @@ + echo " ps syntax... $PATH_TO_PS -axo 'state command vsz rss'" 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 then - cat >> confdefs.h <<EOF --#define PS_RAW_COMMAND "$PATH_TO_PS waxco 'state user ppid command'" -+#define PS_RAW_COMMAND "$PATH_TO_PS waxo 'state user ppid command'" - EOF - - EXTRAS="$EXTRAS check_netsaint" -@@ -3307,7 +3307,7 @@ + cat >> confdefs.h <<\EOF +@@ -3957,7 +3957,7 @@ #define RSS_FORMAT "%d %s" EOF -- echo " ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'" -+ echo " ps syntax... $PATH_TO_PS -axo 'state command vsz rss'" +- echo " ps syntax... $PATH_TO_PS -waxco 'state comm vsz rss'" ++ echo " ps syntax... $PATH_TO_PS -waxo 'state comm vsz rss'" 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 - cat >> confdefs.h <<EOF -@@ -3597,17 +3597,6 @@ - EOF - - echo " ping syntax... $PATH_TO_PING -n -h <host> -s 56 -c <count>" --elif ping -n -s 56 -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip" >/dev/null --then -- cat >> confdefs.h <<EOF --#define PING_COMMAND "$PATH_TO_PING -n -s 56 -c %d %s" --EOF -- -- cat >> confdefs.h <<EOF --#define PING_PACKETS_FIRST "$PATH_TO_PING -n -s 56 -c %d %s" --EOF -- -- echo " ping syntax... $PATH_TO_PING -n -s 56 -c <count> <host>" - elif ping -n -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip" >/dev/null - then - cat >> confdefs.h <<EOF + cat >> confdefs.h <<\EOF |