Date: Thu, 1 Mar 2001 22:45:51 +0000 (GMT) From: George Reid <greid@dogma.freebsd-uk.eu.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/25484: [PATCH] Update net/netsaint-plugins to 1.2.9.1 Message-ID: <Pine.BSF.4.21.0103012244510.36625-100000@sobek.openirc.co.uk>
next in thread | raw e-mail | index | archive | help
>Number: 25484 >Category: ports >Synopsis: [PATCH] Update net/netsaint-plugins to 1.2.9.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 01 14:40:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: George Reid >Release: FreeBSD 5.0-CURRENT i386 >Organization: FreeBSD UKUG >Environment: n/a >Description: Update port net/netsaint-plugins to version 1.2.9.1. >How-To-Repeat: n/a >Fix: Index: Makefile =================================================================== RCS file: /usr/home/ncvs/ports/net/netsaint-plugins/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 2001/01/12 23:10:58 1.3 +++ Makefile 2001/03/01 22:11:42 @@ -6,10 +6,10 @@ # PORTNAME= netsaint-plugins -PORTVERSION= 1.2.8.4 +PORTVERSION= 1.2.9.1 CATEGORIES= net MASTER_SITES= http://download.sourceforge.net/netsaintplug/ -DISTNAME= ${PORTNAME}-1.2.8-4 +DISTNAME= ${PORTNAME}-1.2.9-1 MAINTAINER= ports@FreeBSD.org Index: distinfo =================================================================== RCS file: /usr/home/ncvs/ports/net/netsaint-plugins/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 2000/07/12 18:57:26 1.1 +++ distinfo 2001/03/01 22:11:46 @@ -1 +1 @@ -MD5 (netsaint-plugins-1.2.8-4.tar.gz) = a08534e928e9355a098ad73a37d1c685 +MD5 (netsaint-plugins-1.2.9-1.tar.gz) = 656eaa2509522d303717cd561a3cf031 Index: pkg-plist =================================================================== RCS file: /usr/home/ncvs/ports/net/netsaint-plugins/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 2000/07/12 18:57:26 1.1 +++ pkg-plist 2001/03/01 22:43:55 @@ -1,42 +1,44 @@ +libexec/netsaint/check_breeze +libexec/netsaint/check_by_ssh +libexec/netsaint/check_dig libexec/netsaint/check_disk +libexec/netsaint/check_disk_smb libexec/netsaint/check_dns libexec/netsaint/check_dummy +libexec/netsaint/check_flexlm +libexec/netsaint/check_fping libexec/netsaint/check_ftp +libexec/netsaint/check_game libexec/netsaint/check_http libexec/netsaint/check_imap +libexec/netsaint/check_ircd libexec/netsaint/check_load +libexec/netsaint/check_log libexec/netsaint/check_mrtg libexec/netsaint/check_mrtgtraf libexec/netsaint/check_netsaint libexec/netsaint/check_nntp +libexec/netsaint/check_ntp libexec/netsaint/check_nwstat +libexec/netsaint/check_oracle libexec/netsaint/check_overcr libexec/netsaint/check_ping libexec/netsaint/check_pop libexec/netsaint/check_procs libexec/netsaint/check_real -libexec/netsaint/check_reply +libexec/netsaint/check_rpc +libexec/netsaint/check_sensors libexec/netsaint/check_smtp libexec/netsaint/check_ssh +libexec/netsaint/check_swap libexec/netsaint/check_tcp libexec/netsaint/check_time libexec/netsaint/check_udp libexec/netsaint/check_ups libexec/netsaint/check_users libexec/netsaint/check_vsz -libexec/netsaint/check_by_ssh -libexec/netsaint/urlize -libexec/netsaint/check_game -libexec/netsaint/check_fping -libexec/netsaint/check_swap -libexec/netsaint/check_breeze -libexec/netsaint/check_disk_smb -libexec/netsaint/check_flexlm -libexec/netsaint/check_ircd -libexec/netsaint/check_log -libexec/netsaint/check_ntp -libexec/netsaint/check_oracle -libexec/netsaint/check_rpc -libexec/netsaint/check_sensors libexec/netsaint/check_wave +libexec/netsaint/urlize +libexec/netsaint/utils.pm +libexec/netsaint/utils.sh @dirrm libexec/netsaint Index: files/patch-aa =================================================================== RCS file: /usr/home/ncvs/ports/net/netsaint-plugins/files/patch-aa,v retrieving revision 1.1 diff -u -r1.1 patch-aa --- files/patch-aa 2000/07/12 18:57:26 1.1 +++ files/patch-aa 2001/03/01 22:35:03 @@ -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 @@ -156,29 +197,36 @@ +#define VSZ_COMMAND "$PATH_TO_PS -axo 'vsz command'" EOF + cat >> confdefs.h <<EOF +@@ -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 -@@ -3243,16 +3243,16 @@ #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 Index: files/patch-ab =================================================================== RCS file: /usr/home/ncvs/ports/net/netsaint-plugins/files/patch-ab,v retrieving revision 1.1 diff -u -r1.1 patch-ab --- files/patch-ab 2000/07/12 18:57:26 1.1 +++ files/patch-ab 2001/03/01 22:25:57 @@ -1,18 +1,20 @@ ---- configure.in Wed Jul 12 12:18:15 2000 -+++ configure.in.new Wed Jul 12 12:22:11 2000 -@@ -223,39 +223,39 @@ +--- configure.in.orig Thu Mar 1 22:22:50 2001 ++++ configure.in Thu Mar 1 22:25:49 2001 +@@ -285,72 +285,72 @@ AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -eo 'rss comm'") AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s") 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 -- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 's user ppid args'") -+ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 's user ppid args'") + AC_DEFINE(USE_PS_VARS) + AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos]) +- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 's user ppid args'") ++ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 's user ppid args'") EXTRAS="$EXTRAS check_netsaint" - AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 's uid ppid comm args'") + AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 's uid ppid comm args'") - AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s") + AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n") - AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'") + AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'") AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s") @@ -24,12 +26,14 @@ + 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 -- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 'status user ppid args'") -+ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'status user ppid args'") + AC_DEFINE(USE_PS_VARS) + AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos]) +- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 'status user ppid args'") ++ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'status user ppid args'") EXTRAS="$EXTRAS check_netsaint" - AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 'status uid ppid comm args'") + AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 'status uid ppid comm args'") - AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s") + AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n") - AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'") + AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'") AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s") @@ -41,12 +45,14 @@ + 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 -- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 'state user ppid args'") -+ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'state user ppid args'") + AC_DEFINE(USE_PS_VARS) + AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos]) +- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 'state user ppid args'") ++ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'state user ppid args'") EXTRAS="$EXTRAS check_netsaint" - AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 'state uid ppid comm args'") + AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 'state uid ppid comm args'") - AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s") + AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n") - AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'") + AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'") AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s") @@ -54,26 +60,37 @@ + AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'") AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s") - 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 - AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -ao 'state user ppid args'") -@@ -266,23 +266,23 @@ + AC_DEFINE(USE_PS_VARS) + AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos]) +- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -ao 'state user ppid args'") ++ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'state user ppid args'") + EXTRAS="$EXTRAS check_netsaint" +- AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -ao 'state uid ppid command args'") ++ AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 'state uid ppid command args'") + AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n") +- AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -ao 'vsz command'") ++ AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz command'") AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s") - AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -ao 'rss command'") +- AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -ao 'rss command'") ++ AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss command'") AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s") -- echo " ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'" +- echo " ps syntax... $PATH_TO_PS -ao 'state command vsz rss'" + echo " ps syntax... $PATH_TO_PS -axo 'state command vsz rss'" 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 waxo 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PPID" >/dev/null] then -- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command'") -+ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'") + AC_DEFINE(USE_PS_VARS) + AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos]) + AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'") EXTRAS="$EXTRAS check_netsaint" -- AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command'") -+ AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'") - AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s") +- AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command command'") ++ AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command command'") + AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n") - AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'") + AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxo 'vsz command'") AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s") @@ -85,20 +102,12 @@ 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] then -- AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxco 'state user ppid command'") -+ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state user ppid command'") - EXTRAS="$EXTRAS check_netsaint" - AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxno 'state uid ppid comm args'") - AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s") -@@ -386,11 +386,6 @@ - then - AC_DEFINE_UNQUOTED(PING_COMMAND,"$PATH_TO_PING -n -h %s -s 56 -c %d") - 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 -- AC_DEFINE_UNQUOTED(PING_COMMAND,"$PATH_TO_PING -n -s 56 -c %d %s") -- AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$PATH_TO_PING -n -s 56 -c %d %s") -- 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] +@@ -364,7 +364,7 @@ + AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s") + AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxno 'rss comm'") + AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s") +- echo " ps syntax... $PATH_TO_PS -waxco 'state comm vsz rss'" ++ echo " ps syntax... $PATH_TO_PS -waxo 'state comm vsz rss'" + 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_DEFINE_UNQUOTED(PING_COMMAND,"$PATH_TO_PING -n -c %d %s") >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0103012244510.36625-100000>