kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated to nagios-plugins version 1.4.1.

Browse source 
Fixed up some of the check_routines
This commit is contained in:
Scott Presnell 2005-08-04 18:25:00 +00:00 committed by Thomas Klausner
parent d4e935baa6
commit 550fcf09ba
15 changed files with 194 additions and 227 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nagios-plugins/DESCR
View file

@ -1,2 +1,2 @@
This package contains the basic monitoring plugins for nagios. For
This package contains the basic monitoring plugins for nagios. For
more information about nagios, see the 'nagios-base' package.

4
nagios-plugins/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/06/10 08:26:07 cubidou Exp $
# $NetBSD: Makefile,v 1.6 2005/08/04 18:25:00 scott8586 Exp $
#
PKGREVISION= # not defined
@ -18,9 +18,11 @@ CONFIGURE_ARGS+= --with-df-command="/bin/df -Pklt nokernfs,procfs,fdesc"
.endif
DEPENDS+= nagios-base>=1.0:../../wip/nagios-base
.if !exists(/usr/bin/ssh)
DEPENDS+= {ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/ssh
.endif
.include "../../security/openssl/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

4
nagios-plugins/Makefile.common
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile.common,v 1.4 2004/06/10 08:26:07 cubidou Exp $
# $NetBSD: Makefile.common,v 1.5 2005/08/04 18:25:00 scott8586 Exp $
#
PLUGINSVERSION= 1.3.1
PLUGINSVERSION= 1.4.1
DISTNAME= nagios-plugins-${PLUGINSVERSION}
.include "../../wip/nagios-base/Makefile.common"

14
nagios-plugins/PLIST
View file

@ -1,13 +1,17 @@
@comment $NetBSD: PLIST,v 1.2 2004/06/10 08:26:07 cubidou Exp $
@comment $NetBSD: PLIST,v 1.3 2005/08/04 18:25:00 scott8586 Exp $
libexec/nagios/check_by_ssh
libexec/nagios/check_dhcp
libexec/nagios/check_dig
libexec/nagios/check_disk
libexec/nagios/check_dns
libexec/nagios/check_dummy
libexec/nagios/check_file_age
libexec/nagios/check_ftp
libexec/nagios/check_http
libexec/nagios/check_icmp
libexec/nagios/check_imap
libexec/nagios/check_ircd
libexec/nagios/check_jabber
libexec/nagios/check_load
libexec/nagios/check_log
libexec/nagios/check_mailq
@ -15,6 +19,7 @@ libexec/nagios/check_mrtg
libexec/nagios/check_mrtgtraf
libexec/nagios/check_nagios
libexec/nagios/check_nntp
libexec/nagios/check_nntps
libexec/nagios/check_ntp
libexec/nagios/check_nwstat
libexec/nagios/check_overcr
@ -23,15 +28,18 @@ libexec/nagios/check_pop
libexec/nagios/check_procs
libexec/nagios/check_real
libexec/nagios/check_rpc
libexec/nagios/check_sensors
libexec/nagios/check_simap
libexec/nagios/check_smtp
libexec/nagios/check_spop
libexec/nagios/check_ssh
libexec/nagios/check_ssmtp
libexec/nagios/check_swap
libexec/nagios/check_tcp
libexec/nagios/check_time
libexec/nagios/check_udp
libexec/nagios/check_udp2
libexec/nagios/check_ups
libexec/nagios/check_users
libexec/nagios/check_vsz
libexec/nagios/negate
libexec/nagios/urlize
libexec/nagios/utils.pm

57
nagios-plugins/TODO
View file

@ -1,10 +1,53 @@
# $NetBSD: TODO,v 1.2 2004/02/14 00:00:49 blef Exp $
# $NetBSD: TODO,v 1.3 2005/08/04 18:25:00 scott8586 Exp $
#
plugins now at version 1.4.1
TODO file for nagios-plugins:
- I think there is a problem with the mailq check.
- There is a problem with the sensors check.
- Testing, glorious testing. Yes I want some more...
- There are a couple of checks which use other pkgs. We may want
to either included a dependency or create another nagios-plugin-XXX pkg.
I have not looked at the checks that aren't compiled/installed.
check_by_ssh tested and works
check_dhcp tested and works
check_dig tested and works
check_disk tested and works
check_dns tested and works
check_dummy tested and works
check_ftp tested and works+
check_http tested and works+
check_icmp tested and works+
check_imap tested and works+
check_ircd ?
check_jabber ?
check_load tested and works.
check_log was broken, patched, now works.
check_mailq works (atleast with sendmail).
check_mrtg ?
check_mrtgtraf ?
check_nagios seems to work?
check_nntp tested and works.
check_ntp was broken, patched, now works+
check_nwstat ?
check_overcr ?
check_ping tested and works+
check_pop ?
check_procs tested and works+
check_real ?
check_rpc tested and works
check_smtp tested and works+
check_simap ?
check_spop ?
check_ssh ?
check_ssmtp ?
check_swap tested and works
check_tcp tested and works
check_time tested and works
check_udp tested and works
check_udp2 ?
check_ups ? - requires smart upsd - remove?
check_users tested and works+
check_sensors - there isn't currently a NetBSD package for
sensors, so this is not installed.
- Testing, glorious testing. Yes I want some more...
(if 'works' has a '+' it was tested in my configuration, else it was tested
"offline").

19
nagios-plugins/distinfo
View file

@ -1,10 +1,13 @@
$NetBSD: distinfo,v 1.3 2004/06/10 08:26:07 cubidou Exp $
$NetBSD: distinfo,v 1.4 2005/08/04 18:25:00 scott8586 Exp $
SHA1 (nagios-plugins-1.3.1.tar.gz) = dccbb84473533040830ad574e9eaa76c108f52a2
Size (nagios-plugins-1.3.1.tar.gz) = 532516 bytes
SHA1 (patch-aa) = 265830ee4da79cb4cc7f208bb00c3a00ccafbf25
SHA1 (patch-ab) = ba309552a17d2b79d8480b0126da7fba40c53e33
SHA1 (patch-ac) = 61932d6aee37a33957e1ed8370c54a8896fc82b4
SHA1 (patch-ad) = 4d0670c19d7fb94f00c1bcbbacb6326ea000517f
SHA1 (nagios-plugins-1.4.1.tar.gz) = a0da111905a2af8a31c044c14527b173acace9f1
RMD160 (nagios-plugins-1.4.1.tar.gz) = fe02a63fe99635552376736ab445957d374fb38b
Size (nagios-plugins-1.4.1.tar.gz) = 967552 bytes
SHA1 (patch-ab) = 040ec551e93d13a5da7cf5b6b09bd9afbef818b1
SHA1 (patch-ad) = 2b88b23b790b454cb1f5e2dc1b6735a43534834c
SHA1 (patch-ae) = df35396bb9fa1e61faf3c0067bb0b82ba6d0847d
SHA1 (patch-af) = 3c4daf788e06f31d148cbb0bc57c625166702e8d
SHA1 (patch-af) = d3b69b46bda9a0c4825ac31e87222ee9c6502cbc
SHA1 (patch-ag) = 30381eb5be9fc17c51095d859d58f8d81c09a44e
SHA1 (patch-ah) = b9f9f36d2c77ac08213dfea4df443872230f8099
SHA1 (patch-ai) = 383f5b19466c82454e198e1b9cdbec2dcfd04047
SHA1 (patch-aj) = 2e65a5b3bf9b666276867702a787f00da17ff29a

127
nagios-plugins/patches/patch-aa
View file

@ -1,127 +0,0 @@
$NetBSD: patch-aa,v 1.2 2004/06/10 08:26:07 cubidou Exp $
--- configure.in.orig Fri Jul 11 08:12:23 2003
+++ configure.in
@@ -100,7 +100,7 @@ _SAVEDLIBS="$LIBS"
_SAVEDCPPFLAGS="$CPPFLAGS"
AC_ARG_WITH(pgsql,--with-pgsql=<dir> sets path to pgsql installation,[PGSQL=$withval])
AC_CHECK_LIB(crypt,main)
-if test "$ac_cv_lib_crypt_main" = "yes"; then
+if false; then
if test -n "$PGSQL"; then
LDFLAGS="$LDFLAGS -L$PGSQL/lib"
CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
@@ -146,7 +146,7 @@ CPPFLAGS="$_SAVEDCPPFLAGS"
dnl Check for radius libraries
_SAVEDLIBS="$LIBS"
AC_CHECK_LIB(radiusclient,rc_read_config)
-if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
+if false; then
EXTRAS="$EXTRAS check_radius"
RADIUSLIBS="-lradiusclient"
AC_SUBST(RADIUSLIBS)
@@ -159,7 +159,7 @@ LIBS="$_SAVEDLIBS"
dnl Check for LDAP libraries
_SAVEDLIBS="$LIBS"
AC_CHECK_LIB(ldap,main,,,-llber)
-if test "$ac_cv_lib_ldap_main" = "yes"; then
+if false; then
LDAPLIBS="-lldap -llber"\
LDAPINCLUDE="-I/usr/include/ldap"
AC_SUBST(LDAPLIBS)
@@ -176,7 +176,7 @@ dnl Check for mysql libraries
_SAVEDLIBS="$LIBS"
_SAVEDCPPFLAGS="$CPPFLAGS"
AC_ARG_WITH(mysql,--with-mysql=<dir> sets path to mysql installation (assumes lib/mysql and include subdirs),[MYSQL=$withval])
-if test -n "$MYSQL"; then
+if false; then
MYSQLLIBDIR=$MYSQL/lib/mysql
CPPFLAGS="-I$MYSQL/include"
AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR ",,-L$MYSQLLIBDIR -lz)
@@ -194,7 +194,7 @@ elif test -f /usr/lib/mysql/libmysqlclie
AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql -lz)
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
+if false; then
AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h, MYSQLINCLUDE="-I$MYSQL/include" )
if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then
EXTRAS="$EXTRAS check_mysql"
@@ -780,7 +780,7 @@ AC_DEFINE_UNQUOTED(PING_COMMAND,"$PING_C
AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup)
if test -n "$ac_cv_path_PATH_TO_NSLOOKUP"
then
- if nslookup -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null
+ if nslookup -sil 127.0.0.1 2>&1 | fgrep ["Invalid option: sil"] >/dev/null
then
AC_MSG_RESULT([ nslookup syntax... $PATH_TO_NSLOOKUP])
AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$PATH_TO_NSLOOKUP",[path and args for nslookup])
@@ -817,7 +817,7 @@ else
fi
AC_PATH_PROG(PATH_TO_LMSTAT,lmstat)
-if test -x "$PATH_TO_LMSTAT"
+if false
then
AC_DEFINE_UNQUOTED(PATH_TO_LMSTAT,"$PATH_TO_LMSTAT",[path to lmstat])
else
@@ -825,7 +825,7 @@ else
fi
AC_PATH_PROG(PATH_TO_SMBCLIENT,smbclient)
-if test -x "$PATH_TO_SMBCLIENT"
+if false
then
AC_DEFINE_UNQUOTED(PATH_TO_SMBCLIENT,"$PATH_TO_SMBCLIENT",[path to smbclient binary])
else
@@ -842,7 +842,7 @@ else
fi
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
-if test -x "$PATH_TO_SNMPGET"
+if false
then
AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary])
EXTRAS="$EXTRAS check_hpjd check_snmp"
@@ -851,12 +851,12 @@ else
fi
AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext)
-if test -x "$PATH_TO_SNMPGETNEXT"
+if false
then
AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary])
fi
-if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null )
+if false
then
echo "Found Net::SNMP perl module"
else
@@ -866,7 +866,7 @@ fi
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
-if test -x "$PATH_TO_QUAKESTAT"
+if false
then
AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$PATH_TO_QUAKESTAT",[path to qstat/quakestat])
EXTRAS="$EXTRAS check_game"
@@ -879,7 +879,7 @@ else
fi
AC_PATH_PROG(PATH_TO_FPING,fping)
-if test -x "$PATH_TO_FPING"
+if false
then
AC_DEFINE_UNQUOTED(PATH_TO_FPING,"$PATH_TO_FPING",[path to fping])
EXTRAS="$EXTRAS check_fping"
@@ -966,7 +966,7 @@ if test -n "$PATH_TO_DIG"; then
EXTRAS="$EXTRAS check_dig"
fi
-if test -f plugins/check_nt.c ; then
+if false ; then
EXTRAS="$EXTRAS check_nt"
elif test -f ../plugins/check_nt.c ; then
EXTRAS="$EXTRAS check_nt"

