SOURCES: nagios-plugins-configure.patch, nagios-plugins-contrib-AP...
glen
glen at pld-linux.org
Thu Oct 6 16:21:29 CEST 2005
Author: glen Date: Thu Oct 6 14:21:29 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to 1.4.2
---- Files affected:
SOURCES:
nagios-plugins-configure.patch (1.4 -> 1.5) , nagios-plugins-contrib-API.patch (1.2 -> 1.3) , nagios-plugins-check_mysql-4.1.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: SOURCES/nagios-plugins-configure.patch
diff -u SOURCES/nagios-plugins-configure.patch:1.4 SOURCES/nagios-plugins-configure.patch:1.5
--- SOURCES/nagios-plugins-configure.patch:1.4 Thu Apr 28 01:00:21 2005
+++ SOURCES/nagios-plugins-configure.patch Thu Oct 6 16:21:24 2005
@@ -24,33 +24,6 @@
dnl #### Process table test
---- ./configure.in~ 2005-03-23 21:34:43.000000000 +0200
-+++ ./configure.in 2005-03-23 21:35:08.000000000 +0200
-@@ -583,10 +583,23 @@
- AC_PATH_PROG(PATH_TO_PS,ps)
-
- AC_MSG_CHECKING(for ps syntax)
-+
-+AC_ARG_WITH(ps_command,--with-ps-command=<syntax> Verbatim command to execute for ps in check_procs,PS_COMMAND=$withval)
-+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)
-+
-+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_cols="$PS_COLS"
-+ AC_MSG_RESULT([(command-line) $ac_cv_ps_command])
-+
- 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 | \
-+elif ps -axwo 'stat comm vsz rss user uid ppid args' 2>/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]"
--- ./configure.in~ 2005-02-08 16:25:52.000000000 +0200
+++ ./configure.in 2005-03-23 21:50:10.000000000 +0200
@@ -1426,20 +1424,26 @@
@@ -246,3 +219,40 @@
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 @@
+ AC_PATH_PROG(PATH_TO_PS,ps)
+
+ AC_MSG_CHECKING(for ps syntax)
++AC_ARG_WITH(ps_command,--with-ps-command=<syntax> Verbatim command to execute for ps in check_procs,PS_COMMAND=$withval)
++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)
++
++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_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]"
+--- ./configure.in~ 2005-10-06 17:00:57.000000000 +0300
++++ ./configure.in 2005-10-06 17:04:35.000000000 +0300
+@@ -1226,7 +1226,8 @@
+ fi
+
+ AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext)
+-if test -x "$PATH_TO_SNMPGETNEXT"
++AC_ARG_WITH(snmpgetnext_command,--with-snmpgetnext-command=<path> Path to snmpgetnext command,PATH_TO_SNMPGETNEXT=$withval)
++if test -n "$PATH_TO_SNMPGETNEXT"
+ then
+ AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary])
+ fi
================================================================
Index: SOURCES/nagios-plugins-contrib-API.patch
diff -u SOURCES/nagios-plugins-contrib-API.patch:1.2 SOURCES/nagios-plugins-contrib-API.patch:1.3
--- SOURCES/nagios-plugins-contrib-API.patch:1.2 Thu Apr 28 01:01:08 2005
+++ SOURCES/nagios-plugins-contrib-API.patch Thu Oct 6 16:21:24 2005
@@ -1,15 +1,3 @@
-diff -u nagios-plugins-1.4/contrib/check_mysql.c nagios-plugins-1.4-worked/contrib/check_mysql.c
---- nagios-plugins-1.4/contrib/check_mysql.c 2002-03-01 04:42:56.000000000 +0200
-+++ nagios-plugins-1.4-worked/contrib/check_mysql.c 2005-02-08 19:09:33.000000000 +0200
-@@ -56,7 +56,7 @@
- (user = argv[2]) || (user = NULL);
- (passwd = argv[3]) || (passwd = NULL);
-
-- if (!(mysql_connect(&mysql,host,user,passwd))) {
-+ if (!mysql_real_connect(&mysql,host,user,passwd,NULL,MYSQL_PORT,NULL,0)) {
- printf("Can't connect to Mysql on Host: %s\n", host);
- return STATE_CRITICAL;
- }
diff -u nagios-plugins-1.4/contrib/check_rbl.c nagios-plugins-1.4-worked/contrib/check_rbl.c
--- nagios-plugins-1.4/contrib/check_rbl.c 2004-12-02 02:30:32.000000000 +0200
+++ nagios-plugins-1.4-worked/contrib/check_rbl.c 2005-02-08 19:24:45.000000000 +0200
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/nagios-plugins-configure.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SOURCES/nagios-plugins-contrib-API.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list