diff options
Diffstat (limited to 'net-mgmt/nagios-plugins/files')
-rw-r--r-- | net-mgmt/nagios-plugins/files/patch-check_breeze.pl | 23 | ||||
-rw-r--r-- | net-mgmt/nagios-plugins/files/patch-check_by_ssh.c | 20 | ||||
-rw-r--r-- | net-mgmt/nagios-plugins/files/patch-check_ifoperstatus.pl | 11 | ||||
-rw-r--r-- | net-mgmt/nagios-plugins/files/patch-check_ifstatus.pl | 11 | ||||
-rw-r--r-- | net-mgmt/nagios-plugins/files/patch-configure.in | 120 | ||||
-rw-r--r-- | net-mgmt/nagios-plugins/files/patch-subst.in | 36 | ||||
-rw-r--r-- | net-mgmt/nagios-plugins/files/patch-utils.sh.in | 15 |
7 files changed, 0 insertions, 236 deletions
diff --git a/net-mgmt/nagios-plugins/files/patch-check_breeze.pl b/net-mgmt/nagios-plugins/files/patch-check_breeze.pl deleted file mode 100644 index ed01ed5752ce..000000000000 --- a/net-mgmt/nagios-plugins/files/patch-check_breeze.pl +++ /dev/null @@ -1,23 +0,0 @@ ---- 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); diff --git a/net-mgmt/nagios-plugins/files/patch-check_by_ssh.c b/net-mgmt/nagios-plugins/files/patch-check_by_ssh.c deleted file mode 100644 index f1ba6b457c0d..000000000000 --- a/net-mgmt/nagios-plugins/files/patch-check_by_ssh.c +++ /dev/null @@ -1,20 +0,0 @@ ---- plugins/check_by_ssh.c.orig Wed Nov 20 02:19:07 2002 -+++ plugins/check_by_ssh.c Tue Nov 26 14:20:28 2002 -@@ -361,6 +361,8 @@ - " list of nagios service names, separated by ':' [optional]\n" - "-n, --name=NAME\n" - " short name of host in nagios configuration [optional]\n" -+ "-v, --verbose\n" -+ " display command being executed\n" - "-4, --use-ipv4\n" - " tell ssh to use IPv4\n" - "-6, --use-ipv6\n" -@@ -388,7 +390,7 @@ - { - printf - ("Usage:\n" -- "check_by_ssh [-f46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n" -+ "check_by_ssh [-fv46] [-t timeout] [-i identity] [-l user] -H <host> -C <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"); diff --git a/net-mgmt/nagios-plugins/files/patch-check_ifoperstatus.pl b/net-mgmt/nagios-plugins/files/patch-check_ifoperstatus.pl deleted file mode 100644 index 39ee768a416b..000000000000 --- a/net-mgmt/nagios-plugins/files/patch-check_ifoperstatus.pl +++ /dev/null @@ -1,11 +0,0 @@ ---- 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); diff --git a/net-mgmt/nagios-plugins/files/patch-check_ifstatus.pl b/net-mgmt/nagios-plugins/files/patch-check_ifstatus.pl deleted file mode 100644 index d40e7f9a4c74..000000000000 --- a/net-mgmt/nagios-plugins/files/patch-check_ifstatus.pl +++ /dev/null @@ -1,11 +0,0 @@ ---- 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); diff --git a/net-mgmt/nagios-plugins/files/patch-configure.in b/net-mgmt/nagios-plugins/files/patch-configure.in deleted file mode 100644 index 784da9ef03fd..000000000000 --- a/net-mgmt/nagios-plugins/files/patch-configure.in +++ /dev/null @@ -1,120 +0,0 @@ ---- configure.in.orig Fri Jul 11 08:12:23 2003 -+++ configure.in Sun Jul 13 13:13:37 2003 -@@ -12,7 +12,7 @@ - AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_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. - -@@ -60,7 +60,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) -@@ -143,25 +142,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" -@@ -170,7 +181,7 @@ - AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).]) - fi - LIBS="$_SAVEDLIBS" -- -+fi - - dnl Check for mysql libraries - _SAVEDLIBS="$LIBS" -@@ -209,7 +220,7 @@ - AC_MSG_WARN([Skipping mysql plugin]) - AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).]) - fi --CPPFLAGS="$_SAVEDCPPFLAGS" -+CPPFLAGS="$_SAVEDCPPFLAGS $MYSQLINCLUDE" - LIBS="$_SAVEDLIBS" - - dnl Check for OpenSSL location -@@ -841,6 +852,8 @@ - AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO",[path and arguments for invoking '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 -@@ -863,7 +876,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" -@@ -877,7 +893,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 -@@ -885,6 +904,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) diff --git a/net-mgmt/nagios-plugins/files/patch-subst.in b/net-mgmt/nagios-plugins/files/patch-subst.in deleted file mode 100644 index c5bd2477c9c8..000000000000 --- a/net-mgmt/nagios-plugins/files/patch-subst.in +++ /dev/null @@ -1,36 +0,0 @@ ---- 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 @@ - - } - -+# 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)); - } - - { diff --git a/net-mgmt/nagios-plugins/files/patch-utils.sh.in b/net-mgmt/nagios-plugins/files/patch-utils.sh.in deleted file mode 100644 index 4526200301fe..000000000000 --- a/net-mgmt/nagios-plugins/files/patch-utils.sh.in +++ /dev/null @@ -1,15 +0,0 @@ ---- 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' - } - |