57
nagios-plugins/patches/patch-ab
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ab,v 1.2 2004/06/10 08:26:07 cubidou Exp $
$NetBSD: patch-ab,v 1.3 2005/08/04 18:25:01 scott8586 Exp $
--- configure.orig Fri Jul 11 08:30:56 2003
+++ configure
@@ -6091,7 +6091,7 @@ _ACEOF
--- configure.orig 2005-08-01 14:34:46.000000000 -0700
+++ configure 2005-08-03 17:03:52.000000000 -0700
@@ -8406,7 +8406,7 @@
fi
@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/10 08:26:07 cubidou Exp $
if test -n "$PGSQL"; then
LDFLAGS="$LDFLAGS -L$PGSQL/lib"
CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
@@ -6692,7 +6692,7 @@ _ACEOF
@@ -9051,7 +9051,7 @@
fi
@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/10 08:26:07 cubidou Exp $
EXTRAS="$EXTRAS check_radius"
RADIUSLIBS="-lradiusclient"
@@ -6763,7 +6763,7 @@ _ACEOF
@@ -9132,7 +9132,7 @@
fi
@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/10 08:26:07 cubidou Exp $
LDAPLIBS="-lldap -llber"\
LDAPINCLUDE="-I/usr/include/ldap"
@@ -6786,7 +6786,7 @@ if test "${with_mysql+set}" = set; then
@@ -9362,7 +9362,7 @@
withval="$with_mysql"
MYSQL=$withval
fi;
@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/10 08:26:07 cubidou Exp $
MYSQLLIBDIR=$MYSQL/lib/mysql
CPPFLAGS="-I$MYSQL/include"
echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient" >&5
@@ -7374,7 +7374,7 @@ if test $ac_cv_lib_mysqlclient_mysql_clo
@@ -10050,7 +10050,7 @@
fi
fi
@ -47,16 +47,16 @@ $NetBSD: patch-ab,v 1.2 2004/06/10 08:26:07 cubidou Exp $
for ac_header in mysql/mysql.h mysql/errmsg.h
@@ -12477,7 +12477,7 @@ fi
if test -n "$ac_cv_path_PATH_TO_NSLOOKUP"
@@ -14789,7 +14789,7 @@
echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6
if test -n "$PATH_TO_NSLOOKUP"
then
- if nslookup -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null
+ if nslookup -sil 127.0.0.1 2>&1 | fgrep "Invalid option: sil" >/dev/null
- if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null
+ if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | fgrep "Invalid option: sil" >/dev/null
then
echo "$as_me:$LINENO: result: nslookup syntax... $PATH_TO_NSLOOKUP" >&5
echo "${ECHO_T} nslookup syntax... $PATH_TO_NSLOOKUP" >&6
@@ -12817,7 +12817,7 @@ else
ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
@@ -15131,7 +15131,7 @@
echo "${ECHO_T}no" >&6
fi
@ -65,7 +65,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/10 08:26:07 cubidou Exp $
then
cat >>confdefs.h <<_ACEOF
@@ -12867,7 +12867,7 @@ else
@@ -15182,7 +15182,7 @@
echo "${ECHO_T}no" >&6
fi
@ -74,7 +74,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/10 08:26:07 cubidou Exp $
then
cat >>confdefs.h <<_ACEOF
@@ -12972,7 +12972,7 @@ else
@@ -15287,7 +15287,7 @@
echo "${ECHO_T}no" >&6
fi
@ -83,7 +83,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/10 08:26:07 cubidou Exp $
then
cat >>confdefs.h <<_ACEOF
@@ -13023,7 +13023,7 @@ else
@@ -15339,7 +15339,7 @@
echo "${ECHO_T}no" >&6
fi
@ -92,25 +92,16 @@ $NetBSD: patch-ab,v 1.2 2004/06/10 08:26:07 cubidou Exp $
then
cat >>confdefs.h <<_ACEOF
@@ -13032,7 +13032,7 @@ _ACEOF
@@ -15348,7 +15348,7 @@
fi
-if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null )
+if false
then
echo "Found Net::SNMP perl module"
else
@@ -13118,7 +13118,7 @@ else
echo "${ECHO_T}no" >&6
fi
-if test -x "$PATH_TO_QUAKESTAT"
+if false
then
cat >>confdefs.h <<_ACEOF
@@ -13177,7 +13177,7 @@ else
echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5
echo $ECHO_N "checking for Net::SNMP perl module... $ECHO_C" >&6
@@ -15500,7 +15500,7 @@
echo "${ECHO_T}no" >&6
fi
@ -119,7 +110,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/10 08:26:07 cubidou Exp $
then
cat >>confdefs.h <<_ACEOF
@@ -13554,7 +13554,7 @@ if test -n "$PATH_TO_DIG"; then
@@ -16657,7 +16657,7 @@
EXTRAS="$EXTRAS check_dig"
fi

