This commit was manufactured by cvs2svn to create tag 'RELEASE_4_4_0'.release/4.4.0

2 files changed, 0 insertions, 296 deletions

diff --git a/net/nagios-plugins/files/patch-ab b/net/nagios-plugins/files/patch-ab
deleted file mode 100644
index 126c8b052a54..000000000000
--- a/net/nagios-plugins/files/patch-ab
+++ /dev/null
@@ -1,284 +0,0 @@
---- configure.in.orig	Thu Apr 26 16:00:26 2001
-+++ configure.in	Tue May  1 18:28:01 2001
-@@ -7,7 +7,7 @@
- dnl AM_INIT_AUTOMAKE(netsaint-plugins,$VERSION)
- AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
- 
--AC_PREFIX_DEFAULT(/usr/local/netsaint)
-+dnl AC_PREFIX_DEFAULT(/usr/local/netsaint)
- 
- dnl Figure out how to invoke "install" and what install options to use.
- 
-@@ -99,8 +99,8 @@
-     AC_CHECK_HEADERS(postgresql/libpq-fe.h)
-     AC_CHECK_HEADERS(libpq-fe.h)
-     if test  "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then
--      PGLIBS="-lpq -lcrypt"
--      PGINCLUDE="-I/usr/include/pgsql"
-+      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
-+      PGINCLUDE="-I$PGSQL/include/pgsql"
-     elif test  "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then
-       PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
-       PGINCLUDE="-I/usr/include/postgresql"
-@@ -128,25 +128,37 @@
- LIBS="$_SAVEDLIBS"
- CPPFLAGS="$_SAVEDCPPFLAGS"
- 
-+AC_ARG_ENABLE(radius,--enable-radius compile check_radius)
-+if test $enableval; then
-+dnl Check for radiusclient header file
-+_SAVEDCPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="-I${LOCALBASE}/include"
-+AC_CHECK_HEADERS(radiusclient.h,RADIUSINCLUDE="-I${LOCALBASE}/include")
-+AC_SUBST(RADIUSINCLUDE)
-+CPPFLAGS="$_SAVEDCPPFLAGS $RADIUSINCLUDE"
-+
- dnl Check for radius libraries
- _SAVEDLIBS="$LIBS"
--AC_CHECK_LIB(radiusclient,rc_read_config)
-+AC_CHECK_LIB(radiusclient,rc_read_config,,,-L${LOCALBASE}/lib)
- if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
-   EXTRAS="$EXTRAS check_radius"
--	RADIUSLIBS="-lradiusclient"
-+	RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient"
-   AC_SUBST(RADIUSLIBS)
- else
-   AC_MSG_WARN([Skipping radius plugin])
-   AC_MSG_WARN([install radius libs to compile this plugin (see Requirements).])
- fi
- LIBS="$_SAVEDLIBS"
-+fi
- 
-+AC_ARG_ENABLE(ldap,--enable-ldap compile check_ldap)
-+if test $enableval; then
- dnl Check for LDAP libraries
- _SAVEDLIBS="$LIBS"
--AC_CHECK_LIB(ldap,main,,,-llber)
--if test "$ac_cv_lib_ldap_main" = "yes"; then
--  LDAPLIBS="-lldap -llber"\
--  LDAPINCLUDE="-I/usr/include/ldap"
-+AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber)
-+if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then
-+  LDAPLIBS="-L${LOCALBASE}/lib -lldap -llber"\
-+  LDAPINCLUDE="-I${LOCALBASE}/include"
-   AC_SUBST(LDAPLIBS)
-   AC_SUBST(LDAPINCLUDE)
-   EXTRAS="$EXTRAS check_ldap"
-@@ -155,13 +167,14 @@
-   AC_MSG_WARN([install LDAP libs to compile this plugin (see Requirements).])
- fi
- LIBS="$_SAVEDLIBS"
-+fi
- 
- dnl Check for mysql libraries
- _SAVEDLIBS="$LIBS"
- _SAVEDCPPFLAGS="$CPPFLAGS"
--CPPFLAGS="-I/usr/include"
-+CPPFLAGS="-I${LOCALBASE}/include"
- AC_ARG_WITH(mysqllibdir,--with-mysqllibdir=<dir> sets path to mysql libraries,[MYSQLLIBDIR=$withval])
--if test -n "$MYSQLLIBS"; then
-+if test -n "$MYSQLLIBDIR"; then
-   AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR",,-L$MYSQLLIBDIR -lz)
- elif test -f /usr/lib/libmysqlclient.so; then
-   AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz)
-@@ -177,7 +190,8 @@
-   AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql)
- fi
- if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_mysql_close" = "yes"; then
--  AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h)
-+  AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h,MYSQLINCLUDE="-I${LOCALBASE}/include")
-+  AC_SUBST(MYSQLINCLUDE)
-   if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then
-     EXTRAS="$EXTRAS check_mysql"
-     AC_SUBST(MYSQLLIBS)
-@@ -191,7 +205,7 @@
-   AC_MSG_WARN([install mysql client libs to compile this plugin (see Requirements).])
- fi
- LIBS="$_SAVEDLIBS"
--CPPFLAGS="$_SAVEDCPPFLAGS"
-+CPPFLAGS="$_SAVEDCPPFLAGS $MYSQLINCLUDE"
- 
- dnl Check for OpenSSL location
- AC_PATH_PROG(OPENSSL,openssl)
-@@ -270,16 +284,16 @@
- dnl AC_SUBST(libgetopt_a_DEPENDENCIES)
- dnl AC_SUBST(libsnprintf_a_SOURCES)
- 
--AC_MSG_CHECKING(for getopt_long)
--AC_TRY_COMPILE([#include <getopt.h>
--#include <stdlib.h>],
--[int option_index=0;
--static struct option *long_options;
--getopt_long(0,NULL,"+h",long_options,&option_index);],
--[AC_DEFINE(HAVE_GETOPT_H) AC_DEFINE(HAVE_GETOPT_LONG) AC_MSG_RESULT(yes)],
--[AC_DEFINE(HAVE_GETOPT_H) AC_DEFINE(HAVE_GETOPT_LONG) AC_MSG_RESULT(no) import_sources=getopt])
-+dnl AC_MSG_CHECKING(for getopt_long)
-+dnl AC_TRY_COMPILE([#include <getopt.h>
-+dnl #include <stdlib.h>],
-+dnl [int option_index=0;
-+dnl static struct option *long_options;
-+dnl getopt_long(0,NULL,"+h",long_options,&option_index);],
-+dnl [AC_DEFINE(HAVE_GETOPT_H) AC_DEFINE(HAVE_GETOPT_LONG) AC_MSG_RESULT(yes)],
-+dnl [AC_DEFINE(HAVE_GETOPT_H) AC_DEFINE(HAVE_GETOPT_LONG) AC_MSG_RESULT(no) import_sources=getopt])
- 
--AC_CHECK_FUNCS(getopt_long_only,,LIBS="$LIBS -lgetopt" DEPLIBS="$DEPLIBS libgetopt.a")
-+dnl AC_CHECK_FUNCS(getopt_long_only,,LIBS="$LIBS -lgetopt" DEPLIBS="$DEPLIBS libgetopt.a")
- 
- AC_CHECK_FUNC(vsnprintf,,LIBS="$LIBS -lsnprintf" DEPLIBS="$DEPLIBS libsnprintf.a")
- 
-@@ -330,72 +344,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(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 %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")
--	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'")
-+	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 's comm vsz rss'"
--elif [ps -Ao '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]
-+	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(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 %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")
--	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'")
-+	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 'status comm vsz rss'"
--elif [ps -Ao '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]
-+	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(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 %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")
--	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'")
-+	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 -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(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 -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 -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(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 command'")
-+	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxo 'state uid ppid 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")
--	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxco 'rss command'")
-+	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxo '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 -axo 'state command vsz rss'"
- 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
-@@ -409,7 +423,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
-@@ -620,6 +634,8 @@
- 	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO")
- fi
- 
-+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
-+if test $enableval; then
- AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
- if test -f "$PATH_TO_SNMPGET"
- then
-@@ -628,6 +644,7 @@
- else
- 	echo "** Get snmpget from http://ucd-snmp.ucdavis.edu to make check_hpjd and check_snmp plugins"
- fi
-+fi
- 
- AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext)
- if test -f "$PATH_TO_SNMPGETNEXT"
-@@ -635,6 +652,8 @@
- 	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT")
- fi
- 
-+AC_ARG_ENABLE(qstat,--enable-qstat compile check_game)
-+if test $enableval; then
- AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
- AC_PATH_PROG(PATH_TO_QSTAT,qstat)
- if test -n "$PATH_TO_QUAKESTAT"
-@@ -648,7 +667,10 @@
- else
- 	echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin"
- fi
-+fi
- 
-+AC_ARG_ENABLE(fping,--enable-fping compile check_fping)
-+if test $enableval; then
- AC_PATH_PROG(PATH_TO_FPING,fping)
- if test -n "$PATH_TO_FPING"
- then
-@@ -656,6 +678,7 @@
- 	EXTRAS="$EXTRAS check_fping"
- else
- 	echo "** Get fping from http://www.stanford.edu/~schemers/docs/fping/fping.html in order to make check_fping plugin"
-+fi
- fi
- 
- AC_PATH_PROG(PATH_TO_SSH,ssh)
diff --git a/net/nagios-plugins/files/patch-ac b/net/nagios-plugins/files/patch-ac
deleted file mode 100644
index 796ee76bcc2a..000000000000
--- a/net/nagios-plugins/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- plugins-scripts/check_ntp.pl.orig	Mon Apr 23 19:43:00 2001
-+++ plugins-scripts/check_ntp.pl	Sun Apr 29 18:38:26 2001
-@@ -154,7 +154,8 @@
- ###
- ###
- 
--if (open(NTPDC,"/usr/sbin/xntpdc -c peers $host 2>&1 |") ) {
-+if (open(NTPDC,"/usr/sbin/xntpdc -c peers $host 2>&1 |") ||
-+    open(NTPDC,"/usr/sbin/ntpdc -c peers $host 2>&1 |")) {
- 	while (<NTPDC>) {
- 		print if ($verbose);
- 		if (/([^\s]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {