ports/136764: [PATCH] net-mgmt/nagios-plugins: Dont truncate proc args
Steven Kreuzer
skreuzer at FreeBSD.org
Tue Jul 14 18:10:03 UTC 2009
>Number: 136764
>Category: ports
>Synopsis: [PATCH] net-mgmt/nagios-plugins: Dont truncate proc args
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 14 18:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Steven Kreuzer
>Release: FreeBSD 7.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD slurry.exit2shell.com 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #3: Mon Nov 24 14:01:09 EST 2008
>Description:
The attached patch will have the check_procs command use ps -axwwo instead of
ps -axwo. This stops the arguments from getting cut off at 132 characters
Port maintainer (jarrod at netleader.com.au) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- nagios-plugins-1.4.13_1,1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /usr/share/cvs/freebsd/ports/net-mgmt/nagios-plugins/Makefile,v
retrieving revision 1.73
diff -u -u -r1.73 Makefile
--- Makefile 8 Apr 2009 23:53:22 -0000 1.73
+++ Makefile 14 Jul 2009 13:41:02 -0000
@@ -7,6 +7,7 @@
PORTNAME= nagios-plugins
PORTVERSION= 1.4.13
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= SFE/nagiosplug
Index: files/patch-configure.in
===================================================================
RCS file: /usr/share/cvs/freebsd/ports/net-mgmt/nagios-plugins/files/patch-configure.in,v
retrieving revision 1.21
diff -u -u -r1.21 patch-configure.in
--- files/patch-configure.in 11 Aug 2008 22:19:13 -0000 1.21
+++ files/patch-configure.in 14 Jul 2009 13:40:45 -0000
@@ -1,5 +1,5 @@
---- configure.in.orig 2008-05-28 07:31:05.000000000 +0930
-+++ configure.in 2008-08-10 17:08:44.000000000 +0930
+--- configure.in.orig 2008-09-25 04:15:58.000000000 -0400
++++ configure.in 2009-07-14 09:32:10.000000000 -0400
@@ -12,8 +12,6 @@
RELEASE=1
AC_SUBST(RELEASE)
@@ -18,7 +18,7 @@
AM_PROG_CC_C_O
-@@ -180,11 +178,12 @@
+@@ -192,11 +190,12 @@
ACX_HELP_STRING([--with-pgsql=DIR],
[sets path to pgsql installation]),
PGSQL=$withval,)
@@ -33,7 +33,7 @@
fi
AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
-@@ -221,37 +220,42 @@
+@@ -233,37 +232,42 @@
AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
AC_MSG_WARN([install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS).])
fi
@@ -89,7 +89,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)
-@@ -260,6 +264,7 @@
+@@ -272,6 +276,7 @@
AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
fi
LIBS="$_SAVEDLIBS"
@@ -97,7 +97,7 @@
dnl Check for headers used by check_ide_smart
AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
-@@ -578,22 +583,10 @@
+@@ -590,244 +595,28 @@
dnl ac_cv_ps_cols=8
dnl AC_MSG_RESULT([$ac_cv_ps_command])
@@ -115,27 +115,33 @@
-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
+-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
+dnl FreeBSD 5.x and above
+dnl STAT COMMAND VSZ RSS USER UID PID PPID COMMAND
- 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
++elif ps -axwwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
+ egrep -i ["^ *STAT +COMMAND +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'"
-@@ -601,9 +594,8 @@
+- ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
++ ac_cv_ps_command="$PATH_TO_PS -axwwo '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 pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
+dnl FreeBSD 4.x
+dnl STAT UID PID PPID VSZ RSS %CPU UCOMM COMMAND
- elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
++elif ps -axwwo '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
-@@ -613,209 +605,6 @@
+ 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_command="$PATH_TO_PS -axwwo '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])
@@ -345,7 +351,7 @@
else
AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
fi
-@@ -1193,6 +982,8 @@
+@@ -1205,6 +994,8 @@
AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
[path and arguments for invoking 'who'])
@@ -354,7 +360,7 @@
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
AC_ARG_WITH(snmpget_command,
ACX_HELP_STRING([--with-snmpget-command=PATH],
-@@ -1223,7 +1014,10 @@
+@@ -1235,7 +1026,10 @@
else
AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
fi
@@ -365,7 +371,7 @@
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
AC_ARG_WITH(qstat_command,
-@@ -1248,7 +1042,10 @@
+@@ -1260,7 +1054,10 @@
AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
[path to qstat/quakestat])
fi
@@ -376,7 +382,7 @@
AC_PATH_PROG(PATH_TO_FPING,fping)
AC_ARG_WITH(fping_command,
ACX_HELP_STRING([--with-fping-command=PATH],
-@@ -1260,6 +1057,7 @@
+@@ -1272,6 +1069,7 @@
else
AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
fi
@@ -384,7 +390,7 @@
AC_PATH_PROG(PATH_TO_SSH,ssh)
AC_ARG_WITH(ssh_command,
-@@ -1327,32 +1125,12 @@
+@@ -1339,32 +1137,12 @@
dnl end if for PATH_TO_SWAP
fi
--- nagios-plugins-1.4.13_1,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list