24
nagios-plugins/patches/patch-ac
View file

@ -1,24 +0,0 @@
$NetBSD: patch-ac,v 1.2 2004/06/10 08:26:07 cubidou Exp $
--- plugins-scripts/Makefile.am.orig Tue Feb 4 07:24:20 2003
+++ plugins-scripts/Makefile.am
@@ -4,13 +4,13 @@ SUFFIXES = .pl .sh
VPATH=$(top_srcdir) $(top_srcdir)/plugins-scripts $(top_srcdir)/plugins-scripts/t
-libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
- check_log check_ntp check_oracle check_rpc check_sensors check_wave \
- check_ifstatus check_ifoperstatus check_mailq utils.sh utils.pm
+libexec_SCRIPTS = check_ircd \
+ check_log check_ntp check_rpc check_sensors \
+ check_mailq utils.sh utils.pm
-EXTRA_DIST=check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \
- check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \
- check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl utils.sh.in utils.pm.in t
+EXTRA_DIST= check_ircd.pl \
+ check_log.sh check_ntp.pl check_rpc.pl check_sensors.sh \
+ check_mailq.pl utils.sh.in utils.pm.in t
TESTS_ENVIRONMENT=perl -I $(top_builddir) -I $(top_srcdir)

28
nagios-plugins/patches/patch-ad
View file

