diff options
author | miwi <miwi@FreeBSD.org> | 2008-02-28 07:52:07 +0800 |
---|---|---|
committer | miwi <miwi@FreeBSD.org> | 2008-02-28 07:52:07 +0800 |
commit | 6e05393ebd6924807bd6e223149bf5ee3c277385 (patch) | |
tree | 6f9d66258bc417cc803cb2826335cad27511e75e /net-mgmt/netsaint-plugins/files | |
parent | fcfef09939f1eec678bd7a159d712c7b7459e995 (diff) | |
download | freebsd-ports-gnome-6e05393ebd6924807bd6e223149bf5ee3c277385.tar.gz freebsd-ports-gnome-6e05393ebd6924807bd6e223149bf5ee3c277385.tar.zst freebsd-ports-gnome-6e05393ebd6924807bd6e223149bf5ee3c277385.zip |
2007-10-31 www/vtiger4: This version is no longer supported by the developers
2007-12-01 www/xpi-surfkeys: Development has been ceased
2008-02-01 sysutils/eventwatcher: no active development
2007-10-27 sysutils/p5-UPS-Nut: Version branch long since retired
2007-10-31 net-mgmt/netsaint: Now developed as Nagios, see net-mgmt/nagios port
2007-10-31 net-mgmt/netsaint-plugins: Now developed as Nagios, see net-mgmt/nagios port
2008-01-22 benchmarks/tsung: "fails to install"
2007-10-03 games/ggo: developer's focus have moved elsewhere
2008-02-15 mail/claws-mail-etpan_privacy: no longer supported by developers
Diffstat (limited to 'net-mgmt/netsaint-plugins/files')
-rw-r--r-- | net-mgmt/netsaint-plugins/files/patch-ab | 297 | ||||
-rw-r--r-- | net-mgmt/netsaint-plugins/files/patch-ac | 12 | ||||
-rw-r--r-- | net-mgmt/netsaint-plugins/files/patch-check_by_ssh.c | 29 | ||||
-rw-r--r-- | net-mgmt/netsaint-plugins/files/patch-check_mrtg.c | 15 | ||||
-rw-r--r-- | net-mgmt/netsaint-plugins/files/patch-check_ntp.pl | 76 | ||||
-rw-r--r-- | net-mgmt/netsaint-plugins/files/patch-check_snmp.c | 20 | ||||
-rw-r--r-- | net-mgmt/netsaint-plugins/files/patch-check_ssh.c | 20 | ||||
-rw-r--r-- | net-mgmt/netsaint-plugins/files/patch-plugins_check__swap.c | 15 | ||||
-rw-r--r-- | net-mgmt/netsaint-plugins/files/patch-subst.in | 11 |
9 files changed, 0 insertions, 495 deletions
diff --git a/net-mgmt/netsaint-plugins/files/patch-ab b/net-mgmt/netsaint-plugins/files/patch-ab deleted file mode 100644 index f36507437390..000000000000 --- a/net-mgmt/netsaint-plugins/files/patch-ab +++ /dev/null @@ -1,297 +0,0 @@ - -$FreeBSD$ - ---- configure.in.orig -+++ configure.in -@@ -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 -@@ -657,6 +679,7 @@ - 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) - if test -f "$PATH_TO_SSH" -@@ -704,8 +727,8 @@ - AC_DEFINE_UNQUOTED(SWAP_FORMAT,["%*s %d %*d %d"]) - echo " using FreeBSD format" - fi -- EXTRAS="$EXTRAS check_swap" - fi -+EXTRAS="$EXTRAS check_swap" - - AC_PATH_PROG(PATH_TO_DIG,dig) - AC_DEFINE_UNQUOTED(PATH_TO_DIG,"$PATH_TO_DIG") diff --git a/net-mgmt/netsaint-plugins/files/patch-ac b/net-mgmt/netsaint-plugins/files/patch-ac deleted file mode 100644 index 796ee76bcc2a..000000000000 --- a/net-mgmt/netsaint-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.]+)/) { diff --git a/net-mgmt/netsaint-plugins/files/patch-check_by_ssh.c b/net-mgmt/netsaint-plugins/files/patch-check_by_ssh.c deleted file mode 100644 index 68de5fab2234..000000000000 --- a/net-mgmt/netsaint-plugins/files/patch-check_by_ssh.c +++ /dev/null @@ -1,29 +0,0 @@ ---- plugins/check_by_ssh.c.orig Mon Apr 23 09:43:11 2001 -+++ plugins/check_by_ssh.c Tue Jul 22 05:05:52 2003 -@@ -191,7 +191,7 @@ - if (commands>1) - remotecmd=strscat(remotecmd,";echo STATUS CODE: $?;"); - -- if (strlen (remotecmd) <= 1) -+ if ((remotecmd==NULL) || (strlen (remotecmd) <= 1)) - usage ("No remotecmd\n"); - - comm = ssprintf(comm,"%s %s '%s'",comm,hostname,remotecmd); -@@ -369,6 +369,8 @@ - " list of netsaint service names, separated by ':' [optional]\n" - "-n, --name=NAME\n" - " short name of host in netsaint configuration [optional]\n" -+ "-v, --verbose\n" -+ " short name of host in netsaint configuration [optional]\n" - "\n" - "The most common mode of use is to refer to a local identity file with\n" - "the '-i' option. In this mode, the identity pair should have a null\n" -@@ -388,7 +390,7 @@ - - - #define OPTIONS "\ ---H <host> [-P port] [-f] [-y] [-t timeout] [-i identity]\n -+-H <host> -C <command> [-fyv] [-P port] [-t timeout] [-i identity]\n\ - [-l user] [-n name] [-s servicelist] [-O outputfile]" - - void print_usage(void) diff --git a/net-mgmt/netsaint-plugins/files/patch-check_mrtg.c b/net-mgmt/netsaint-plugins/files/patch-check_mrtg.c deleted file mode 100644 index 7443d87e0836..000000000000 --- a/net-mgmt/netsaint-plugins/files/patch-check_mrtg.c +++ /dev/null @@ -1,15 +0,0 @@ ---- plugins/check_mrtg.c.orig Mon May 24 22:29:35 2004 -+++ plugins/check_mrtg.c Mon May 24 22:29:52 2004 -@@ -338,10 +338,10 @@ - usage("Invalid variable number\n"); - break; - case 'w': /* critical time threshold */ -- value_warning_threshold=strtoul(argv[5],NULL,10); -+ value_warning_threshold=strtoul(optarg,NULL,10); - break; - case 'c': /* warning time threshold */ -- value_critical_threshold=strtoul(argv[6],NULL,10); -+ value_critical_threshold=strtoul(optarg,NULL,10); - break; - case 'l': /* label */ - value_label=optarg; diff --git a/net-mgmt/netsaint-plugins/files/patch-check_ntp.pl b/net-mgmt/netsaint-plugins/files/patch-check_ntp.pl deleted file mode 100644 index 3a3e3959ab88..000000000000 --- a/net-mgmt/netsaint-plugins/files/patch-check_ntp.pl +++ /dev/null @@ -1,76 +0,0 @@ ---- plugins-scripts/check_ntp.pl.orig Sun Jun 23 14:28:03 2002 -+++ plugins-scripts/check_ntp.pl Sun Jun 23 14:28:27 2002 -@@ -44,6 +44,10 @@ - # o Server has correct time but isn't suitable synchronization - # source. This happens while starting up and if contact - # with master has been lost. -+# -+# (c) 2001 David Douthitt <n9ubh@callsign.net> -+# -+# Script modified to handle NTP v2 with new -n parameter - - BEGIN { - if ($0 =~ m/^(.*?)[\/\\]([^\/\\]+)$/) { -@@ -56,7 +60,7 @@ - use POSIX; - use strict; - use Getopt::Long; --use vars qw($opt_H $opt_w $opt_c $verbose $PROGNAME); -+use vars qw($opt_n $opt_H $opt_w $opt_c $verbose $PROGNAME); - use lib $main::runtimedir; - use utils qw($TIMEOUT %ERRORS &print_revision &usage &support &is_error); - -@@ -69,6 +73,7 @@ - sub version (); - - delete @ENV{'PATH', 'IFS', 'CDPATH', 'ENV', 'BASH_ENV'}; -+$ENV{'PATH'} = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin"; - - Getopt::Long::Configure('bundling', 'no_ignore_case'); - GetOptions -@@ -77,6 +82,7 @@ - "v|verbose" => \$verbose, - "w|warning=s" => \$opt_w, - "c|critical=s" => \$opt_c, -+ "n|ntpversion" => \$opt_n, - "H|hostname=s" => \$opt_H); - - ($opt_H) || ($opt_H = shift) || usage("Host name/address not specified\n"); -@@ -93,6 +99,9 @@ - ($opt_c) || ($opt_c = shift) || ($opt_c = 120); - my $critical = $1 if ($opt_c =~ /([0-9]+)/); - -+($opt_n) || ($opt_n = shift) || ($opt_n = 3); -+my $ntp_version = $1 if ($opt_n =~ /([0-9])/); -+ - my $answer = undef; - my $offset = undef; - my $msg; # first line of output to print if format is invalid -@@ -117,7 +126,7 @@ - ### - ### - --if (!open (NTPDATE, "/usr/local/sbin/ntpdate -q $host 2>&1 |")) { -+if (!open (NTPDATE, "ntpdate -o$ntp_version -q $host 2>&1 |")) { - print "Could not open ntpdate\n"; - exit $ERRORS{"UNKNOWN"}; - } -@@ -154,8 +163,7 @@ - ### - ### - --if (open(NTPDC,"/usr/sbin/xntpdc -c peers $host 2>&1 |") || -- open(NTPDC,"/usr/sbin/ntpdc -c peers $host 2>&1 |")) { -+if (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.]+)/) { -@@ -224,7 +232,7 @@ - exit $state; - - sub print_usage () { -- print "Usage: $PROGNAME -H <host> [-w <warn>] [-c <crit>]\n"; -+ print "Usage: $PROGNAME -H <host> [ -n <ntp_version> ] [-w <warn>] [-c <crit>]\n"; - } - - sub print_help () { diff --git a/net-mgmt/netsaint-plugins/files/patch-check_snmp.c b/net-mgmt/netsaint-plugins/files/patch-check_snmp.c deleted file mode 100644 index 9f7a6dbd5e75..000000000000 --- a/net-mgmt/netsaint-plugins/files/patch-check_snmp.c +++ /dev/null @@ -1,20 +0,0 @@ ---- plugins/check_snmp.c.orig Fri Jun 21 14:34:23 2002 -+++ plugins/check_snmp.c Fri Jun 21 14:33:45 2002 -@@ -146,13 +146,13 @@ - /* create the command line to execute */ - if (getnext==TRUE) { - command_line = ssprintf (command_line, -- "%s -m ALL -v 1 %s %s %s", -- PATH_TO_SNMPGETNEXT, server_address, community, oid); -+ "%s -m ALL -v 1 -c %s %s %s", -+ PATH_TO_SNMPGETNEXT, community, server_address, oid); - } - else { - command_line = ssprintf (command_line, -- "%s -m ALL -v 1 %s %s %s", -- PATH_TO_SNMPGET, server_address, community, oid); -+ "%s -m ALL -v 1 -c %s %s %s", -+ PATH_TO_SNMPGET, community, server_address, oid); - } - - /* run the command */ diff --git a/net-mgmt/netsaint-plugins/files/patch-check_ssh.c b/net-mgmt/netsaint-plugins/files/patch-check_ssh.c deleted file mode 100644 index d80b91a2abb9..000000000000 --- a/net-mgmt/netsaint-plugins/files/patch-check_ssh.c +++ /dev/null @@ -1,20 +0,0 @@ ---- plugins/check_ssh.c.orig Fri Jun 21 12:17:43 2002 -+++ plugins/check_ssh.c Fri Jun 21 12:23:16 2002 -@@ -246,7 +246,7 @@ - printf("%s\n", output); - ssh_proto = output + 4; - ssh_server = ssh_proto + strspn(ssh_proto, "0123456789-. "); -- ssh_proto[strspn(ssh_proto, "0123456789-. ")] = 0; -+ ssh_proto[strspn(ssh_proto, "0123456789. ")] = 0; - printf - ("SSH ok - protocol version %s - server version %s\n", - ssh_proto, ssh_server); -@@ -272,7 +272,7 @@ - { - printf - ("Usage:\n" -- " %s -t [timeout] -p [port] <host>\n" -+ " %s [-t <timeout>] [-p <port>] <host>\n" - " %s -V prints version info\n" - " %s -h prints more detailed help\n", PROGNAME, PROGNAME, PROGNAME); - } diff --git a/net-mgmt/netsaint-plugins/files/patch-plugins_check__swap.c b/net-mgmt/netsaint-plugins/files/patch-plugins_check__swap.c deleted file mode 100644 index ca3d21b3544f..000000000000 --- a/net-mgmt/netsaint-plugins/files/patch-plugins_check__swap.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- plugins/check_swap.c.orig -+++ plugins/check_swap.c -@@ -15,6 +15,9 @@ - #include "utils.h" - - #define PROGNAME "check_swap" -+#define HAVE_SWAP 1 -+#define SWAP_COMMAND "/usr/sbin/swapinfo -k" -+#define SWAP_FORMAT "%*s %d %*d %d" - - int process_arguments(int argc, char **argv); - int call_getopt(int argc, char **argv); diff --git a/net-mgmt/netsaint-plugins/files/patch-subst.in b/net-mgmt/netsaint-plugins/files/patch-subst.in deleted file mode 100644 index 3caf2cb87757..000000000000 --- a/net-mgmt/netsaint-plugins/files/patch-subst.in +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins-scripts/subst.in.orig Fri Sep 1 05:47:35 2000 -+++ plugins-scripts/subst.in Sun Jun 23 14:24:00 2002 -@@ -33,7 +33,7 @@ - # Trusted path mechanism (deprecated) - - /^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ { -- sub(/\=[ \t]*['"][^"']+["']/,"='@trusted_path@' # autoconf-derived"); -+ sub(/\=[ \t]*['"][^"']+["'];/,"='@trusted_path@'; # autoconf-derived"); - } - - /^[\t ]*(export[\t ]*)?PATH[\t ]*=['"]+.+["']$/ { |