mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-02 11:09:29 +00:00
Add nagios-plugins after repocopy from netsaint-plugins.
Submitted by: Blaz Zupan <blaz@si.FreeBSD.org> Repocopied by: joe
This commit is contained in:
Jun Kuriyama
parent
10aaec7c3b
commit
4bd953d9e9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=63351
@ -1,32 +1,33 @@
|
||||
# New ports collection makefile for: netsaint-plugins
|
||||
# Date created: Wed 12 Jul 2000
|
||||
# Whom: will
|
||||
# New ports collection makefile for: nagios-plugins
|
||||
# Date created: 14 Jul 2002
|
||||
# Whom: Blaz Zupan <blaz@si.FreeBSD.org>
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= netsaint-plugins
|
||||
PORTVERSION= 1.2.9.4
|
||||
PORTREVISION= 1
|
||||
PORTNAME= nagios-plugins
|
||||
PORTVERSION= 1.3.b1
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= netsaintplug
|
||||
DISTNAME= ${PORTNAME}-1.2.9-4
|
||||
MASTER_SITE_SUBDIR= nagiosplug
|
||||
DISTNAME= nagiosplug-1.3-beta1
|
||||
|
||||
MAINTAINER= blaz@si.FreeBSD.org
|
||||
|
||||
USE_SUBMAKE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --sbindir=${PREFIX}/share/netsaint/sbin \
|
||||
--libexecdir=${PREFIX}/libexec/netsaint \
|
||||
--datadir=${PREFIX}/share/netsaint \
|
||||
--sysconfdir=${PREFIX}/etc/netsaint \
|
||||
--localstatedir=${PREFIX}/var/netsaint
|
||||
CONFIGURE_ARGS= --sbindir=${PREFIX}/share/nagios/sbin \
|
||||
--libexecdir=${PREFIX}/libexec/nagios \
|
||||
--datadir=${PREFIX}/share/nagios \
|
||||
--sysconfdir=${PREFIX}/etc/nagios \
|
||||
--localstatedir=${PREFIX}/var/nagios
|
||||
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
|
||||
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
||||
MKDIR="${MKDIR}"
|
||||
USE_AUTOMAKE= yes
|
||||
USE_GMAKE= yes
|
||||
USE_PERL5= yes
|
||||
|
||||
pre-fetch:
|
||||
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (netsaint-plugins-1.2.9-4.tar.gz) = ef4adb2b9e77abebd3797e5ebe093014
|
||||
MD5 (nagiosplug-1.3-beta1.tar.gz) = be984a7feebe0f6f3ecf13255f18014d
|
||||
|
||||
@ -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)
|
||||
@ -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.]+)/) {
|
||||
23
net-mgmt/nagios-plugins/files/patch-check_breeze.pl
Normal file
23
net-mgmt/nagios-plugins/files/patch-check_breeze.pl
Normal file
@ -0,0 +1,23 @@
|
||||
--- plugins-scripts/check_breeze.pl.orig Tue May 7 07:35:49 2002
|
||||
+++ plugins-scripts/check_breeze.pl Fri Jul 19 20:46:00 2002
|
||||
@@ -1,9 +1,9 @@
|
||||
-#! /usr/bin/perl -wT
|
||||
+#! /usr/bin/perl -w
|
||||
|
||||
|
||||
use strict;
|
||||
use Getopt::Long;
|
||||
-use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $PROGNAME);
|
||||
+use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $opt_C $PROGNAME);
|
||||
use lib utils.pm ;
|
||||
use utils qw(%ERRORS &print_revision &support &usage);
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
($opt_C) || ($opt_C = "public") ;
|
||||
|
||||
my $sig=0;
|
||||
-$sig = `/usr/bin/snmpget $host $opt_C .1.3.6.1.4.1.710.3.2.3.1.3.0`;
|
||||
+$sig = `/usr/bin/snmpget -c $opt_C $host .1.3.6.1.4.1.710.3.2.3.1.3.0`;
|
||||
my @test=split(/ /,$sig);
|
||||
$sig=$test[2];
|
||||
$sig=int($sig);
|
||||
@ -1,29 +1,20 @@
|
||||
--- plugins/check_by_ssh.c.orig Fri Jun 21 11:19:56 2002
|
||||
+++ plugins/check_by_ssh.c Fri Jun 21 11:54:25 2002
|
||||
@@ -191,7 +191,7 @@
|
||||
if (commands>1)
|
||||
remotecmd=strscat(remotecmd,";echo STATUS CODE: $?;");
|
||||
|
||||
- if (strlen (remotecmd) <= 1)
|
||||
+ if (remotecmd==NULL)
|
||||
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"
|
||||
--- plugins/check_by_ssh.c.orig Thu Feb 28 07:42:57 2002
|
||||
+++ plugins/check_by_ssh.c Sun Jul 14 09:50:43 2002
|
||||
@@ -382,6 +382,8 @@
|
||||
" list of nagios service names, separated by ':' [optional]\n"
|
||||
"-n, --name=NAME\n"
|
||||
" short name of host in netsaint configuration [optional]\n"
|
||||
" short name of host in nagios configuration [optional]\n"
|
||||
+ "-v, --verbose\n"
|
||||
+ " short name of host in netsaint configuration [optional]\n"
|
||||
+ " display command being executed\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)
|
||||
@@ -405,7 +407,7 @@
|
||||
{
|
||||
printf
|
||||
("Usage:\n"
|
||||
- "check_by_ssh [-f] [-t timeout] [-i identity] [-l user] -H <host> <command>\n"
|
||||
+ "check_by_ssh [-fv] [-t timeout] [-i identity] [-l user] -H <host> <command>\n"
|
||||
" [-n name] [-s servicelist] [-O outputfile] [-P port]\n"
|
||||
"check_by_ssh -V prints version info\n"
|
||||
"check_by_ssh -h prints more detailed help\n");
|
||||
|
||||
11
net-mgmt/nagios-plugins/files/patch-check_ifoperstatus.pl
Normal file
11
net-mgmt/nagios-plugins/files/patch-check_ifoperstatus.pl
Normal file
@ -0,0 +1,11 @@
|
||||
--- plugins-scripts/check_ifoperstatus.pl.orig Thu May 9 21:03:51 2002
|
||||
+++ plugins-scripts/check_ifoperstatus.pl Fri Jul 19 21:29:02 2002
|
||||
@@ -26,7 +26,7 @@
|
||||
# 11.01.2000 Version 1.0
|
||||
# $Id: check_ifoperstatus.pl,v 1.1 2002/05/09 19:03:51 sghosh Exp $
|
||||
|
||||
-use POSIX;
|
||||
+#use POSIX;
|
||||
use strict;
|
||||
use lib utils.pm ;
|
||||
use utils qw($TIMEOUT %ERRORS &print_revision &support);
|
||||
11
net-mgmt/nagios-plugins/files/patch-check_ifstatus.pl
Normal file
11
net-mgmt/nagios-plugins/files/patch-check_ifstatus.pl
Normal file
@ -0,0 +1,11 @@
|
||||
--- plugins-scripts/check_ifstatus.pl.orig Wed May 8 06:58:22 2002
|
||||
+++ plugins-scripts/check_ifstatus.pl Fri Jul 19 21:28:46 2002
|
||||
@@ -27,7 +27,7 @@
|
||||
#
|
||||
# $Id: check_ifstatus.pl,v 1.1 2002/05/08 04:58:22 sghosh Exp $
|
||||
|
||||
-use POSIX;
|
||||
+#use POSIX;
|
||||
use strict;
|
||||
use lib utils.pm ;
|
||||
use utils qw($TIMEOUT %ERRORS &print_revision &support);
|
||||
@ -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 () {
|
||||
@ -1,20 +1,13 @@
|
||||
--- 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 @@
|
||||
--- plugins/check_snmp.c.orig Thu Feb 28 07:42:59 2002
|
||||
+++ plugins/check_snmp.c Sun Jul 14 17:21:03 2002
|
||||
@@ -145,8 +145,8 @@
|
||||
/* 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);
|
||||
}
|
||||
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 */
|
||||
child_process = spopen (command_line);
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
--- 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);
|
||||
--- plugins/check_ssh.c.orig Thu Feb 28 07:42:59 2002
|
||||
+++ plugins/check_ssh.c Sun Jul 14 09:59:41 2002
|
||||
@@ -250,7 +250,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;
|
||||
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 @@
|
||||
ssh_proto, ssh_server);
|
||||
@@ -277,7 +277,7 @@
|
||||
{
|
||||
printf
|
||||
("Usage:\n"
|
||||
|
||||
175
net-mgmt/nagios-plugins/files/patch-configure.in
Normal file
175
net-mgmt/nagios-plugins/files/patch-configure.in
Normal file
@ -0,0 +1,175 @@
|
||||
--- configure.in.orig Thu Jun 13 05:03:07 2002
|
||||
+++ configure.in Fri Jul 19 21:31:32 2002
|
||||
@@ -7,7 +7,7 @@
|
||||
dnl AM_INIT_AUTOMAKE(nagios-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/nagios)
|
||||
+dnl AC_PREFIX_DEFAULT(/usr/local/nagios)
|
||||
|
||||
dnl Figure out how to invoke "install" and what install options to use.
|
||||
|
||||
@@ -46,7 +46,6 @@
|
||||
AC_ARG_WITH(nagios_group,--with-nagios-group=<group> sets group name to run nagios,nagios_grp=$withval,nagios_grp=nagios)
|
||||
AC_SUBST(nagios_usr)
|
||||
AC_SUBST(nagios_grp)
|
||||
-INSTALL_OPTS="-o $nagios_usr -g $nagios_grp"
|
||||
AC_SUBST(INSTALL_OPTS)
|
||||
|
||||
AC_ARG_WITH(trusted_path,--with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin sets trusted path for executables called by scripts,trusted_path=$withval,trusted_path=/bin:/sbin:/usr/bin:/usr/sbin)
|
||||
@@ -98,8 +97,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"
|
||||
@@ -127,25 +126,37 @@
|
||||
LIBS="$_SAVEDLIBS"
|
||||
CPPFLAGS="$_SAVEDCPPFLAGS"
|
||||
|
||||
+AC_ARG_ENABLE(radius,--enable-radius compile check_radius)
|
||||
+if test x$enable_radius = xyes; 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 x$enable_ldap = xyes; 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"
|
||||
@@ -154,13 +165,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)
|
||||
@@ -176,7 +188,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)
|
||||
@@ -190,7 +203,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)
|
||||
@@ -269,16 +282,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")
|
||||
|
||||
@@ -683,6 +696,8 @@
|
||||
AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO")
|
||||
fi
|
||||
|
||||
+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
|
||||
+if test x$enable_snmp = xyes; then
|
||||
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
|
||||
if test -x "$PATH_TO_SNMPGET"
|
||||
then
|
||||
@@ -705,7 +720,10 @@
|
||||
echo "** Tried $PERL - install Net::SNMP perl module if you want to"
|
||||
echo " use the perl snmp plugins"
|
||||
fi
|
||||
+fi
|
||||
|
||||
+AC_ARG_ENABLE(qstat,--enable-qstat compile check_game)
|
||||
+if test x$enable_qstat = xyes; then
|
||||
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
|
||||
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
|
||||
if test -x "$PATH_TO_QUAKESTAT"
|
||||
@@ -719,7 +737,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 x$enable_fping = xyes; then
|
||||
AC_PATH_PROG(PATH_TO_FPING,fping)
|
||||
if test -x "$PATH_TO_FPING"
|
||||
then
|
||||
@@ -727,6 +748,7 @@
|
||||
EXTRAS="$EXTRAS check_fping"
|
||||
else
|
||||
echo "** Get fping from http://www.fping.com in order to make check_fping plugin"
|
||||
+fi
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(PATH_TO_SSH,ssh)
|
||||
@ -1,11 +1,36 @@
|
||||
--- 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)
|
||||
--- plugins-scripts/subst.in.orig Thu Jun 6 06:16:56 2002
|
||||
+++ plugins-scripts/subst.in Sun Jul 14 13:38:22 2002
|
||||
@@ -37,6 +37,16 @@
|
||||
|
||||
/^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ {
|
||||
- sub(/\=[ \t]*['"][^"']+["']/,"='@trusted_path@' # autoconf-derived");
|
||||
+ sub(/\=[ \t]*['"][^"']+["'];/,"='@trusted_path@'; # autoconf-derived");
|
||||
}
|
||||
|
||||
+# Specific programs
|
||||
+
|
||||
+#
|
||||
+/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
|
||||
+ match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
|
||||
+ start=RSTART+RLENGTH;
|
||||
+ c=substr($0,RSTART,RLENGTH);
|
||||
+ sub(c,which(c,path));
|
||||
+}
|
||||
+
|
||||
# scripting language (first line)
|
||||
|
||||
/^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");}
|
||||
@@ -56,16 +66,6 @@
|
||||
|
||||
/^[\t ]*(export[\t ]*)?PATH[\t ]*=['"]+.+["']$/ {
|
||||
sub(/\=.*$/,"='@trusted_path@' # autoconf-derived");
|
||||
-}
|
||||
-
|
||||
-# Specific programs
|
||||
-
|
||||
-#
|
||||
-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
|
||||
- match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
|
||||
- start=RSTART+RLENGTH;
|
||||
- c=substr($0,RSTART,RLENGTH);
|
||||
- sub(c,which(c,path));
|
||||
}
|
||||
|
||||
{
|
||||
|
||||
15
net-mgmt/nagios-plugins/files/patch-utils.sh.in
Normal file
15
net-mgmt/nagios-plugins/files/patch-utils.sh.in
Normal file
@ -0,0 +1,15 @@
|
||||
--- plugins-scripts/utils.sh.in.orig Thu Jun 6 06:16:56 2002
|
||||
+++ plugins-scripts/utils.sh.in Sun Jul 14 17:40:56 2002
|
||||
@@ -14,10 +14,10 @@
|
||||
|
||||
print_revision() {
|
||||
echo "$1 (@PACKAGE@ @VERSION@) $2"
|
||||
- $ECHO "@WARRANTY@" | /bin/sed -e 's/\n/ /g'
|
||||
+ $ECHO "@WARRANTY@" | /usr/bin/sed -e 's/\n/ /g'
|
||||
}
|
||||
|
||||
support() {
|
||||
- $ECHO "@SUPPORT@" | /bin/sed -e 's/\n/ /g'
|
||||
+ $ECHO "@SUPPORT@" | /usr/bin/sed -e 's/\n/ /g'
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
Plugins for netsaint
|
||||
Plugins for nagios
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
This is a plugin package for Netsaint. Quoting from the
|
||||
main Netsaint package:
|
||||
This is a plugin package for Nagios. Quoting from the
|
||||
main Nagios package:
|
||||
|
||||
NetSaint is a program that will monitor hosts and services
|
||||
on your network. It has the ability to email or page you
|
||||
when a problem arises and when it gets resolved. NetSaint
|
||||
is written in C and is designed to run under Linux, although
|
||||
it should work under most other *NIX variants. It can run
|
||||
either as a normal process or as a daemon, intermittently
|
||||
running checks on various services that you specify. The
|
||||
actual service checks are performed by external "plugins"
|
||||
which return service information to NetSaint. Several CGI
|
||||
programs are included with NetSaint in order to allow you
|
||||
to view the current service status, history, etc. via a web browser.
|
||||
Nagios is a host and service monitor designed to inform you of network
|
||||
problems before your clients, end-users or managers do. It has been
|
||||
designed to run under the Linux operating system, but works fine under
|
||||
most *NIX variants as well. The monitoring daemon runs intermittent
|
||||
checks on hosts and services you specify using external "plugins"
|
||||
which return status information to Nagios. When problems are
|
||||
encountered, the daemon can send notifications out to administrative
|
||||
contacts in a variety of different ways (email, instant message, SMS,
|
||||
etc.). Current status information, historical logs, and reports can
|
||||
all be accessed via a web browser.
|
||||
|
||||
WWW: http://www.netsaint.org/
|
||||
WWW: http://www.nagios.org/
|
||||
|
||||
@ -1,52 +1,53 @@
|
||||
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
|
||||
%%SUB_FPING%%libexec/netsaint/check_fping
|
||||
libexec/netsaint/check_ftp
|
||||
%%SUB_QSTAT%%libexec/netsaint/check_game
|
||||
%%SUB_SNMP%%libexec/netsaint/check_hpjd
|
||||
libexec/netsaint/check_http
|
||||
libexec/netsaint/check_imap
|
||||
libexec/netsaint/check_ircd
|
||||
%%SUB_LDAP%%libexec/netsaint/check_ldap
|
||||
libexec/netsaint/check_load
|
||||
libexec/netsaint/check_log
|
||||
libexec/netsaint/check_mrtg
|
||||
libexec/netsaint/check_mrtgtraf
|
||||
%%SUB_MYSQL%%libexec/netsaint/check_mysql
|
||||
libexec/netsaint/check_netdns
|
||||
libexec/netsaint/check_netsaint
|
||||
libexec/netsaint/check_nntp
|
||||
libexec/netsaint/check_nt
|
||||
libexec/netsaint/check_ntp
|
||||
libexec/netsaint/check_nwstat
|
||||
libexec/netsaint/check_oracle
|
||||
libexec/netsaint/check_overcr
|
||||
%%SUB_PGSQL%%libexec/netsaint/check_pgsql
|
||||
libexec/netsaint/check_ping
|
||||
libexec/netsaint/check_pop
|
||||
libexec/netsaint/check_procs
|
||||
%%SUB_RADIUS%%libexec/netsaint/check_radius
|
||||
libexec/netsaint/check_real
|
||||
libexec/netsaint/check_rpc
|
||||
libexec/netsaint/check_sensors
|
||||
libexec/netsaint/check_smtp
|
||||
%%SUB_SNMP%%libexec/netsaint/check_snmp
|
||||
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_wave
|
||||
libexec/netsaint/urlize
|
||||
libexec/netsaint/utils.pm
|
||||
libexec/netsaint/utils.sh
|
||||
@dirrm libexec/netsaint
|
||||
libexec/nagios/check_breeze
|
||||
libexec/nagios/check_by_ssh
|
||||
libexec/nagios/check_dig
|
||||
libexec/nagios/check_disk
|
||||
libexec/nagios/check_disk_smb
|
||||
libexec/nagios/check_dns
|
||||
libexec/nagios/check_dummy
|
||||
libexec/nagios/check_flexlm
|
||||
%%SUB_FPING%%libexec/nagios/check_fping
|
||||
libexec/nagios/check_ftp
|
||||
%%SUB_QSTAT%%libexec/nagios/check_game
|
||||
%%SUB_SNMP%%libexec/nagios/check_hpjd
|
||||
libexec/nagios/check_http
|
||||
libexec/nagios/check_ifoperstatus
|
||||
libexec/nagios/check_ifstatus
|
||||
libexec/nagios/check_imap
|
||||
libexec/nagios/check_ircd
|
||||
%%SUB_LDAP%%libexec/nagios/check_ldap
|
||||
libexec/nagios/check_load
|
||||
libexec/nagios/check_log
|
||||
libexec/nagios/check_mrtg
|
||||
libexec/nagios/check_mrtgtraf
|
||||
%%SUB_MYSQL%%libexec/nagios/check_mysql
|
||||
libexec/nagios/check_nagios
|
||||
libexec/nagios/check_nntp
|
||||
libexec/nagios/check_nt
|
||||
libexec/nagios/check_ntp
|
||||
libexec/nagios/check_nwstat
|
||||
libexec/nagios/check_oracle
|
||||
libexec/nagios/check_overcr
|
||||
%%SUB_PGSQL%%libexec/nagios/check_pgsql
|
||||
libexec/nagios/check_ping
|
||||
libexec/nagios/check_pop
|
||||
libexec/nagios/check_procs
|
||||
%%SUB_RADIUS%%libexec/nagios/check_radius
|
||||
libexec/nagios/check_real
|
||||
libexec/nagios/check_rpc
|
||||
libexec/nagios/check_sensors
|
||||
libexec/nagios/check_smtp
|
||||
%%SUB_SNMP%%libexec/nagios/check_snmp
|
||||
libexec/nagios/check_ssh
|
||||
libexec/nagios/check_swap
|
||||
libexec/nagios/check_tcp
|
||||
libexec/nagios/check_time
|
||||
libexec/nagios/check_udp
|
||||
libexec/nagios/check_ups
|
||||
libexec/nagios/check_users
|
||||
libexec/nagios/check_vsz
|
||||
libexec/nagios/check_wave
|
||||
libexec/nagios/urlize
|
||||
libexec/nagios/utils.pm
|
||||
libexec/nagios/utils.sh
|
||||
@dirrm libexec/nagios
|
||||
|
||||
2
net-mgmt/nagios-plugins/scripts/configure
vendored
2
net-mgmt/nagios-plugins/scripts/configure
vendored
@ -67,6 +67,8 @@ while [ "$1" ]; do
|
||||
\"NetSNMP\")
|
||||
echo "BUILD_DEPENDS+= snmpcheck:\${PORTSDIR}/net/net-snmp"
|
||||
echo "RUN_DEPENDS+= snmpcheck:\${PORTSDIR}/net/net-snmp"
|
||||
echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/perl5/site_perl/\${PERL_VER}/Net/SNMP.pm:\${PORTSDIR}/net/p5-Net-SNMP"
|
||||
echo "RUN_DEPENDS+= \${LOCALBASE}/lib/perl5/site_perl/\${PERL_VER}/Net/SNMP.pm:\${PORTSDIR}/net/p5-Net-SNMP"
|
||||
echo "CONFIGURE_ARGS+= --enable-snmp"
|
||||
SUB_SNMP=""
|
||||
;;
|
||||
|
||||
@ -274,6 +274,7 @@
|
||||
SUBDIR += mudix
|
||||
SUBDIR += mutella
|
||||
SUBDIR += nagios
|
||||
SUBDIR += nagios-plugins
|
||||
SUBDIR += naim
|
||||
SUBDIR += nam
|
||||
SUBDIR += napshare
|
||||
|
||||
@ -1,32 +1,33 @@
|
||||
# New ports collection makefile for: netsaint-plugins
|
||||
# Date created: Wed 12 Jul 2000
|
||||
# Whom: will
|
||||
# New ports collection makefile for: nagios-plugins
|
||||
# Date created: 14 Jul 2002
|
||||
# Whom: Blaz Zupan <blaz@si.FreeBSD.org>
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= netsaint-plugins
|
||||
PORTVERSION= 1.2.9.4
|
||||
PORTREVISION= 1
|
||||
PORTNAME= nagios-plugins
|
||||
PORTVERSION= 1.3.b1
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= netsaintplug
|
||||
DISTNAME= ${PORTNAME}-1.2.9-4
|
||||
MASTER_SITE_SUBDIR= nagiosplug
|
||||
DISTNAME= nagiosplug-1.3-beta1
|
||||
|
||||
MAINTAINER= blaz@si.FreeBSD.org
|
||||
|
||||
USE_SUBMAKE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --sbindir=${PREFIX}/share/netsaint/sbin \
|
||||
--libexecdir=${PREFIX}/libexec/netsaint \
|
||||
--datadir=${PREFIX}/share/netsaint \
|
||||
--sysconfdir=${PREFIX}/etc/netsaint \
|
||||
--localstatedir=${PREFIX}/var/netsaint
|
||||
CONFIGURE_ARGS= --sbindir=${PREFIX}/share/nagios/sbin \
|
||||
--libexecdir=${PREFIX}/libexec/nagios \
|
||||
--datadir=${PREFIX}/share/nagios \
|
||||
--sysconfdir=${PREFIX}/etc/nagios \
|
||||
--localstatedir=${PREFIX}/var/nagios
|
||||
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
|
||||
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
||||
MKDIR="${MKDIR}"
|
||||
USE_AUTOMAKE= yes
|
||||
USE_GMAKE= yes
|
||||
USE_PERL5= yes
|
||||
|
||||
pre-fetch:
|
||||
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (netsaint-plugins-1.2.9-4.tar.gz) = ef4adb2b9e77abebd3797e5ebe093014
|
||||
MD5 (nagiosplug-1.3-beta1.tar.gz) = be984a7feebe0f6f3ecf13255f18014d
|
||||
|
||||
@ -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)
|
||||
@ -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.]+)/) {
|
||||
23
net/nagios-plugins/files/patch-check_breeze.pl
Normal file
23
net/nagios-plugins/files/patch-check_breeze.pl
Normal file
@ -0,0 +1,23 @@
|
||||
--- plugins-scripts/check_breeze.pl.orig Tue May 7 07:35:49 2002
|
||||
+++ plugins-scripts/check_breeze.pl Fri Jul 19 20:46:00 2002
|
||||
@@ -1,9 +1,9 @@
|
||||
-#! /usr/bin/perl -wT
|
||||
+#! /usr/bin/perl -w
|
||||
|
||||
|
||||
use strict;
|
||||
use Getopt::Long;
|
||||
-use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $PROGNAME);
|
||||
+use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $opt_C $PROGNAME);
|
||||
use lib utils.pm ;
|
||||
use utils qw(%ERRORS &print_revision &support &usage);
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
($opt_C) || ($opt_C = "public") ;
|
||||
|
||||
my $sig=0;
|
||||
-$sig = `/usr/bin/snmpget $host $opt_C .1.3.6.1.4.1.710.3.2.3.1.3.0`;
|
||||
+$sig = `/usr/bin/snmpget -c $opt_C $host .1.3.6.1.4.1.710.3.2.3.1.3.0`;
|
||||
my @test=split(/ /,$sig);
|
||||
$sig=$test[2];
|
||||
$sig=int($sig);
|
||||
@ -1,29 +1,20 @@
|
||||
--- plugins/check_by_ssh.c.orig Fri Jun 21 11:19:56 2002
|
||||
+++ plugins/check_by_ssh.c Fri Jun 21 11:54:25 2002
|
||||
@@ -191,7 +191,7 @@
|
||||
if (commands>1)
|
||||
remotecmd=strscat(remotecmd,";echo STATUS CODE: $?;");
|
||||
|
||||
- if (strlen (remotecmd) <= 1)
|
||||
+ if (remotecmd==NULL)
|
||||
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"
|
||||
--- plugins/check_by_ssh.c.orig Thu Feb 28 07:42:57 2002
|
||||
+++ plugins/check_by_ssh.c Sun Jul 14 09:50:43 2002
|
||||
@@ -382,6 +382,8 @@
|
||||
" list of nagios service names, separated by ':' [optional]\n"
|
||||
"-n, --name=NAME\n"
|
||||
" short name of host in netsaint configuration [optional]\n"
|
||||
" short name of host in nagios configuration [optional]\n"
|
||||
+ "-v, --verbose\n"
|
||||
+ " short name of host in netsaint configuration [optional]\n"
|
||||
+ " display command being executed\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)
|
||||
@@ -405,7 +407,7 @@
|
||||
{
|
||||
printf
|
||||
("Usage:\n"
|
||||
- "check_by_ssh [-f] [-t timeout] [-i identity] [-l user] -H <host> <command>\n"
|
||||
+ "check_by_ssh [-fv] [-t timeout] [-i identity] [-l user] -H <host> <command>\n"
|
||||
" [-n name] [-s servicelist] [-O outputfile] [-P port]\n"
|
||||
"check_by_ssh -V prints version info\n"
|
||||
"check_by_ssh -h prints more detailed help\n");
|
||||
|
||||
11
net/nagios-plugins/files/patch-check_ifoperstatus.pl
Normal file
11
net/nagios-plugins/files/patch-check_ifoperstatus.pl
Normal file
@ -0,0 +1,11 @@
|
||||
--- plugins-scripts/check_ifoperstatus.pl.orig Thu May 9 21:03:51 2002
|
||||
+++ plugins-scripts/check_ifoperstatus.pl Fri Jul 19 21:29:02 2002
|
||||
@@ -26,7 +26,7 @@
|
||||
# 11.01.2000 Version 1.0
|
||||
# $Id: check_ifoperstatus.pl,v 1.1 2002/05/09 19:03:51 sghosh Exp $
|
||||
|
||||
-use POSIX;
|
||||
+#use POSIX;
|
||||
use strict;
|
||||
use lib utils.pm ;
|
||||
use utils qw($TIMEOUT %ERRORS &print_revision &support);
|
||||
11
net/nagios-plugins/files/patch-check_ifstatus.pl
Normal file
11
net/nagios-plugins/files/patch-check_ifstatus.pl
Normal file
@ -0,0 +1,11 @@
|
||||
--- plugins-scripts/check_ifstatus.pl.orig Wed May 8 06:58:22 2002
|
||||
+++ plugins-scripts/check_ifstatus.pl Fri Jul 19 21:28:46 2002
|
||||
@@ -27,7 +27,7 @@
|
||||
#
|
||||
# $Id: check_ifstatus.pl,v 1.1 2002/05/08 04:58:22 sghosh Exp $
|
||||
|
||||
-use POSIX;
|
||||
+#use POSIX;
|
||||
use strict;
|
||||
use lib utils.pm ;
|
||||
use utils qw($TIMEOUT %ERRORS &print_revision &support);
|
||||
@ -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 () {
|
||||
@ -1,20 +1,13 @@
|
||||
--- 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 @@
|
||||
--- plugins/check_snmp.c.orig Thu Feb 28 07:42:59 2002
|
||||
+++ plugins/check_snmp.c Sun Jul 14 17:21:03 2002
|
||||
@@ -145,8 +145,8 @@
|
||||
/* 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);
|
||||
}
|
||||
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 */
|
||||
child_process = spopen (command_line);
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
--- 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);
|
||||
--- plugins/check_ssh.c.orig Thu Feb 28 07:42:59 2002
|
||||
+++ plugins/check_ssh.c Sun Jul 14 09:59:41 2002
|
||||
@@ -250,7 +250,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;
|
||||
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 @@
|
||||
ssh_proto, ssh_server);
|
||||
@@ -277,7 +277,7 @@
|
||||
{
|
||||
printf
|
||||
("Usage:\n"
|
||||
|
||||
175
net/nagios-plugins/files/patch-configure.in
Normal file
175
net/nagios-plugins/files/patch-configure.in
Normal file
@ -0,0 +1,175 @@
|
||||
--- configure.in.orig Thu Jun 13 05:03:07 2002
|
||||
+++ configure.in Fri Jul 19 21:31:32 2002
|
||||
@@ -7,7 +7,7 @@
|
||||
dnl AM_INIT_AUTOMAKE(nagios-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/nagios)
|
||||
+dnl AC_PREFIX_DEFAULT(/usr/local/nagios)
|
||||
|
||||
dnl Figure out how to invoke "install" and what install options to use.
|
||||
|
||||
@@ -46,7 +46,6 @@
|
||||
AC_ARG_WITH(nagios_group,--with-nagios-group=<group> sets group name to run nagios,nagios_grp=$withval,nagios_grp=nagios)
|
||||
AC_SUBST(nagios_usr)
|
||||
AC_SUBST(nagios_grp)
|
||||
-INSTALL_OPTS="-o $nagios_usr -g $nagios_grp"
|
||||
AC_SUBST(INSTALL_OPTS)
|
||||
|
||||
AC_ARG_WITH(trusted_path,--with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin sets trusted path for executables called by scripts,trusted_path=$withval,trusted_path=/bin:/sbin:/usr/bin:/usr/sbin)
|
||||
@@ -98,8 +97,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"
|
||||
@@ -127,25 +126,37 @@
|
||||
LIBS="$_SAVEDLIBS"
|
||||
CPPFLAGS="$_SAVEDCPPFLAGS"
|
||||
|
||||
+AC_ARG_ENABLE(radius,--enable-radius compile check_radius)
|
||||
+if test x$enable_radius = xyes; 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 x$enable_ldap = xyes; 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"
|
||||
@@ -154,13 +165,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)
|
||||
@@ -176,7 +188,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)
|
||||
@@ -190,7 +203,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)
|
||||
@@ -269,16 +282,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")
|
||||
|
||||
@@ -683,6 +696,8 @@
|
||||
AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO")
|
||||
fi
|
||||
|
||||
+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
|
||||
+if test x$enable_snmp = xyes; then
|
||||
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
|
||||
if test -x "$PATH_TO_SNMPGET"
|
||||
then
|
||||
@@ -705,7 +720,10 @@
|
||||
echo "** Tried $PERL - install Net::SNMP perl module if you want to"
|
||||
echo " use the perl snmp plugins"
|
||||
fi
|
||||
+fi
|
||||
|
||||
+AC_ARG_ENABLE(qstat,--enable-qstat compile check_game)
|
||||
+if test x$enable_qstat = xyes; then
|
||||
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
|
||||
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
|
||||
if test -x "$PATH_TO_QUAKESTAT"
|
||||
@@ -719,7 +737,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 x$enable_fping = xyes; then
|
||||
AC_PATH_PROG(PATH_TO_FPING,fping)
|
||||
if test -x "$PATH_TO_FPING"
|
||||
then
|
||||
@@ -727,6 +748,7 @@
|
||||
EXTRAS="$EXTRAS check_fping"
|
||||
else
|
||||
echo "** Get fping from http://www.fping.com in order to make check_fping plugin"
|
||||
+fi
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(PATH_TO_SSH,ssh)
|
||||
@ -1,11 +1,36 @@
|
||||
--- 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)
|
||||
--- plugins-scripts/subst.in.orig Thu Jun 6 06:16:56 2002
|
||||
+++ plugins-scripts/subst.in Sun Jul 14 13:38:22 2002
|
||||
@@ -37,6 +37,16 @@
|
||||
|
||||
/^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ {
|
||||
- sub(/\=[ \t]*['"][^"']+["']/,"='@trusted_path@' # autoconf-derived");
|
||||
+ sub(/\=[ \t]*['"][^"']+["'];/,"='@trusted_path@'; # autoconf-derived");
|
||||
}
|
||||
|
||||
+# Specific programs
|
||||
+
|
||||
+#
|
||||
+/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
|
||||
+ match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
|
||||
+ start=RSTART+RLENGTH;
|
||||
+ c=substr($0,RSTART,RLENGTH);
|
||||
+ sub(c,which(c,path));
|
||||
+}
|
||||
+
|
||||
# scripting language (first line)
|
||||
|
||||
/^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");}
|
||||
@@ -56,16 +66,6 @@
|
||||
|
||||
/^[\t ]*(export[\t ]*)?PATH[\t ]*=['"]+.+["']$/ {
|
||||
sub(/\=.*$/,"='@trusted_path@' # autoconf-derived");
|
||||
-}
|
||||
-
|
||||
-# Specific programs
|
||||
-
|
||||
-#
|
||||
-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
|
||||
- match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
|
||||
- start=RSTART+RLENGTH;
|
||||
- c=substr($0,RSTART,RLENGTH);
|
||||
- sub(c,which(c,path));
|
||||
}
|
||||
|
||||
{
|
||||
|
||||
15
net/nagios-plugins/files/patch-utils.sh.in
Normal file
15
net/nagios-plugins/files/patch-utils.sh.in
Normal file
@ -0,0 +1,15 @@
|
||||
--- plugins-scripts/utils.sh.in.orig Thu Jun 6 06:16:56 2002
|
||||
+++ plugins-scripts/utils.sh.in Sun Jul 14 17:40:56 2002
|
||||
@@ -14,10 +14,10 @@
|
||||
|
||||
print_revision() {
|
||||
echo "$1 (@PACKAGE@ @VERSION@) $2"
|
||||
- $ECHO "@WARRANTY@" | /bin/sed -e 's/\n/ /g'
|
||||
+ $ECHO "@WARRANTY@" | /usr/bin/sed -e 's/\n/ /g'
|
||||
}
|
||||
|
||||
support() {
|
||||
- $ECHO "@SUPPORT@" | /bin/sed -e 's/\n/ /g'
|
||||
+ $ECHO "@SUPPORT@" | /usr/bin/sed -e 's/\n/ /g'
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
Plugins for netsaint
|
||||
Plugins for nagios
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
This is a plugin package for Netsaint. Quoting from the
|
||||
main Netsaint package:
|
||||
This is a plugin package for Nagios. Quoting from the
|
||||
main Nagios package:
|
||||
|
||||
NetSaint is a program that will monitor hosts and services
|
||||
on your network. It has the ability to email or page you
|
||||
when a problem arises and when it gets resolved. NetSaint
|
||||
is written in C and is designed to run under Linux, although
|
||||
it should work under most other *NIX variants. It can run
|
||||
either as a normal process or as a daemon, intermittently
|
||||
running checks on various services that you specify. The
|
||||
actual service checks are performed by external "plugins"
|
||||
which return service information to NetSaint. Several CGI
|
||||
programs are included with NetSaint in order to allow you
|
||||
to view the current service status, history, etc. via a web browser.
|
||||
Nagios is a host and service monitor designed to inform you of network
|
||||
problems before your clients, end-users or managers do. It has been
|
||||
designed to run under the Linux operating system, but works fine under
|
||||
most *NIX variants as well. The monitoring daemon runs intermittent
|
||||
checks on hosts and services you specify using external "plugins"
|
||||
which return status information to Nagios. When problems are
|
||||
encountered, the daemon can send notifications out to administrative
|
||||
contacts in a variety of different ways (email, instant message, SMS,
|
||||
etc.). Current status information, historical logs, and reports can
|
||||
all be accessed via a web browser.
|
||||
|
||||
WWW: http://www.netsaint.org/
|
||||
WWW: http://www.nagios.org/
|
||||
|
||||
@ -1,52 +1,53 @@
|
||||
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
|
||||
%%SUB_FPING%%libexec/netsaint/check_fping
|
||||
libexec/netsaint/check_ftp
|
||||
%%SUB_QSTAT%%libexec/netsaint/check_game
|
||||
%%SUB_SNMP%%libexec/netsaint/check_hpjd
|
||||
libexec/netsaint/check_http
|
||||
libexec/netsaint/check_imap
|
||||
libexec/netsaint/check_ircd
|
||||
%%SUB_LDAP%%libexec/netsaint/check_ldap
|
||||
libexec/netsaint/check_load
|
||||
libexec/netsaint/check_log
|
||||
libexec/netsaint/check_mrtg
|
||||
libexec/netsaint/check_mrtgtraf
|
||||
%%SUB_MYSQL%%libexec/netsaint/check_mysql
|
||||
libexec/netsaint/check_netdns
|
||||
libexec/netsaint/check_netsaint
|
||||
libexec/netsaint/check_nntp
|
||||
libexec/netsaint/check_nt
|
||||
libexec/netsaint/check_ntp
|
||||
libexec/netsaint/check_nwstat
|
||||
libexec/netsaint/check_oracle
|
||||
libexec/netsaint/check_overcr
|
||||
%%SUB_PGSQL%%libexec/netsaint/check_pgsql
|
||||
libexec/netsaint/check_ping
|
||||
libexec/netsaint/check_pop
|
||||
libexec/netsaint/check_procs
|
||||
%%SUB_RADIUS%%libexec/netsaint/check_radius
|
||||
libexec/netsaint/check_real
|
||||
libexec/netsaint/check_rpc
|
||||
libexec/netsaint/check_sensors
|
||||
libexec/netsaint/check_smtp
|
||||
%%SUB_SNMP%%libexec/netsaint/check_snmp
|
||||
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_wave
|
||||
libexec/netsaint/urlize
|
||||
libexec/netsaint/utils.pm
|
||||
libexec/netsaint/utils.sh
|
||||
@dirrm libexec/netsaint
|
||||
libexec/nagios/check_breeze
|
||||
libexec/nagios/check_by_ssh
|
||||
libexec/nagios/check_dig
|
||||
libexec/nagios/check_disk
|
||||
libexec/nagios/check_disk_smb
|
||||
libexec/nagios/check_dns
|
||||
libexec/nagios/check_dummy
|
||||
libexec/nagios/check_flexlm
|
||||
%%SUB_FPING%%libexec/nagios/check_fping
|
||||
libexec/nagios/check_ftp
|
||||
%%SUB_QSTAT%%libexec/nagios/check_game
|
||||
%%SUB_SNMP%%libexec/nagios/check_hpjd
|
||||
libexec/nagios/check_http
|
||||
libexec/nagios/check_ifoperstatus
|
||||
libexec/nagios/check_ifstatus
|
||||
libexec/nagios/check_imap
|
||||
libexec/nagios/check_ircd
|
||||
%%SUB_LDAP%%libexec/nagios/check_ldap
|
||||
libexec/nagios/check_load
|
||||
libexec/nagios/check_log
|
||||
libexec/nagios/check_mrtg
|
||||
libexec/nagios/check_mrtgtraf
|
||||
%%SUB_MYSQL%%libexec/nagios/check_mysql
|
||||
libexec/nagios/check_nagios
|
||||
libexec/nagios/check_nntp
|
||||
libexec/nagios/check_nt
|
||||
libexec/nagios/check_ntp
|
||||
libexec/nagios/check_nwstat
|
||||
libexec/nagios/check_oracle
|
||||
libexec/nagios/check_overcr
|
||||
%%SUB_PGSQL%%libexec/nagios/check_pgsql
|
||||
libexec/nagios/check_ping
|
||||
libexec/nagios/check_pop
|
||||
libexec/nagios/check_procs
|
||||
%%SUB_RADIUS%%libexec/nagios/check_radius
|
||||
libexec/nagios/check_real
|
||||
libexec/nagios/check_rpc
|
||||
libexec/nagios/check_sensors
|
||||
libexec/nagios/check_smtp
|
||||
%%SUB_SNMP%%libexec/nagios/check_snmp
|
||||
libexec/nagios/check_ssh
|
||||
libexec/nagios/check_swap
|
||||
libexec/nagios/check_tcp
|
||||
libexec/nagios/check_time
|
||||
libexec/nagios/check_udp
|
||||
libexec/nagios/check_ups
|
||||
libexec/nagios/check_users
|
||||
libexec/nagios/check_vsz
|
||||
libexec/nagios/check_wave
|
||||
libexec/nagios/urlize
|
||||
libexec/nagios/utils.pm
|
||||
libexec/nagios/utils.sh
|
||||
@dirrm libexec/nagios
|
||||
|
||||
2
net/nagios-plugins/scripts/configure
vendored
2
net/nagios-plugins/scripts/configure
vendored
@ -67,6 +67,8 @@ while [ "$1" ]; do
|
||||
\"NetSNMP\")
|
||||
echo "BUILD_DEPENDS+= snmpcheck:\${PORTSDIR}/net/net-snmp"
|
||||
echo "RUN_DEPENDS+= snmpcheck:\${PORTSDIR}/net/net-snmp"
|
||||
echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/perl5/site_perl/\${PERL_VER}/Net/SNMP.pm:\${PORTSDIR}/net/p5-Net-SNMP"
|
||||
echo "RUN_DEPENDS+= \${LOCALBASE}/lib/perl5/site_perl/\${PERL_VER}/Net/SNMP.pm:\${PORTSDIR}/net/p5-Net-SNMP"
|
||||
echo "CONFIGURE_ARGS+= --enable-snmp"
|
||||
SUB_SNMP=""
|
||||
;;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user