@ -1,25 +1,25 @@
$NetBSD: patch-ad,v 1.1 2004/06/10 08:26:07 cubidou Exp $
$NetBSD: patch-ad,v 1.2 2005/08/04 18:25:01 scott8586 Exp $
--- plugins-scripts/Makefile.in.orig Fri Jul 11 08:30:58 2003
+++ plugins-scripts/Makefile.in
@@ -135,14 +135,14 @@ trusted_path = @trusted_path@
--- plugins-scripts/Makefile.in.orig 2005-08-01 14:34:40.000000000 -0700
+++ plugins-scripts/Makefile.in 2005-08-04 11:02:01.000000000 -0700
@@ -238,14 +238,14 @@
with_nagios_user = @with_nagios_user@
with_trusted_path = @with_trusted_path@
SUFFIXES = .pl .sh
-libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
- check_log check_ntp check_oracle check_rpc check_sensors check_wave \
- check_ifstatus check_ifoperstatus check_mailq utils.sh utils.pm
- check_ifstatus check_ifoperstatus check_mailq check_file_age \
+libexec_SCRIPTS = check_ircd \
+ check_log check_ntp check_rpc check_sensors \
+ check_mailq utils.sh utils.pm
+ check_log check_ntp check_rpc \
+ check_mailq check_file_age \
utils.sh utils.pm
-EXTRA_DIST = check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \
- check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \
- check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl utils.sh.in utils.pm.in t
- check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \
+EXTRA_DIST = check_ircd.pl \
+ check_log.sh check_ntp.pl check_rpc.pl check_sensors.sh \
+ check_mailq.pl utils.sh.in utils.pm.in t
+ check_log.sh check_ntp.pl check_rpc.pl \
+ check_mailq.pl check_file_age.pl \
utils.sh.in utils.pm.in t
TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)

22
nagios-plugins/patches/patch-af
View file

@ -1,14 +1,22 @@
$NetBSD: patch-af,v 1.1 2004/06/10 08:26:07 cubidou Exp $
$NetBSD: patch-af,v 1.2 2005/08/04 18:25:01 scott8586 Exp $
--- plugins/Makefile.in.orig Fri Jul 11 08:30:59 2003
+++ plugins/Makefile.in
@@ -165,8 +165,8 @@ TESTS_ENVIRONMENT = perl -I $(top_buildd
--- plugins/Makefile.in.orig 2005-08-01 14:34:42.000000000 -0700
+++ plugins/Makefile.in 2005-08-03 17:51:55.000000000 -0700
@@ -404,7 +404,7 @@
NETLIBS = $(NETOBJS) $(SOCKETLIBS)
TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)
TESTS = @PLUGIN_TEST@
-AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
+#AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
##############################################################################
# the actual targets
@@ -979,7 +979,7 @@
install-exec-hook:
cd $(DESTDIR)$(libexecdir) && \
for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
- rm -f check_ldaps ; ln -s -f check_ldap check_ldaps
+# rm -f check_ldaps ; ln -s -f check_ldap check_ldaps
clean-local:
rm -f $(check_tcp_programs)

17
nagios-plugins/patches/patch-ag Normal file
View file

@ -0,0 +1,17 @@
$NetBSD: patch-ag,v 1.1 2005/08/04 18:25:01 scott8586 Exp $
--- plugins-scripts/utils.sh.in.orig 2002-06-05 21:16:56.000000000 -0700
+++ plugins-scripts/utils.sh.in 2005-08-04 10:58:12.000000000 -0700
@@ -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'
}

12
nagios-plugins/patches/patch-ah Normal file
View file

@ -0,0 +1,12 @@
$NetBSD: patch-ah,v 1.1 2005/08/04 18:25:01 scott8586 Exp $
--- plugins-scripts/check_ntp.pl.orig 2005-08-04 08:07:01.000000000 -0700
+++ plugins-scripts/check_ntp.pl 2005-08-04 08:08:39.000000000 -0700
@@ -307,6 +307,7 @@
} else {
$jitter_error = $ERRORS{'OK'};
}
+ last;
} else {
print "No match!\n" if $verbose;
$jitter = '(not parsed)';

21
nagios-plugins/patches/patch-ai Normal file
View file

@ -0,0 +1,21 @@
$NetBSD: patch-ai,v 1.1 2005/08/04 18:25:01 scott8586 Exp $
--- plugins-scripts/subst.in.orig 2005-08-04 10:24:09.000000000 -0700
+++ plugins-scripts/subst.in 2005-08-04 10:24:23.000000000 -0700
@@ -9,13 +9,14 @@
sub(/\/.*\//,"",c);
for (dir in path) {
+ if (match(path[dir], /.tools/ ) != 0 ) {
+ continue;
+ }
cmd = "test -x " path[dir] "/" c;
if (system(cmd)==0) {
return path[dir] "/" c;
}
}
-
-
return c;
}

13
nagios-plugins/patches/patch-aj Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-aj,v 1.1 2005/08/04 18:25:01 scott8586 Exp $
--- plugins-scripts/check_log.sh.orig 2005-08-04 10:29:25.000000000 -0700
+++ plugins-scripts/check_log.sh 2005-08-04 10:29:54.000000000 -0700
@@ -201,7 +201,7 @@
count=`$GREP -c "$query" $tempdiff`
# Get the last matching entry in the diff file
-lastentry=`$GREP "$query" $tempdiff | $TAIL --lines=1`
+lastentry=`$GREP "$query" $tempdiff | $TAIL -n 1`
$RM -f $tempdiff
$CAT $logfile > $oldlog