--- nagios-plugins-1.4.12.orig/debian/control +++ nagios-plugins-1.4.12/debian/control @@ -0,0 +1,78 @@ +Source: nagios-plugins +Section: net +Priority: extra +Maintainer: Debian Nagios Maintainer Group +Uploaders: Sean Finney , Guido Trotter , Jan Wagner , Alexander Wirt +Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.9), autotools-dev, libldap2-dev, libpq-dev, libmysqlclient15-dev | libmysqlclient12-dev | libmysqlclient-dev, libradiusclient-ng-dev, libkrb5-dev, libnet-snmp-perl, procps, coreutils, mawk | awk +Homepage: http://nagiosplug.sourceforge.net +Vcs-Browser: http://svn.debian.org/wsvn/pkg-nagios/nagios-plugins/ +Vcs-Svn: svn://svn.debian.org/pkg-nagios/nagios-plugins/ +Standards-Version: 3.8.0 + +Package: nagios-plugins +Architecture: all +Depends: nagios-plugins-basic, nagios-plugins-standard +Suggests: nagios3 +Description: Plugins for the nagios network monitoring and management system + Nagios is a host/service/network monitoring and management system. It has + the following features: + . + * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, + PING, etc.) + * Plugin interface to allow for user-developed service checks + * Contact notifications when problems occur and get resolved (via email, + pager, or user-defined method) + * Ability to define event handlers to be run during service or host events + (for proactive problem resolution) + * Web output (current status, notifications, history, log file, etc.) + . + This metapackage will install the entire suite of plugins for nagios. + If you are installing nagios plugins on a remote "satellite" server + (using nagios-nrpe-server or nsca), you may be interested in the + nagios-plugins-basic package. + +Package: nagios-plugins-basic +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping, ucf +Conflicts: nagios-plugins (<= 1.4.2-3) +Replaces: nagios-plugins, nagios-plugins-standard +Suggests: nagios3 +Description: Plugins for the nagios network monitoring and management system + Nagios is a host/service/network monitoring and management system. It has + the following features: + . + * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, + PING, etc.) + * Plugin interface to allow for user-developed service checks + * Contact notifications when problems occur and get resolved (via email, + pager, or user-defined method) + * Ability to define event handlers to be run during service or host events + (for proactive problem resolution) + * Web output (current status, notifications, history, log file, etc.) + . + This package provides a basic set of plugins with minimal external + dependencies. It is not likely to be useful by itself unless you are + installing a remote "satellite" server (using nagios-nrpe-server or nsca, + for example). + +Package: nagios-plugins-standard +Architecture: any +Conflicts: nagios-plugins (<= 1.4.2-3) +Replaces: nagios-plugins +Depends: ${shlibs:Depends}, ${misc:Depends}, fping, qstat, snmp, radiusclient1, libnet-snmp-perl, dnsutils, bind9-host | host, smbclient, ucf, nagios-plugins-basic (>= 1.4.5-2) +Suggests: nagios3, whois +Description: Plugins for the nagios network monitoring and management system + Nagios is a host/service/network monitoring and management system. It has + the following features: + . + * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, + PING, etc.) + * Plugin interface to allow for user-developed service checks + * Contact notifications when problems occur and get resolved (via email, + pager, or user-defined method) + * Ability to define event handlers to be run during service or host events + (for proactive problem resolution) + * Web output (current status, notifications, history, log file, etc.) + . + This package provides the suite of plugins that are most likely to be + useful on a central nagios host. --- nagios-plugins-1.4.12.orig/debian/nagios-plugins-standard.postinst +++ nagios-plugins-1.4.12/debian/nagios-plugins-standard.postinst @@ -0,0 +1,10 @@ +#!/bin/sh -e + +. /usr/share/nagios-plugins/dpkg/functions +templdir=/usr/share/nagios-plugins/templates-standard + +if [ "$1" = "configure" ]; then + register_cfgs $2 +fi + +#DEBHELPER# --- nagios-plugins-1.4.12.orig/debian/compat +++ nagios-plugins-1.4.12/debian/compat @@ -0,0 +1 @@ +4 --- nagios-plugins-1.4.12.orig/debian/changelog +++ nagios-plugins-1.4.12/debian/changelog @@ -0,0 +1,758 @@ +nagios-plugins (1.4.12-4~bpo40+1) etch-backports; urgency=low + + * Rebuild for etch-backports. + + -- Jan Wagner Wed, 15 Oct 2008 14:35:29 +0200 + +nagios-plugins (1.4.12-4) unstable; urgency=low + + * add server_port back to 41_check_http_fix_http_header.dpatch, + patch was incomplete + * add warning and critical threshold to check_disk_smb_user command + definition + * fix check_http?_hostname* command definitions + * adjust 'check_ssh_4' command definition, it needs the v4 argument at first, + thanks Julien Ozog (Closes #500774). + + -- Jan Wagner Sun, 24 Aug 2008 07:40:12 +0200 + +nagios-plugins (1.4.12-3) unstable; urgency=low + + * rename 40_check_http_status_line.patch to 40_check_http_status_line.dpatch + and make it able to apply + * add 40_check_http_status_line.dpatch to 00list to really fix #486932 + * add 41_check_http_fix_http_header.dpatch to support virtual servers + (Closes: #494835) + + -- Jan Wagner Sat, 23 Aug 2008 17:20:34 +0200 + +nagios-plugins (1.4.12-2) unstable; urgency=low + + * add 40_check_http_status_line.dpatch to add content of the status_line + into the check_http output (Closes: #486932) + * clean patches from reject files left from dpatch-edit-patch + * fix 34_fix_smbclient_check_disk_smb.dpatch, thanks Stephane Chazelas + for helping out here (Closes: #488820) + + -- Jan Wagner Fri, 04 Jul 2008 16:53:07 +0200 + +nagios-plugins (1.4.12-1) unstable; urgency=low + + [ Jan Wagner ] + * new upstream + - check_http supports now an IPv6 as value for parameter -H + (Closes: #457336) + - Enhanced check_smtp to actually print invalid response text + (Closes: #467493) + * removed the following patches, cause fixed upstream + - 28_check_pgsql_include_for_8.3.dpatch + - 29_check_ntp_fixsefault_deprecate.dpatch + - 30_fix_check_ntp_options.dpatch + - 31_check_disk_local_option.dpatch + * adjust 50_misc_typos.dpatch to apply new upstream + * remove unneeded debhelper scripts from rules + * remove senseless comments from patches + * add missing descriptions to patches + * add missing command definition for check_ldaps, thanks Michael Renner + for reporting it (Closes: #407310) + * remove sarge handholding for configfiles migration + * add nagios3 to Suggests and remove nagios2, nagios and nagios-text + (Closes: #479292) + * adjust year in copyright + * include list of files which are GPL3 into copyright + * build depend on libradiusclient-ng-dev instead of libradius1-dev (for more + informations see REQUIREMENTS) + * add 33_fix_emb_check_disk_smb.dpatch which fixes processing via embedded + perl of check_disk_smb, thanks Stephane Chazelas + for providing it (Closes: #478906) + * add 34_fix_smbclient_check_disk_smb.dpatch which fixes usage of smbclient, + thanks Stephane Chazelas for providing it and + adding ' around arguments in plugin configs + (Closes: #478942) + * add 35_check_http_date.dpatch which fixes date parsing of check_http, + thanks Hilko Bengen for providing it (Closes: #460097) + * add 36_check_ldap_empty_base.dpatch which allows empty ldap base, thanks + to Stephane Chazelas for providing it + (Closes: #479984) + * add 37_check_radius_nas-ip-address.dpatch to add support for nas-ip to + check_radius, thanks Josip Rodin for + providing it (Closes: #482947) + * provide new checks for check_http which makes use of "-H '$HOSTNAME'" + (Closes: #423461) + * fixed check_radius command definition and removed static port in favor of + ability to provide it as 4th argument, since it was broken and unusable + anyways, thanks Josip Rodin for profiding a + fix (Closes: #482942) + * mention the check_radius breakerage in NEWS.Debian + * add check_linux_raid into package (Closes: #461999) and add + 38_fix_libexec.dpatch to fix libexec path + * Updating standards version to 3.8.0, no changes needed + * add 39_check_dig_options.dpatch which provides fix for no check for + mandatory parameter -l, thanks Matthias Eble + for providing a fix + (Closes: #479013) + + [ Alexander Wirt ] + * Call smbclient with -N (supress password prompt) if no password is + supplied. Thanks to Josip Rodin for the patch (Closes: #425129) + * Add myself to uploaders + + -- Jan Wagner Tue, 17 Jun 2008 23:18:32 +0200 + +nagios-plugins (1.4.11-2) unstable; urgency=low + + * Remove Build-depends on libsnmp*-dev since it's not needed anymore + (Closes: #429778) + * fix check_disk --local by adding 31_check_disk_local_option.dpatch + (Closes: #405537) + * define LDAP_DEPRECATED in check_ldap.c to make use of old API by adding + 32_check_ldap_pointer.dpatch (Closes: #463322) + * add more authors from upstreams AUTHORS to changelog + * include a more explicit copyright notice to copyright to make lintian + happy + * include OpenSSL exception from upstream README into copyright + * make use of dh_* -i for binary-indep and dh_* -s for binary-arch + (Closes: #468467) + * remove some unneeded and commented debhelper scripts in binary-arch + * remove postgresql-dev from build-depends, thanks Lior Kaplan + for reminding (Closes: #429977) + + -- Jan Wagner Thu, 06 Mar 2008 22:07:31 +0100 + +nagios-plugins (1.4.11-1) unstable; urgency=low + + [ Jan Wagner ] + * new upstream release + * drop CVE-2007-5623.dpatch since it's included upstream + * fix Vcs- fields fields + * use $HOSTADDRESS$ instead of $HOSTNAME$ in dns.cfg (closes: #405244). + * add typo fix for check_mailq into 50_misc_typos.dpatch (closes: #435525). + * add 28_check_pgsql_include_for_8.3.dpatch to get check_pgsql working + together with libpq-dev (closes: #462509). + * add 29_check_ntp_fixsefault_deprecate.dpatch to fix segfaults for + check_ntp and check_ntp_time + * add 30_fix_check_ntp_options.dpatch to fix options help for check_ntp_peer + and check_ntp_time + * migrate ntp.cfg to new check_ntp_peer + + -- Sean Finney Sat, 26 Jan 2008 15:04:00 +0100 + +nagios-plugins (1.4.10-1) unstable; urgency=low + + [ Jan Wagner ] + * new upstream + - fixes CVE-2007-5198 (closes: #445475, #447639), thanks Steffen Joeris + and Nico Golde for NMU. + - fix for negate which may break existing commands: + stop evaluating command line options through shell twice + enforce a full path for the command to run + * add interface check with exclude to ifstatus.cfg + * add ssh check with possibility of port specification to ssh.cfg + * included fix for watch file provided by Raphael Geissert, thanks (closes: + #449671). + * include fix for several typos provided by Luca Falavigna, thanks (closes: + #453012). + * merge changes from and ack NMU. Thanks Nico Golde (closes: #448372). + * Don't ignore errors from make clean + * Bump standards version to 3.7.3 + * added Vcs- fields and Homepage into source header's field + * modify 00list so 06_checkircd.dpatch can get patched in + * removed libsnmp5-dev as depency option and turned around order of + libsnmp9-dev and libsnmp-dev, since only libsnmp-dev is in unstable and + libsnmp9-dev in stable + + -- Sean Finney Fri, 07 Dec 2007 00:55:42 +0100 + +nagios-plugins (1.4.8-2.2) unstable; urgency=high + + * Non-maintainer upload by testing-security team. + * Fix remote DoS which can be triggered by a remote attacker + via crafted snmpget replies (CVE-2007-5623) (Closes: #448372). + * Modifying CVE-2007-5198 patch since it is incomplete (Closes: #447639). + + -- Nico Golde Sun, 28 Oct 2007 16:15:54 +0100 + +nagios-plugins (1.4.8-2.1) unstable; urgency=high + + * Non-maintainer upload by the testing-security team + * Include CVS patch to fix buffer overflow in redir function in + check_http.c, which was caused by parsing HTTP redirect strings + using sscanf (Closes: #445475) + Fixes: CVE-2007-5198 + * Include fix for off-by-one error and a NULL pointer, which leads + to a segfault + + -- Steffen Joeris Sun, 14 Oct 2007 10:36:01 +0000 + +nagios-plugins (1.4.8-2) unstable; urgency=low + + * fix typo in upstream configure script which caused some plugins + to disappear (closes: #425758). thanks to Bernhard Schmidt for + catching it. + + -- sean finney Mon, 28 May 2007 19:39:24 +0200 + +nagios-plugins (1.4.8-1) unstable; urgency=low + + New upstream release. + + [jan wagner] + * add explicit IPv4 checks to disk.cfg, ftp.cfg, http.cfg, ldap.cfg, + mail.cfg, news.cfg, ping.cfg, pgsql.cfg, snmp.cfg, ssh.cfg, + tcp_udp.cfg and telnet.cfg + * add check_bgpstate script from contrib to nagios-plugins-standard + * add whois to Suggests of nagios-plugins-standard + * fixed static community string for check_snmp_bgpstate in snmp.cfg + (closes: #403892). + * remove static community string in ifstatus.cfg + * add check_mysql_database to mysql.cfg + * add check_cups to http.cfg + + [sean finney] + * the Architecture should be "all" for the empty nagios-plugins + metapackage (closes: #422083). + * merge changes from and ack NMU. Thanks to Michael Tautschnig + (closes: #420954). + * modify the Suggests to prefer nagios2 to nagios-text. + * remove the following patches, which have been included upstream: + - 28_check_tcp.expect_reporting.dpatch + - 29_check_tcp.check_jabber-returns-warning.dpatch + * update debian/rules to reflect that config.{sub,guess} have changed + location in the upstream tarball. + + -- sean finney Sun, 20 May 2007 20:29:13 +0200 + +nagios-plugins (1.4.5-2.1) unstable; urgency=low + + * Non-maintainer upload + * nagios-plugins-standard must have a versioned depends on + nagios-plugins-basic (Closes: #420954) + + -- Michael Tautschnig Fri, 18 May 2007 22:44:59 +0200 + +nagios-plugins (1.4.5-2) unstable; urgency=medium + + * fix for spurious conffile-type prompts from ucf, thanks to + Stephen Gran for catching this (closes: #400595). + + -- sean finney Wed, 06 Dec 2006 22:38:38 +0100 + +nagios-plugins (1.4.5-1) unstable; urgency=low + + * new upstream (bugfix only) release. the following patches + have been obsoleted: + - 27_is_hostname.dpatch + * fix for segfaulting check_radius plugin, thanks to Yasper + Casper for finding it (closes: #399532, #379788). + patch: 27_check_radius_segfault.dpatch + * regarding the fix for check_ups in the previous patch: both + the bug number and the attribution were incorrect. thanks are + due to Robbert Kouprie (closes: #398780). + + -- sean finney Mon, 20 Nov 2006 20:31:23 +0100 + +nagios-plugins (1.4.4-2) unstable; urgency=low + + * fix for implicit definition of basename function, thanks to + dann frazier for finding it (closes: #396814). + patch: 26_implicit-basename.dpatch + * aparently the check_ups fix caused problems as well as solved them. + until we ge a real fix for the problem i'm reverting the patch. + thanks to Michael Bussmann (closes: #398767). + * add '-' to allowable characters in is_hostname. thanks again to + Michael Bussmann (closes: #398767). + patch: 27_is_hostname.dpatch + + -- sean finney Fri, 17 Nov 2006 09:37:17 +0100 + +nagios-plugins (1.4.4-1) unstable; urgency=low + + [sean finney] + * new upstream release. actually, we've been basing previous versions + on cvs snapshots so the changes aren't that big. + * upstream includes fix for warn/crit handling in check_tcp based plugins + such as check_simap (closes: #351847). + * dpkg's conffile handling can't deal with migrating config files + from nagios-plugins to nagios-plugins-foo, so we're now managing + all the config files via ucf (closes: #339971). + * remove some unneeded build-deps, and bump Standards-Version + * fix for multiple expect strings in check_tcp.c. thanks to Ralph Rößner + for finding this (closes: #395176). + + -- sean finney Wed, 01 Nov 2006 22:57:16 +0100 + +nagios-plugins (1.4.3.0cvs.20060707-3) unstable; urgency=high + + [sean finney] + * to make backporting easier, change the build dep on libpq-dev + to libpq-dev | postgresql-dev. thanks to Jan Wagner for the + suggestion. + * fix for check_ldaps showing up in two packages (closes: #373926). + thanks to Jan for being persistant in pointing this out. + * that last one is rc, hence high urgency. + + -- sean finney Fri, 04 Aug 2006 08:57:33 -0700 + +nagios-plugins (1.4.3.0cvs.20060707-2) unstable; urgency=low + + [sean finney] + * whoops, new plugin check_mysql_query accidentally made the last + version's nagios-plugins-basic package depend on libmysqlclient15off. + + -- sean finney Sun, 09 Jul 2006 18:51:41 +0200 + +nagios-plugins (1.4.3.0cvs.20060707-1) unstable; urgency=low + + [sean finney] + * new release based on latest upstream CVS HEAD, as backporting some + of the changes would involve either massive patches to the autofoo + generated files (Makefile/Configure etc) or by changing the packages + to autogenerate the autofoo stuff as part of the build process, + neither of which i like. + * anyway, the goodies: + - upstream incorporated fix for F'ing TBFS due to the broken .la files + installed in the libradius-dev package + - new check_apt plugin to check that a host is up to date wrt the debian + package management system (run with --help for more information) + Closes: #317763. + - new check_ntp plugin written in C, which performs much faster and more + reliably than the perl plugin, and does everything natively + (sending/recieving the packets itself instead of parsing the output + of ntpdate/ntpq). Closes: #351257, #360549, #360774. + - as a result, we no longer need to depend on any of the NTP stuff. + * modified debian/control to reflect new lack of dependency on ntp + * modified debian/rules to keep check_ntp in the -basic package, as + there's no reason to keep it in standard now. + * finally incorporate martin pitt's request about transitioning to + the new postgres build system. Closes: #377201. + + [marc haber] + * make package build fail if /proc is not mounted, before I end up + filing that bug a fourth time. Closes: #344389, #354215 + + -- sean finney Sun, 04 Jun 2006 00:57:17 +0200 + +nagios-plugins (1.4.3-1) unstable; urgency=low + + * new upstream release. + + [sean finney] + * the following dpatches have been incorporated upstream and thus removed: + - 11_check_ups.c_perfdata_fix.dpatch + - 12_check_mysql.c_mysql_options.dpatch + - 15_check_mrtg_wtf_conditionals.dpatch + - 16_check_smtp_protocolfix.dpatch + - 17_check_smb_freespace.dpatch + - 19_check_disk_subdirs.dpatch + - 20_check_ntp_lessbeastlyregex.dpatch + - 21_de.po_fixes.dpatch + - 24_check_procs_localefix.dpatch + * the following dpatches have been modified to still apply against upstream + - 10_config.h_debiandefaults.dpatch + - 14_check_log_paths.dpatch + - 18_check_game_cmdline.dpatch + * removed the transitional (pre-sarge) fileutils dependency + (closes: #368718), thanks to Stefan Huehner for pointing this out. + * upstream now uses libtool, but the shipped libtool is out of date and + has problems building against radiusclient1-dev (which might not be + our fault, but...). so, for the time being we're shipping an updated + version of ltmain.sh in the diff (build depending on the newest version + of libtool is subobtimal for backporting). + * add --disable-rpath to configure options... arg, and i had to apply + another patch to ./configure to keep a -R from sneaking in and + deactivating it. + * upstream ./configure fails to automagically detect mysql installation now, + so modify debian/rules accordingly. + * modify debian/control to be more explicit about build-dependencies to + make life easier for backporting. + + -- sean finney Sat, 27 May 2006 20:03:31 +0200 + +nagios-plugins (1.4.2-7) unstable; urgency=medium + + [sean finney] + * update build dependencies to build against libmysqlclient15-dev. + fixes (now) rc bug, urgency bumped (closes: #343785). + * properly set LC_NUMERIC in check_procs. fix also committed for + next upstream release. thanks to Hadmut Danisch for + catching this (closes: #353201). + + -- sean finney Sat, 18 Feb 2006 13:56:25 +0100 + +nagios-plugins (1.4.2-6) unstable; urgency=low + + [sean finney] + * 10_config.h_debiandefaults.dpatch now also hardcodes nslookup, + removing the need for a couple more build-dependencies (dnsutils, + bind9-host | host). this also has the added benefit that the + build process doesn't require a working dns setup :) + * moved check_dig to -standard, as that's where check_dns (and + more importantly its configs and dependencies) are. + * moved check_ping to -basic. even though it means another + dependency in -basic, maintainer consensus is that it's + critical enough of a plugin that it should go in. + * split config for check_fping into fping.cfg. + + [marc haber] + * migrate package from CVS to svn + * add 23_check_axis.dpatch, making the package suiteable to + debian/-only layout + * convert to debian/-only layout + * add build-dependency on autotools-dev, add code to automatically + link in current config.guess, config.sub + + -- sean finney Mon, 23 Jan 2006 23:24:21 +0100 + +nagios-plugins (1.4.2-5) unstable; urgency=low + + * Sean Finney + - add documentation to README.Debian about the plugins needing setuid + root, why we don't install them setuid root by default, and some + recommended methods for dealing with this (closes: #289879). + - add documentation to README.Debian about the new package split. + - config.h_debiandefaults.dpatch now modifies common.h instead of + config.h.in, because the latter would sometimes cause build hosts + to spontaneously regenerate the file, overwriting our changes. + since all the plugins include common.h too... (closes: #336639). + - include some patches from "F.A.G. Luteijn" : + * dhcp.cfg (with notes added by me about needing setuid) + * disk.cfg (check_all_disks) + * disk-smb.cfg (seperated check_disk_smb commands) + * http.cfg (check_https_auth) + * check_disk_smb: allow checking disk usage via host addresses. + (closes: #310780). + + -- sean finney Mon, 31 Oct 2005 22:35:16 +0100 + +nagios-plugins (1.4.2-4) unstable; urgency=low + + * Sean Finney: + - only depend on ntp, not ntp | ntp-simple. hopefully this should + allow nagios-plugins to co-exist with openntpd et al. + - now building against libmysqlclient14-dev. + - updated Standards-Version to 3.6.2 + - nagios-plugins is now separated into 3 separate packages: + nagios-plugins, nagios-plugins-basic, and nagios-plugins-standard. + this should provide folks with a "basic" set of plugins as an + alternative to those who don't want to bring in so many dependencies + (specifically, users of nsca and nagios-nrpe-server). the original + package will depend on both of the new packages, for backwards + compatibility. the list of what-goes-where may change in future + updates, but nagios-plugins will always bring in everything. + contact me if you have specific preferences on how the layout should + be done (closes: #303996, #264194, #255438). + - another fix to check_mrtg, seems like the WARN and CRIT states + were working just fine, but there was no way for things to + be OK. whoops. thanks to uno takeshi for looking into this. + (closes: #335871). + - updated FSF address, couple other cosmetic lintian-related fixes. + + -- sean finney Wed, 26 Oct 2005 23:17:41 +0200 + +nagios-plugins (1.4.2-3) unstable; urgency=low + + * Sean Finney: + - include fix from Modesto Alexandre to correct paths in check_log + (closes: #296600). + - looks like upstream's check_mrtg has been broken for a while now. + now including a fix that i'll eventually move upstream. + (closes: #309673). + - include a fix to check_smtp to make it speak proper ehlo before + issueing a starttls command, and also check that the server + actually supports it before blindly continuing. thanks to + Jeroen van Wolffelaar for taking the time to point out the + details (closes: #285554). + - in the process of the above, also figured out how to get + check_smtp to play nicely with gnutls-based servers. + - check_disk once again will match non-mountpoint directories to + the closest parent mountpoint (closes: #296278). + - include jeroen's "less beastly" check_ntp sys.peer regex. + - fix for braindead command-line option parsing for freespace + in check_disk_smb (closes: #300701). + - updated the usage function in check_game to reflect changed + cmdline options (closes: #307905). + - upstream is now shipping an non-broken ipv6-capable check_ping, + with PING6_COMMAND properly set in config.h (closes: #309255). + - upstream check_mysql can now check slave status (closes: #278864). + + -- sean finney Tue, 11 Oct 2005 10:14:18 +0200 + +nagios-plugins (1.4.2-2) unstable; urgency=low + + * Sean Finney: + - ack, the perl plugins broke on the last upload, because "use lib" + wasn't being properly substituted in. fixed. (closes: #332667). + - include upstream fix for check_ups temperature perfdata. thanks + to Chris AtLee for originally reporting this (closes: #316534). + - stop mucking around with config.sub/config.guess in debian/rules. + - last update in the changelog was missing a colon on the following: + (closes: #312228, #306244, #308458, #327212, #316882). + - have check_mysql read in defaults from my.cnf (closes: #278817). + + -- sean finney Fri, 07 Oct 2005 22:19:09 +0200 + +nagios-plugins (1.4.2-1) unstable; urgency=low + + * New upstream release. + * Sean Finney: + - now managing nagios-plugins as part of the pkg-nagios alioth project. + - updated Maintainer field + - updated build-dependencies to build against libsnmp9-dev + - removed build-dependencies on exim4 | mail-transport-agent, ssh, fping, + qstat, smbclient, and ntp stuff. instead they are all have their + paths hardcoded into the build-process via dpatch file + 10_config.h_debiandefaults.dpatch (closes: #312333, #297708). + - added config option for ssmtp + - upstream is now accidentally deleting the check_ldaps plugin + during the build-process. whoops. + - removed unneccesary dpatch 09_pssyntax, massaged 08_subst.dpatch + into shape with new upstream version. + - added check_mysql_cmdlinecred to allow parsing of credentials on + the cmdline (closes: #314913). + - looks like the issue with check_load was previously resolved by + guido (closes: #305351). + - nagios and nagios-plugins no longer need to use update-nagios, as nagios + can natively scan /etc/nagios-plugins/config now: + (closes: #325893, #321939). + - i believe check_ldap's config is now correct (closes: #305720). + - removed references to check_nmap, which is generally superceded + by check_tcp. it still exists in the contrib directory of the + source, which may at some point be put in /usr/share/doc for those + who really want it (closes: #319997). + - include de.po patch from jens seidel (closes: #313960). + - upstream fix: all of the plugins should now be properly setting + locales, so problems like commas for decimal seperators should no + longer break plugins for people in certain locales: + (closes #312228, #306244, #308458, #327212, #316882). + - upstream fix: check_ntp now supports zero offset (closes: #276794). + - upstream fix: divide by zero check for check_swap (closes: #328603). + + -- sean finney Thu, 06 Oct 2005 05:02:36 -0400 + +nagios-plugins (1.4-6) unstable; urgency=low + + * Build-Depend on the *correct* libmysqlclient-dev + + -- Guido Trotter Sun, 8 May 2005 08:12:20 -0700 + +nagios-plugins (1.4-5) unstable; urgency=low + + * Fix Build-Dependencies for sarge as per + http://lists.debian.org/debian-release/2005/05/msg00442.html and following + + -- Guido Trotter Sat, 7 May 2005 18:19:32 -0700 + +nagios-plugins (1.4-4) unstable; urgency=medium + + * The "Upload after it's too late" release + * Make nagios-plugins depend on iputils-ping only (closes: #296295) + * Urgency medium because it fixes an important bug reported by lots + of people, and it doesn't change anything else + * This version should be the one sarge ships with, hopefully! + + -- Guido Trotter Tue, 3 May 2005 17:04:39 -0700 + +nagios-plugins (1.4-3) unstable; urgency=medium + + * Add back empty imap.cfg (closes: #296249) + * Remove --with-ping-command from configure (closes: #296295) + * Fix load.cfg (closes: #296254) + * Urgency medium because it fixes a segfault in check_ping + * Build depend on mail-transport-agent (mailq path) (closes: #297708) + + -- Guido Trotter Mon, 7 Mar 2005 04:31:49 +0000 + +nagios-plugins (1.4-2) unstable; urgency=low + + * Add information about update-nagios needed after re-configuration + (Shouldn't nagios document this? anyway...) (closes: #291224) + * Use --ssl in check_https (closes: #295917) + * Fix ps syntax (closes: #296003) + + -- Guido Trotter Sat, 19 Feb 2005 20:22:16 +0000 + +nagios-plugins (1.4-1) unstable; urgency=low + + * The "I'm still around" release + * New upstream version (closes: #294224) + * Remove useless patches: + 01_ldap21bind + 04_checkswap + 03_hostwithnumbers + 05_checkbreeze + 07_checkbyssh (apparently it wasn't considered a bug upstream) + * Fix argument number in check_ldap (closes: #281700) (Thanks Joerg) + * Fix hostname placeholder in mysql.cfg (closes: #281701) + * Don't list check_imap twice (closes: #280702) + * Add check_https command (closes: #292124) + * Add check_dig command (closes: #281020) + * Add check_breeze command (closes: #281019) + * Add dummy commands (closes: #281018) + * Add check_mailq_ commands for all supported mtas (closes: #281016, #282015) + * Add check_spop and check_simap commands (closes: #280700) + * Add check_nt command (closes: #294299) + * Fix check_load command (closes: #294298) + * Fix a reference to @libexec@ in snmp.cfg (closes: #276520) + + -- Guido Trotter Fri, 18 Feb 2005 07:50:28 +0000 + +nagios-plugins (1.3.1.0-12) unstable; urgency=low + + * Sorry for the multiple uploads trying to fix the problem... + Unfortunately I don't have any !i386 handy. :( + * This time #275803 should really be dealt with! + + -- Guido Trotter Wed, 13 Oct 2004 13:59:58 -0700 + +nagios-plugins (1.3.1.0-11) unstable; urgency=high + + * Hack subst.in to really solve the incorrect "use lib" on arches !i386 + forcing the correct (debian) path in (closes: #275803) + * urgency set to high because it solves an RC bug in sarge + + -- Guido Trotter Wed, 13 Oct 2004 08:23:53 -0700 + +nagios-plugins (1.3.1.0-10) unstable; urgency=low + + * The "Better late than never" release + * Include Tom Laermans mysql.cfg in pluginsconfig (closes: #267747) + * Include Tom Laermans imap.cfg in pluginsconfig (closes: #267953) + * Fix snmp_load typo (thanks to Raoul Borenius) (closes: #270276) + * Fix snmp_load typo (thanks to Raoul Borenius) (closes: #270276) + * Build-depend on mawk to try fixing #275803 (was that the culprit?) + + -- Guido Trotter Tue, 12 Oct 2004 20:44:51 -0700 + +nagios-plugins (1.3.1.0-9) unstable; urgency=high + + * Update debian/watch file + * Fix check_breeze (thanks to Peter Palfrader for noticing it was broken) + (closes: #265207) + * Add to 04_checkswap two patches from Sean Finney plus one from me + (to avoid it returning STATE_CRITICAL when no swap is configured) + (closes: #265152, #265154) + * Also import: + - Sven Velt patch for check_ircd (closes: #259720) + - Cyril Bouthors patch for check_by_ssh (closes: #257793) + * Urgency high so nagios and nagios-plugins stop running one after + the other to enter testing + * Sorry, the package splitting is still delayed for after sarge + + -- Guido Trotter Thu, 12 Aug 2004 16:13:35 +0200 + +nagios-plugins (1.3.1.0-8) unstable; urgency=low + + * Import a backport of check_swap from upstream CVS done by + "The Fungi" to make swap checking 2.6 + compatible (closes: #261151) + * Postpone package splitting, so this version can go in sarge + with nagios before we have to wait a bit in the NEW queue + + -- Guido Trotter Sun, 25 Jul 2004 11:34:01 +0200 + +nagios-plugins (1.3.1.0-7) unstable; urgency=low + + * Add 03_hostwithnumbers.dpatch written by me to correct the behaviour + of is_hostname() in utils.c about host components beginning with a + number (closes: #253620). Thanks to Andreas Edler who spotted + the problem. + + -- Guido Trotter Tue, 15 Jun 2004 15:37:48 +0200 + +nagios-plugins (1.3.1.0-6) unstable; urgency=low + + * Conflict with the current version of nagios (closes: #245607) + + -- Guido Trotter Sat, 24 Apr 2004 12:01:59 +0200 + +nagios-plugins (1.3.1.0-5) unstable; urgency=low + + * Move plugin configuration to /etc/nagios-plugins/config + * For the time beeing symlink from the original directory + + This should help nagios closing #241807 + + -- Guido Trotter Fri, 23 Apr 2004 09:06:51 +0200 + +nagios-plugins (1.3.1.0-4) unstable; urgency=low + + * Fix not considered args and broken example in check_disk (closes: #241833) + + -- Guido Trotter Mon, 5 Apr 2004 10:34:37 +0200 + +nagios-plugins (1.3.1.0-3) unstable; urgency=low + + * Take parameters for basic check_ping (closes: #238670) + * Add ssh.cfg and ldap.cfg (closes: #236781) + + -- Guido Trotter Sat, 3 Apr 2004 18:03:38 +0200 + +nagios-plugins (1.3.1.0-2) unstable; urgency=low + + * Recommend nagios-text | nagios + * Remove notify.cfg from distributed config files (closes: #234951) + + -- Guido Trotter Thu, 26 Feb 2004 22:41:56 +0100 + +nagios-plugins (1.3.1.0-1) unstable; urgency=low + + * The "lintian clean it" release + * Upstream version is 1.3.1, i've incremented the version number a bit in + order to upload a new source without the CVS directories, and so let + lintian not complain... + + -- Guido Trotter Tue, 24 Feb 2004 19:37:09 +0100 + +nagios-plugins (1.3.1-6) unstable; urgency=low + + * Depend only on ntp-simple instead of ntp (closes: #233267) + * Also in build-dependency use ntp-simple rather than ntp + + -- Guido Trotter Tue, 17 Feb 2004 21:03:58 +0100 + +nagios-plugins (1.3.1-5) unstable; urgency=low + + * Adapt the choosen ping command to the fact that configure + doesn't set PING_PACKETS_FIRST when PING_COMMAND is passed + from the command line (closes: #233010) + + -- Guido Trotter Mon, 16 Feb 2004 13:19:20 +0100 + +nagios-plugins (1.3.1-4) unstable; urgency=low + + * Pass --with-ping-command to configure, and relax the dependency on ping. + * Export a sane $PATH and pass it to configure (closes: #232498) + * Give full path of libexec dir to configure (closes: #232436) + * Remove empty dirs from debian/dirs + * Ship command configuration in /usr/share/nagios/pluginconfig + These files are generated passing the upstream command.cfg to + nagios' convertcfg, and then splitted up manually removing + definitions already shipped with nagios. Thanks to Nate Allen + who found out the solution. (closes: #232300) + + -- Guido Trotter Sat, 14 Feb 2004 13:20:55 +0100 + +nagios-plugins (1.3.1-3) unstable; urgency=low + + * Remove dependency on non-existent package "dqs" + * Pass --with-df-command="/bin/df -Pk" to configure, since compiling + on the autobuilders doesn't detect that (why?) + * Build-depend also on libkrb5-dev + + -- Guido Trotter Wed, 11 Feb 2004 17:03:23 +0100 + +nagios-plugins (1.3.1-2) unstable; urgency=low + + * Add some missing build dependencies that prevented nagios-plugins + from compiling + + -- Guido Trotter Wed, 11 Feb 2004 12:41:13 +0100 + +nagios-plugins (1.3.1-1) unstable; urgency=low + + * Initial Release (closes: #208218) + * I prefer having all the plugins in a single package: the installation size + is not so terrible + + -- Guido Trotter Sun, 1 Feb 2004 10:32:04 +0100 + --- nagios-plugins-1.4.12.orig/debian/nagios-plugins-standard.postrm.in +++ nagios-plugins-1.4.12/debian/nagios-plugins-standard.postrm.in @@ -0,0 +1,17 @@ +#!/bin/sh -e + +STD_PLUGINS="@STD_PLUGINS@" + +if [ "$1" = "purge" ]; then + if which ucf >/dev/null 2>&1; then + have_ucf="yes" + fi + for f in $STD_PLUGINS; do + rm -f /etc/nagios-plugins/config/${f}.cfg + if [ "$have_ucf" = "yes" ]; then + ucf --purge /etc/nagios-plugins/config/${f}.cfg + fi + done +fi + +#DEBHELPER# --- nagios-plugins-1.4.12.orig/debian/rules +++ nagios-plugins-1.4.12/debian/rules @@ -0,0 +1,195 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +PACKAGE = nagios-plugins + +include /usr/share/dpatch/dpatch.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +DEBIANDIR=$(CURDIR)/debian +NP_LIBEXEC:=/usr/lib/nagios/plugins +NP_BASIC_DIR:=$(DEBIANDIR)/nagios-plugins-basic +NP_BASIC_TEMPLATES:=$(NP_BASIC_DIR)/usr/share/nagios-plugins/templates-basic +NP_STD_DIR:=$(DEBIANDIR)/nagios-plugins-standard +NP_STD_TEMPLATES:=$(NP_STD_DIR)/usr/share/nagios-plugins/templates-standard + +std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \ + check_rpc check_snmp check_wave check_fping check_game \ + check_radius check_mysql check_mysql_query check_pgsql \ + check_disk_smb check_ldap check_ldaps \ + check_dns check_dig check_flexlm check_oracle + +basic_plugin_cfgs:=apt dhcp disk dummy ftp http load mail news ntp ping procs \ + real ssh tcp_udp telnet users +std_plugin_cfgs:=breeze disk-smb dns flexlm fping games hppjd ifstatus ldap \ + mrtg mysql netware nt pgsql radius rpc-nfs snmp vsz + +PATH = /bin:/sbin:/usr/bin:/usr/sbin + + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +config.status: configure + export PATH=$(PATH) + dh_testdir + + # if /proc is not mounted, check_nagios and check_procs are + # silently omitted from build. + @if ! [ -d /proc/1 ]; then \ + echo "nagios-plugins needs a mounted /proc to correctly build"; \ + exit 1; \ + fi + + ln -sf /usr/share/misc/config.sub build-aux + ln -sf /usr/share/misc/config.guess build-aux + rm -f config.cache + + # Add here commands to configure the package. + PGINCLUDE="-I`pg_config --includedir`" PGLIBS="-lpq -lcrypt" \ + CFLAGS="$(CFLAGS)" \ + ./configure \ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --libexecdir=${NP_LIBEXEC} \ + --with-perl=/usr/bin/perl \ + --with-openssl=/usr \ + --with-pgsql=/usr \ + --with-mysql=/usr \ + --with-proc-loadavg=/proc/loadavg \ + --with-ps-command="/bin/ps axwo 'stat uid pid ppid vsz rss pcpu comm args'" \ + --with-ps-format="%s %d %d %d %d %d %f %s %n" \ + --with-ps-cols=9 \ + --with-ps-varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" \ + --with-ping-command="/bin/ping -n -U -w %d -c %d %s" \ + --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" \ + --with-nslookup-command="/usr/bin/nslookup -sil" \ + --with-uptime-command="/usr/bin/uptime" \ + --with-rpcinfo-command="/usr/bin/rpcinfo" \ + --with-smbclient-command="/usr/bin/smbclient" \ + --with-snmpget-command="/usr/bin/snmpget" \ + --with-snmpgetnext-command="/usr/bin/snmpgetnext" \ + --with-qstat-command="/usr/bin/quakestat" \ + --with-fping-command="/usr/bin/fping" \ + --with-ssh-command="/usr/bin/ssh" \ + --with-mailq-command="/usr/bin/mailq" \ + --with-proc-meminfo="/proc/meminfo" \ + --with-dig-command="/usr/bin/dig" \ + --with-apt-get-command="/usr/bin/apt-get" \ + --disable-rpath + + +build: patch-stamp build-stamp + +build-stamp: config.status + dh_testdir + $(MAKE) + touch build-stamp + +clean: really-clean unpatch + +really-clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + find -type d -name autom4te.cache -print0 | xargs -0 -r rm -rf \; + -rm -f platform.h auto-include.h + find -type d -name build -print0 | xargs -0 -r rm -rf \; + find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \; + -rm -f $(DEBIANDIR)/nagios-plugins-basic.postrm $(DEBIANDIR)/nagios-plugins-standard.postrm + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/nagios-plugins. + $(MAKE) install DESTDIR=${NP_BASIC_DIR} + chmod 644 ${NP_BASIC_DIR}/usr/lib/nagios/plugins/utils.pm + # split up basic vs. standard plugins + for p in ${std_plugins}; do \ + mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/$$p ${NP_STD_DIR}/${NP_LIBEXEC}; \ + done + # now do the same for their configs, copying them into seperate + # "template" directories outside of /usr/share/doc for ucf to use. + for c in ${basic_plugin_cfgs}; do \ + cp $(DEBIANDIR)/pluginconfig/$${c}.cfg ${NP_BASIC_TEMPLATES}; \ + done + for c in ${std_plugin_cfgs}; do \ + cp $(DEBIANDIR)/pluginconfig/$${c}.cfg ${NP_STD_TEMPLATES}; \ + done + # install check_bgpstate from contrib + install -m 755 contrib/check_bgpstate.pl ${NP_STD_DIR}/${NP_LIBEXEC}/check_bgpstate + install -m 755 contrib/check_linux_raid.pl ${NP_STD_DIR}/${NP_LIBEXEC}/check_linux_raid + # dynamically create the postrm scripts using a template, so that we + # don't have to define the same list of plugin configs over and over. + sed -e 's/@BASIC_PLUGINS@/${basic_plugin_cfgs}/' \ + < $(DEBIANDIR)/nagios-plugins-basic.postrm.in \ + > $(DEBIANDIR)/nagios-plugins-basic.postrm + sed -e 's/@STD_PLUGINS@/${std_plugin_cfgs}/' \ + < $(DEBIANDIR)/nagios-plugins-standard.postrm.in \ + > $(DEBIANDIR)/nagios-plugins-standard.postrm + # copy our dpkg-sourced functions etc into place + mkdir -p ${NP_BASIC_DIR}/usr/share/nagios-plugins/dpkg + install -t ${NP_BASIC_DIR}/usr/share/nagios-plugins/dpkg \ + $(DEBIANDIR)/functions + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i ChangeLog + dh_installdocs -i + dh_installexamples -i command.cfg + dh_installman -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -s + dh_testroot -s + dh_installchangelogs -s ChangeLog + dh_installdocs -s + dh_installexamples -s command.cfg + dh_installman -s + dh_strip -s + dh_compress -s + dh_fixperms -s -X utils.pm + dh_installdeb -s + dh_shlibdeps -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- nagios-plugins-1.4.12.orig/debian/docs +++ nagios-plugins-1.4.12/debian/docs @@ -0,0 +1,6 @@ +FAQ +NEWS +README +LEGAL +REQUIREMENTS +SUPPORT --- nagios-plugins-1.4.12.orig/debian/nagios-plugins-basic.postinst +++ nagios-plugins-1.4.12/debian/nagios-plugins-basic.postinst @@ -0,0 +1,10 @@ +#!/bin/sh -e + +templdir=/usr/share/nagios-plugins/templates-basic +. /usr/share/nagios-plugins/dpkg/functions + +if [ "$1" = "configure" ]; then + register_cfgs $2 +fi + +#DEBHELPER# --- nagios-plugins-1.4.12.orig/debian/nagios-plugins-standard.dirs +++ nagios-plugins-1.4.12/debian/nagios-plugins-standard.dirs @@ -0,0 +1,3 @@ +usr/lib/nagios/plugins +etc/nagios-plugins/config +usr/share/nagios-plugins/templates-standard --- nagios-plugins-1.4.12.orig/debian/NEWS.Debian +++ nagios-plugins-1.4.12/debian/NEWS.Debian @@ -0,0 +1,16 @@ +nagios-plugins (1.4.12-1) unstable; urgency=low + + removed default port of check_radius definition in favor of the ability to + specify it as 4th argument. + + -- Jan Wagner Fri, 06 Jun 2008 12:25:59 +0200 + +nagios-plugins (1.4.5-3) unstable; urgency=low + + ifstatus.cfg has changed. Now you have to provide a community in the first + argument ($ARG1$). Description and IfIndex moved to second argument ($ARG2$). + + E.g.: use "check_ifstatus!public" instead of "check_ifstatus" as + check_command! + + -- Jan Wagner Thu, 11 Jan 2007 14:56:47 +0100 --- nagios-plugins-1.4.12.orig/debian/watch +++ nagios-plugins-1.4.12/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/nagiosplug/nagios-plugins-(\d+\.[\d\.a-z]+)\.tar\.gz --- nagios-plugins-1.4.12.orig/debian/dirs +++ nagios-plugins-1.4.12/debian/dirs @@ -0,0 +1 @@ +etc/nagios-plugins/config --- nagios-plugins-1.4.12.orig/debian/TODO +++ nagios-plugins-1.4.12/debian/TODO @@ -0,0 +1,28 @@ + +After sarge: + +- Remove the possibility to build with fileutils. + +- Now /usr/share/nagios/pluginconfig -> /etc/nagios-plugins/config + Remove the symlink af and conflict with nagios < (ver that reads from /etc) + + +These are the plugins which miss .cfg files: add them if someone asks: + +/usr/lib/nagios/plugins/check_ups +/usr/lib/nagios/plugins/check_mysql +/usr/lib/nagios/plugins/check_swap +/usr/lib/nagios/plugins/check_dig +/usr/lib/nagios/plugins/check_breeze +/usr/lib/nagios/plugins/check_disk_smb +/usr/lib/nagios/plugins/check_ircd +/usr/lib/nagios/plugins/check_log +/usr/lib/nagios/plugins/check_oracle +/usr/lib/nagios/plugins/check_sensors +/usr/lib/nagios/plugins/check_wave +/usr/lib/nagios/plugins/check_mailq +/usr/lib/nagios/plugins/check_simap +/usr/lib/nagios/plugins/check_spop + + + --- nagios-plugins-1.4.12.orig/debian/README.Debian +++ nagios-plugins-1.4.12/debian/README.Debian @@ -0,0 +1,39 @@ +================================================================================ +nagios-plugins for Debian +================================================================================ + +below is a collection of various bits of information that might be +helpful to users of nagios-plugins in debian. + +================================================================================ +different plugin packages and how to avoid installing massive dependencies +================================================================================ + +if you're frustrated by all the crap being brought in by nagios-plugins (for +example if you're installing nrpe or nsca on a remote host), try the +nagios-plugins-basic package. + +================================================================================ +plugins needing root privilege +================================================================================ + +the check_dhcp and check_icmp plugins require root privileges to +run, because of the low-level packet mangling that they perform. +but, in the interest of the "safe default", these plugins will not +be installed with the suid bit set. there are two recommended ways +about overriding this on your system: + +- set the suid bit with dpkg-statoverride: + +# dpkg-statoverride --update --add root nagios 4750 $plugin + +where $plugin is the specific plugin you want to grant such privileges. + +- use sudo to grant the permissions and modify your plugin config + +of these two, the first is recommended because it's the simplest and +has the same effect as the second. + + + -- sean finney Thu, 06 Oct 2005 04:48:16 -0400 + --- nagios-plugins-1.4.12.orig/debian/functions +++ nagios-plugins-1.4.12/debian/functions @@ -0,0 +1,16 @@ +# functions for use by nagios plugins maintainer scripts + +npconfdir=/etc/nagios-plugins/config + +# we now register all n-p config files via ucf. +register_cfgs(){ + # do this in a subshell so we don't screw up cwd + ( + cd $templdir + for f in *cfg; do + dest=${npconfdir}/$f + ucf $f $dest + done + ); +} + --- nagios-plugins-1.4.12.orig/debian/nagios-plugins-basic.postrm.in +++ nagios-plugins-1.4.12/debian/nagios-plugins-basic.postrm.in @@ -0,0 +1,17 @@ +#!/bin/sh -e + +BASIC_PLUGINS="@BASIC_PLUGINS@" + +if [ "$1" = "purge" ]; then + if which ucf >/dev/null 2>&1; then + have_ucf="yes" + fi + for f in $BASIC_PLUGINS; do + rm -f /etc/nagios-plugins/config/${f}.cfg + if [ "$have_ucf" = "yes" ]; then + ucf --purge /etc/nagios-plugins/config/${f}.cfg + fi + done +fi + +#DEBHELPER# --- nagios-plugins-1.4.12.orig/debian/copyright +++ nagios-plugins-1.4.12/debian/copyright @@ -0,0 +1,154 @@ +This package was debianized by Guido Trotter on +Sun, 1 Feb 2004 10:05:51 +0100. + +It was downloaded from http://nagiosplug.sourceforge.net/ + +Upstream Authors: Felipe Gustavo de Almeida + Ian Cass + Robert Dale + Karl DeBisschop + Ragnar Hojland Espinosa + Ethan Galstad + Bo Kersey + Pedro Leite + Richard Mayhew + Remi Paulmier + Didi Rieder + Tom Shields + Sean Finney + Jeremy T Bouse + Peter Bray + Gavin Carr + Matthias Eble + Subhendu Ghosh + Thomas Guyot-Sionnest + Stanley Hopcroft + Matthew Kent + Harper Mann + Benoit Mortier + Nathan Vonnahme + Ton Voon + Holger Weiss + Michael Wirtgen + +Copyright: + +Copyright (C) 1996, 2008 Free Software Foundation, Inc. + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +From upstream README: + + This software is released under the GNU Public License with the additional + exemption that compiling, linking and/or using OpenSSL is allowed. + +Files with differen Licenses: + + lib/*.c + lib/tests/*.c + plugins/*.c + plugins/runcmd.h + plugins/common.h + plugins/netutils.h + plugins-root/check_*.c + gl/basename.c + gl/cloexec.c + gl/creat-safer.c + gl/c-strtod.c + gl/d* + gl/e* + gl/fcntl* + gl/fd-safer.c + gl/float.* + gl/floorf.c + gl/fsusage* + gl/full* + gl/gethostname.c + gl/getloadavg.c + gl/getopt* + gl/intprops.h + gl/math.in.h + gl/mountlist* + gl/open-safer.c + gl/pipe-safer.c + gl/safe-* + gl/stdlib.in.h + gl/strerror.c + gl/stripslash.c + gl/unistd-* + gl/xalloc* + gl/xmalloc.c + gl/xstrndup* + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + + gl/alloca.in.h + gl/as* + gl/base64* + gl/config.charset + gl/float+.h + gl/gai_strerror.c + gl/getaddrinfo* + gl/gettext.h + gl/inet_ntop* + gl/localcharset* + gl/malloc.c + gl/netinet_in.in.h + gl/printf-* + gl/ref-* + gl/reg* + gl/size_max.h + gl/snprintf.c + gl/stdbool.in.h + gl/stdint.in.h + gl/stdio.in.h + gl/strdup.c + gl/string.in.h + gl/strndup.c + gl/strnlen.c + gl/sys_socket.in.h + gl/unistd.in.h + gl/v* + gl/wchar.in.h + gl/wctype.in.h + gl/xsize.h + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- nagios-plugins-1.4.12.orig/debian/nagios-plugins-basic.dirs +++ nagios-plugins-1.4.12/debian/nagios-plugins-basic.dirs @@ -0,0 +1,3 @@ +usr/lib/nagios/plugins +etc/nagios-plugins/config +usr/share/nagios-plugins/templates-basic --- nagios-plugins-1.4.12.orig/debian/pluginconfig/pgsql.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/pgsql.cfg @@ -0,0 +1,15 @@ +# 'check_pgsql' command definition +define command{ + command_name check_pgsql + command_line /usr/lib/nagios/plugins/check_pgsql -H '$HOSTADDRESS$' + } + +#### +# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems +#### + +# 'check_pgsql_4' command definition +define command{ + command_name check_pgsql_4 + command_line /usr/lib/nagios/plugins/check_pgsql -H '$HOSTADDRESS$' -4 + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/nt.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/nt.cfg @@ -0,0 +1,5 @@ +# 'check_nt' command definition +define command { + command_name check_nt + command_line /usr/lib/nagios/plugins/check_nt -H '$HOSTADDRESS$' -v '$ARG1$' +} --- nagios-plugins-1.4.12.orig/debian/pluginconfig/mail.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/mail.cfg @@ -0,0 +1,101 @@ +# 'check_pop' command definition +define command { + command_name check_pop + command_line /usr/lib/nagios/plugins/check_pop -H '$HOSTADDRESS$' +} + + +# 'check_smtp' command definition +define command { + command_name check_smtp + command_line /usr/lib/nagios/plugins/check_smtp -H '$HOSTADDRESS$' +} + +# 'check_ssmtp' command definition +define command { + command_name check_ssmtp + command_line /usr/lib/nagios/plugins/check_ssmtp -H '$HOSTADDRESS$' +} + +# 'check_imap' command definition +define command { + command_name check_imap + command_line /usr/lib/nagios/plugins/check_imap -H '$HOSTADDRESS$' +} + +# 'check_spop' command definition +define command { + command_name check_spop + command_line /usr/lib/nagios/plugins/check_pop -p 995 -H '$HOSTADDRESS$' -S +} + + +# 'check_simap' command definition +define command { + command_name check_simap + command_line /usr/lib/nagios/plugins/check_imap -p 993 -H '$HOSTADDRESS$' -S +} + +# 'check-mailq' for sendmail +define command { + command_name check_mailq_sendmail + command_line /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M sendmail +} + +# 'check-mailq' for postfix +define command { + command_name check_mailq_postfix + command_line /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M postfix +} + +# 'check-mailq' for exim +define command { + command_name check_mailq_exim + command_line /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M exim +} + +# 'check-mailq' for qmail +define command { + command_name check_mailq_qmail + command_line /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M qmail +} + +#### +# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems +#### + +# 'check_pop_4' command definition +define command { + command_name check_pop_4 + command_line /usr/lib/nagios/plugins/check_pop -H '$HOSTADDRESS$' -4 +} + +# 'check_smtp_4' command definition +define command { + command_name check_smtp_4 + command_line /usr/lib/nagios/plugins/check_smtp -H '$HOSTADDRESS$' -4 +} + +# 'check_ssmtp_4' command definition +define command { + command_name check_ssmtp_4 + command_line /usr/lib/nagios/plugins/check_ssmtp -H '$HOSTADDRESS$' -4 +} + +# 'check_imap_4' command definition +define command { + command_name check_imap_4 + command_line /usr/lib/nagios/plugins/check_imap -H '$HOSTADDRESS$' -4 +} + +# 'check_spop_4' command definition +define command { + command_name check_spop_4 + command_line /usr/lib/nagios/plugins/check_pop -p 995 -H '$HOSTADDRESS$' -S -4 +} + +# 'check_simap_4' command definition +define command { + command_name check_simap_4 + command_line /usr/lib/nagios/plugins/check_imap -p 993 -H '$HOSTADDRESS$' -S -4 +} --- nagios-plugins-1.4.12.orig/debian/pluginconfig/radius.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/radius.cfg @@ -0,0 +1,6 @@ +# 'check_radius' command definition +define command{ + command_name check_radius + command_line /usr/lib/nagios/plugins/check_radius -F /etc/radiusclient/radiusclient.conf -H '$HOSTADDRESS$' -P '$ARG4$' -t '$ARG3$' -u '$ARG1$' -p '$ARG2$' + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/flexlm.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/flexlm.cfg @@ -0,0 +1,6 @@ +# 'check_flexlm' command definition +define command{ + command_name check_flexlm + command_line /usr/lib/nagios/plugins/check_flexlm -F '$ARG1$' + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/dummy.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/dummy.cfg @@ -0,0 +1,29 @@ +# return-ok definition +define command { + command_name return-ok + command_line /usr/lib/nagios/plugins/check_dummy 0 +} + +# return-warning definition +define command { + command_name return-warning + command_line /usr/lib/nagios/plugins/check_dummy 1 +} + +# return-critical definition +define command { + command_name return-critical + command_line /usr/lib/nagios/plugins/check_dummy 2 +} + +# return-unknown definition +define command { + command_name return-unknown + command_line /usr/lib/nagios/plugins/check_dummy 3 +} + +# return-numeric definition +define command { + command_name return-numeric + command_line /usr/lib/nagios/plugins/check_dummy '$ARG1$' +} --- nagios-plugins-1.4.12.orig/debian/pluginconfig/telnet.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/telnet.cfg @@ -0,0 +1,15 @@ +# 'check_telnet' command definition +define command{ + command_name check_telnet + command_line /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p 23 + } + +#### +# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems +#### + +# 'check_telnet_4' command definition +define command{ + command_name check_telnet_4 + command_line /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p 23 -4 + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/ssh.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/ssh.cfg @@ -0,0 +1,27 @@ +# 'check_ssh' command definition +define command{ + command_name check_ssh + command_line /usr/lib/nagios/plugins/check_ssh '$HOSTADDRESS$' + } + +# 'check_ssh_port' command definition +define command{ + command_name check_ssh_port + command_line /usr/lib/nagios/plugins/check_ssh -p '$ARG1$' '$HOSTADDRESS$' + } + +#### +# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems +#### + +# 'check_ssh_4' command definition +define command{ + command_name check_ssh_4 + command_line /usr/lib/nagios/plugins/check_ssh -4 '$HOSTADDRESS$' + } + +# 'check_ssh_port_4' command definition +define command{ + command_name check_ssh_port_4 + command_line /usr/lib/nagios/plugins/check_ssh -4 -p '$ARG1$' '$HOSTADDRESS$' + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/ping.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/ping.cfg @@ -0,0 +1,72 @@ +# 'check_ping' command definition +define command{ + command_name check_ping + command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w '$ARG1$' -c '$ARG2$' + } + + +# 'check-host-alive' command definition +define command{ + command_name check-host-alive + command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 + } + + +# 'check-printer-alive' command definition +define command{ + command_name check-printer-alive + command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 + } + + +# 'check-switch-alive' command definition +define command{ + command_name check-switch-alive + command_line /usr/lib/nagios/plugins/check_ping '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 + } + + +# 'check-router-alive' command definition +define command{ + command_name check-router-alive + command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 + } + +#### +# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems +#### + +# 'check_ping_4' command definition +define command{ + command_name check_ping_4 + command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w '$ARG1$' -c '$ARG2$' -4 + } + + +# 'check-host-alive_4' command definition +define command{ + command_name check-host-alive_4 + command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4 + } + + +# 'check-printer-alive_4' command definition +define command{ + command_name check-printer-alive_4 + command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4 + } + + +# 'check-switch-alive_4' command definition +define command{ + command_name check-switch-alive_4 + command_line /usr/lib/nagios/plugins/check_ping '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4 + } + + +# 'check-router-alive_4' command definition +define command{ + command_name check-router-alive_4 + command_line /usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4 + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/tcp_udp.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/tcp_udp.cfg @@ -0,0 +1,27 @@ +# 'check_tcp' command definition +define command{ + command_name check_tcp + command_line /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p '$ARG1$' + } + +# 'check_udp' command definition +define command{ + command_name check_udp + command_line /usr/lib/nagios/plugins/check_udp -H '$HOSTADDRESS$' -p '$ARG1$' + } + +#### +# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems +#### + +# 'check_tcp_4' command definition +define command{ + command_name check_tcp_4 + command_line /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p '$ARG1$' -4 + } + +# 'check_udp_4' command definition +define command{ + command_name check_udp_4 + command_line /usr/lib/nagios/plugins/check_udp -H '$HOSTADDRESS$' -p '$ARG1$' -4 + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/ifstatus.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/ifstatus.cfg @@ -0,0 +1,23 @@ +# 'check_ifstatus' command definition +define command{ + command_name check_ifstatus + command_line /usr/lib/nagios/plugins/check_ifstatus -H '$HOSTADDRESS$' -C '$ARG1$' + } + +# 'check_ifstatus_exclude' command definition +define command{ + command_name check_ifstatus_exclude + command_line /usr/lib/nagios/plugins/check_ifstatus -H '$HOSTADDRESS$' -C '$ARG1$' -x '$ARG2$' + } + +# 'check_ifoperstatus_ifindex' command definition +define command{ + command_name check_ifoperstatus_ifindex + command_line /usr/lib/nagios/plugins/check_ifoperstatus -H '$HOSTADDRESS$' -C '$ARG1$' -k '$ARG2$' + } + +# 'check_ifoperstatus_ifdescr' command definition +define command{ + command_name check_ifoperstatus_ifdescr + command_line /usr/lib/nagios/plugins/check_ifoperstatus -H '$HOSTADDRESS$' -C '$ARG1$' -d '$ARG2$' + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/netware.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/netware.cfg @@ -0,0 +1,84 @@ +# 'check_netware_logins' command definition +define command{ + command_name check_netware_logins + command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOGINS" -w '$ARG1$' -c '$ARG2$' + } + + +# 'check_nwstat_conns' command definition +define command{ + command_name check_nwstat_conns + command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v CONNS -w '$ARG1$' -c '$ARG2$' + } + + +# 'check_netware_1load' command definition +define command{ + command_name check_netware_1load + command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOAD1" -w 70 -c 90 + } + + +# 'check_netware_5load' command definition +define command{ + command_name check_netware_5load + command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOAD5" -w 70 -c 90 + } + + +# 'check_netware_15load' command definition +define command{ + command_name check_netware_15load + command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOAD15" -w 70 -c 90 + } + + +# 'check_nwstat_vol_p' command definition +define command{ + command_name check_nwstat_vol_p + command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v VPF'$ARG1$' -w '$ARG2$' -c '$ARG3$' + } + + +# 'check_nwstat_vol_k' command definition +define command{ + command_name check_nwstat_vol_k + command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v VKF'$ARG1$' -w '$ARG2$' -c '$ARG3$' + } + + +# 'check_nwstat_ltch' command definition +define command{ + command_name check_nwstat_ltch + command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v LTCH -w '$ARG1$' -c '$ARG2$' + } + + +# 'check_nwstat_puprb' command definition +define command{ + command_name check_nwstat_puprb + command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v PUPRB -w '$ARG1$' -c '$ARG2$' + } + + +# 'check_nwstat_dsdb' command definition +define command{ + command_name check_nwstat_dsdb + command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v DSDB + } + + +# 'check_netware_abend' command definition +define command{ + command_name check_netware_abend + command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "ABENDS" -w 10 -c 30 + } + + +# 'check_nwstat_csprocs' command definition +define command{ + command_name check_nwstat_csprocs + command_line /usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v CSPROCS -w '$ARG1$' -c '$ARG2$' + } + + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/mysql.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/mysql.cfg @@ -0,0 +1,17 @@ +# 'check_mysql' command definition +define command{ + command_name check_mysql + command_line /usr/lib/nagios/plugins/check_mysql -H '$HOSTADDRESS$' +} + +# 'check_mysql_cmdlinecred' command definition +define command{ + command_name check_mysql_cmdlinecred + command_line /usr/lib/nagios/plugins/check_mysql -H '$HOSTADDRESS$' -u '$ARG1$' -p '$ARG2$' +} + +# 'check_mysql_database' command definition +define command{ + command_name check_mysql_database + command_line /usr/lib/nagios/plugins/check_mysql -d '$ARG3$' -H '$HOSTADDRESS$' -u '$ARG1$' -p '$ARG2$' +} --- nagios-plugins-1.4.12.orig/debian/pluginconfig/disk-smb.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/disk-smb.cfg @@ -0,0 +1,54 @@ +# 'check_disk_smb' command definition +define command{ + command_name check_disk_smb + command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' + } + + +# 'check_disk_smb_workgroup' command definition +define command{ + command_name check_disk_smb_workgroup + command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -W '$ARG3$' + } + + +# 'check_disk_smb_host' command definition +define command{ + command_name check_disk_smb_host + command_line /usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' + } + + +# 'check_disk_smb_workgroup_host' command definition +define command{ + command_name check_disk_smb_workgroup_host + command_line /usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' -W '$ARG3$' + } + + +# 'check_disk_smb_user' command definition +define command{ + command_name check_disk_smb_user + command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -u '$ARG3$' -p '$ARG4$' -w '$ARG5$' -c '$ARG6$' + } + + +# 'check_disk_smb_workgroup_user' command definition +define command{ + command_name check_disk_smb_workgroup_user + command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -W '$ARG3$' -u '$ARG4$' -p '$ARG5$' + } + + +# 'check_disk_smb_host_user' command definition +define command{ + command_name check_disk_smb_host_user + command_line /usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' -u '$ARG3$' -p '$ARG4$' + } + + +# 'check_disk_smb_workgroup_host_user' command definition +define command{ + command_name check_disk_smb_workgroup_host_user + command_line /usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' -W '$ARG3$' -u '$ARG4$' -p '$ARG5$' + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/snmp.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/snmp.cfg @@ -0,0 +1,139 @@ +# 'snmp_load' command definition +define command{ + command_name snmp_load + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.10.1.5.1,.1.3.6.1.4.1.2021.10.1.5.2,.1.3.6.1.4.1.2021.10.1.5.3 -w :'$ARG2$',:'$ARG3$',:'$ARG4$' -c :'$ARG5$',:'$ARG6$',:'$ARG7$' -l load + } + + +# 'snmp_cpustats' command definition +define command{ + command_name snmp_cpustats + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.11.9.0,.1.3.6.1.4.1.2021.11.10.0,.1.3.6.1.4.1.2021.11.11.0 -l 'CPU usage (user system idle)' -u '%' + } + + +# 'snmp_procname' command definition +define command{ + command_name snmp_procname + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.2.1.5.'$ARG2$' -w '$ARG3$':'$ARG4$' -c '$ARG5$':'$ARG6$' + } + + +# 'snmp_disk' command definition +define command{ + command_name snmp_disk + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.9.1.7.'$ARG2$',.1.3.6.1.4.1.2021.9.1.9.'$ARG2$' -w '$ARG3$':,:'$ARG4$' -c '$ARG5$':,:'$ARG6$' -u 'kB free (','% used)' -l 'disk space' + } + + +# 'snmp_mem' command definition +define command{ + command_name snmp_mem + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.4.6.0,.1.3.6.1.4.1.2021.4.5.0 -w '$ARG2$': -c '$ARG3$': + } + + +# 'snmp_swap' command definition +define command{ + command_name snmp_swap + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.4.4.0,.1.3.6.1.4.1.2021.4.3.0 -w '$ARG2$': -c '$ARG3$': + } + + +# 'snmp_procs' command definition +define command{ + command_name snmp_procs + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrSystem.hrSystemProcesses -w :'$ARG2$' -c :'$ARG3$' -l processes + } + + +# 'snmp_users' command definition +define command{ + command_name snmp_users + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrSystem.hrSystemNumUsers -w :'$ARG2$' -c :'$ARG3$' -l users + } + + +# 'snmp_mem2' command definition +define command{ + command_name snmp_mem2 + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$' + } + + +# 'snmp_swap2' command definition +define command{ + command_name snmp_swap2 + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$' + } + + +# 'snmp_mem3' command definition +define command{ + command_name snmp_mem3 + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$' + } + + +# 'snmp_swap3' command definition +define command{ + command_name snmp_swap3 + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$' + } + + +# 'snmp_disk2' command definition +define command{ + command_name snmp_disk2 + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$' -w '$ARG3$' -c '$ARG4$' + } + + +# 'snmp_tcpopen' command definition +define command{ + command_name snmp_tcpopen + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o tcp.tcpCurrEstab.0 -w '$ARG2$' -c '$ARG3$' + } + + +# 'snmp_tcpstats' command definition +define command{ + command_name snmp_tcpstats + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o tcp.tcpActiveOpens.0,tcp.tcpPassiveOpens.0,tcp.tcpInSegs.0,tcp.tcpOutSegs.0,tcp.tcpRetransSegs.0 -l 'TCP stats' + } + + +# 'check_snmp_bgpstate' command definition +define command{ + command_name check_snmp_bgpstate + command_line /usr/lib/nagios/plugins/check_bgpstate '$HOSTADDRESS$' -c '$ARG1$' + } + + +# 'check_netapp_uptime' command definition +define command{ + command_name check_netapp_uptime + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.2.1.1.3.0 --delimiter=')' -l "Uptime is" + } + + +# 'check_netapp_cpuload' command definition +define command{ + command_name check_netapp_cpuload + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.789.1.2.1.3.0 -w 90 -c 95 -u '%' -l "CPU LOAD " + } + + +# 'check_netapp_numdisks' command definition +define command{ + command_name check_netapp_numdisks + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.789.1.6.4.1.0,.1.3.6.1.4.1.789.1.6.4.2.0,.1.3.6.1.4.1.789.1.6.4.8.0,.1.3.6.1.4.1.789.1.6.4.7.0 -u 'Total Disks','Active','Spare','Failed' -l "" + } + + +# 'check_compaq_thermalCondition' command definition +define command{ + command_name check_compaq_thermalCondition + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.232.6.2.1.0,.1.3.6.1.4.1.232.6.2.2.0,.1.3.6.1.4.1.232.6.2.3.0,.1.3.6.1.4.1.232.6.2.4.0 -u 'ThermalCondition','ThermalTemp','ThermalSystem','ThermalCPUFan' -w 2:2,2:2,2:2,2:2 -c 1:2,1:2,1:2,1:2 -l "Thermal status " + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/dhcp.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/dhcp.cfg @@ -0,0 +1,15 @@ +# note: these plugins require root privilege. see README.Debian for +# more information on how it is recommended that you do this. + +# 'check_dhcp' command definition +define command{ + command_name check_dhcp + command_line /usr/lib/nagios/plugins/check_dhcp -s '$HOSTADDRESS$' + } + +# 'check_dhcp_interface' command definition +define command{ + command_name check_dhcp_interface + command_line /usr/lib/nagios/plugins/check_dhcp -s '$HOSTADDRESS$' -i '$ARG1$' + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/http.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/http.cfg @@ -0,0 +1,111 @@ +# 'check_http' command definition +define command{ + command_name check_http + command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' + } + +# 'check_http_hostname' command definition +define command{ + command_name check_httpname + command_line /usr/lib/nagios/plugins/check_http -H '$HOSTNAME' -I '$HOSTADDRESS$' + } + +# 'check_http2' command definition +define command{ + command_name check_http2 + command_line /usr/lib/nagios/plugins/check_http -H '$ARG1$' -I '$HOSTADDRESS$' -w '$ARG2$' -c '$ARG3$' + } + +# 'check_squid' command definition +define command{ + command_name check_squid + command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p '$ARG1$' -u '$ARG2$' -e 'HTTP/1.0 200 OK' + } + +# 'check_https' command definition +define command{ + command_name check_https + command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' + } + +# 'check_https_hostname' command definition +define command{ + command_name check_https_hostname + command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$' + } + +# 'check_https_auth' command definition +define command{ + command_name check_https_auth + command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -a '$ARG1$' + } + +# 'check_https_auth_hostname' command definition +define command{ + command_name check_https_auth_hostname + command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$' + } + +# 'check_cups' command definition +define command{ + command_name check_cups + command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p 631 + } + +#### +# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems +#### + +# 'check_http_4' command definition +define command{ + command_name check_http_4 + command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -4 + } + +# 'check_http_hostname_4' command definition +define command{ + command_name check_httpname_4 + command_line /usr/lib/nagios/plugins/check_http -H '$HOSTNAME$' -I '$HOSTADDRESS$' -4 + } + +# 'check_http2_4' command definition +define command{ + command_name check_http2_4 + command_line /usr/lib/nagios/plugins/check_http -H '$ARG1$' -I '$HOSTADDRESS$' -w '$ARG2$' -c '$ARG3$' -4 + } + +# 'check_squid_4' command definition +define command{ + command_name check_squid_4 + command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p '$ARG1$' -u '$ARG2$' -e 'HTTP/1.0 200 OK' -4 + } + +# 'check_https_4' command definition +define command{ + command_name check_https_4 + command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -4 + } + +# 'check_https_hostname_4' command definition +define command{ + command_name check_https_hostname_4 + command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$' -4 + } + +# 'check_https_auth_4' command definition +define command{ + command_name check_https_auth_4 + command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -a '$ARG1$' -4 + } + +# 'check_https_auth_hostname_4' command definition +define command{ + command_name check_https_auth_hostname_4 + command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME' -I '$HOSTADDRESS$' -4 + } + +# 'check_cups_4' command definition +define command{ + command_name check_cups_4 + command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p 631 -4 + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/load.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/load.cfg @@ -0,0 +1,6 @@ +# 'check_load' command definition +define command{ + command_name check_load + command_line /usr/lib/nagios/plugins/check_load --warning='$ARG1$,$ARG2$,$ARG3$' --critical='$ARG4$,$ARG5$,$ARG6$' + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/ldap.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/ldap.cfg @@ -0,0 +1,27 @@ +# 'check_ldap' command definition +define command{ + command_name check_ldap + command_line /usr/lib/nagios/plugins/check_ldap -H '$HOSTADDRESS$' -b '$ARG1$' + } + +# 'check_ldaps' command definition +define command{ + command_name check_ldaps + command_line /usr/lib/nagios/plugins/check_ldaps -H '$HOSTADDRESS$' -b '$ARG1$' + } + +#### +# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems +#### + +# 'check_ldap_4' command definition +define command{ + command_name check_ldap_4 + command_line /usr/lib/nagios/plugins/check_ldap -H '$HOSTADDRESS$' -b '$ARG1$' -4 + } + +# 'check_ldaps_4' command definition +define command{ + command_name check_ldaps_4 + command_line /usr/lib/nagios/plugins/check_ldaps -H '$HOSTADDRESS$' -b '$ARG1$' -4 + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/vsz.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/vsz.cfg @@ -0,0 +1,6 @@ +# 'check_vsz' command definition +define command{ + command_name check_vsz + command_line /usr/lib/nagios/plugins/check_vsz -w 8096 -c 16182 -C httpd + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/real.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/real.cfg @@ -0,0 +1,13 @@ +# 'check_real_url' command definition +define command{ + command_name check_real_url + command_line /usr/lib/nagios/plugins/check_real '$HOSTADDRESS$' -p '$ARG1$' -wt '$ARG2$' -ct '$ARG3$' -to 5 -u '$ARG4$' + } + + +# 'check_real' command definition +define command{ + command_name check_real + command_line /usr/lib/nagios/plugins/check_real '$HOSTADDRESS$' -p '$ARG1$' -wt '$ARG2$' -ct '$ARG3$' -to 5 + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/apt.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/apt.cfg @@ -0,0 +1,12 @@ +# 'check_apt' command definition +define command{ + command_name check_apt + command_line /usr/lib/nagios/plugins/check_apt + } + +# 'check_apt_distupgrade' command definition +define command{ + command_name check_apt_distupgrade + command_line /usr/lib/nagios/plugins/check_apt -d + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/dns.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/dns.cfg @@ -0,0 +1,11 @@ +# 'check_dns' command definition +define command{ + command_name check_dns + command_line /usr/lib/nagios/plugins/check_dns -H www.google.com -s '$HOSTADDRESS$' +} + +# 'check_dig' command definition +define command{ + command_name check_dig + command_line /usr/lib/nagios/plugins/check_dig -H '$HOSTADDRESS$' -l '$ARG1$' +} --- nagios-plugins-1.4.12.orig/debian/pluginconfig/procs.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/procs.cfg @@ -0,0 +1,20 @@ +# 'check_procs' command definition +define command{ + command_name check_procs + command_line /usr/lib/nagios/plugins/check_procs -w '$ARG1$' -c '$ARG2$' + } + + +# 'check_procs_zombie' command definition +define command{ + command_name check_procs_zombie + command_line /usr/lib/nagios/plugins/check_procs -w '$ARG1$' -c '$ARG2$' -s Z + } + + +# 'check_procs_httpd' command definition +define command{ + command_name check_procs_httpd + command_line /usr/lib/nagios/plugins/check_procs -w 5:'$ARG1$' -c 1:'$ARG2$' -C httpd + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/ftp.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/ftp.cfg @@ -0,0 +1,15 @@ +# 'check_ftp' command definition +define command{ + command_name check_ftp + command_line /usr/lib/nagios/plugins/check_ftp -H '$HOSTADDRESS$' + } + +#### +# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems +#### + +# 'check_ftp_4' command definition +define command{ + command_name check_ftp_4 + command_line /usr/lib/nagios/plugins/check_ftp -H '$HOSTADDRESS$' -4 + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/disk.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/disk.cfg @@ -0,0 +1,27 @@ +# 'check_disk' command definition +define command{ + command_name check_disk + command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -p '$ARG3$' + } + +# 'check_all_disks' command definition +define command{ + command_name check_all_disks + command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' + } + +# 'ssh_disk' command definition +define command{ + command_name ssh_disk + command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$' -c '\''$ARG2$'\'' -p '\''$ARG3$'\' + } + +#### +# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems +#### + +# 'ssh_disk_4' command definition +define command{ + command_name ssh_disk_4 + command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$'\'' -c '\''$ARG2$'\'' -p '\''$ARG3$'\' -4 + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/games.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/games.cfg @@ -0,0 +1,14 @@ +# 'check_quake' command definition +define command{ + command_name check_quake + command_line /usr/lib/nagios/plugins/check_game qs '$HOSTADDRESS$' + } + + +# 'check_unreal' command definition +define command{ + command_name check_unreal + command_line /usr/lib/nagios/plugins/check_game uns '$HOSTADDRESS$' -P '$ARG1$' -p 8 + } + + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/ntp.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/ntp.cfg @@ -0,0 +1,17 @@ +# 'check_ntp' command definition +define command{ + command_name check_ntp + command_line /usr/lib/nagios/plugins/check_ntp_peer -H '$HOSTADDRESS$' + } + +# 'check_ntp_ntpq' command definition +define command{ + command_name check_ntp_ntpq + command_line /usr/lib/nagios/plugins/check_ntp_peer -H '$HOSTADDRESS$' -j 10 -k 15 + } + +# 'check_time' command definition +define command{ + command_name check_time + command_line /usr/lib/nagios/plugins/check_time -H '$HOSTADDRESS$' + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/users.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/users.cfg @@ -0,0 +1,6 @@ +# 'check_users' command definition +define command{ + command_name check_users + command_line /usr/lib/nagios/plugins/check_users -w '$ARG1$' -c '$ARG2$' + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/fping.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/fping.cfg @@ -0,0 +1,5 @@ +# 'check-fast-alive' command definition +define command{ + command_name check-fast-alive + command_line /usr/lib/nagios/plugins/check_fping -H '$HOSTADDRESS$' + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/hppjd.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/hppjd.cfg @@ -0,0 +1,6 @@ +# 'check_hpjd' command definition +define command{ + command_name check_hpjd + command_line /usr/lib/nagios/plugins/check_hpjd -H '$HOSTADDRESS$' -C public + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/rpc-nfs.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/rpc-nfs.cfg @@ -0,0 +1,14 @@ + +# 'check-rpc' command definition +define command{ + command_name check-rpc + command_line /usr/lib/nagios/plugins/check_rpc -H '$HOSTADDRESS$' -C '$ARG1$' + } + + +# 'check-nfs' command definition +define command{ + command_name check-nfs + command_line /usr/lib/nagios/plugins/check_rpc -H '$HOSTADDRESS$' -C nfs -c2,3 + } + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/mrtg.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/mrtg.cfg @@ -0,0 +1,14 @@ +# 'check_mrtg' command definition +define command{ + command_name check_mrtg + command_line /usr/lib/nagios/plugins/check_mrtg '$ARG1$' 10 AVG '$ARG2$' '$ARG3$' '$ARG4$' '$ARG5$' '$ARG6$' + } + + +# 'traffic_average' command definition +define command{ + command_name traffic_average + command_line /usr/lib/nagios/plugins/check_mrtgtraf '$ARG1$' 10 AVG '$ARG2$' '$ARG3$' '$ARG4$' '$ARG5$' + } + + --- nagios-plugins-1.4.12.orig/debian/pluginconfig/news.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/news.cfg @@ -0,0 +1,15 @@ +# 'check_nntp' command definition +define command{ + command_name check_nntp + command_line /usr/lib/nagios/plugins/check_nntp -H '$HOSTADDRESS$' + } + +#### +# use these checks, if you want to test IPv4 connectivity on IPv6 enabled systems +#### + +# 'check_nntp_4' command definition +define command{ + command_name check_nntp_4 + command_line /usr/lib/nagios/plugins/check_nntp -H '$HOSTADDRESS$' -4 + } --- nagios-plugins-1.4.12.orig/debian/pluginconfig/breeze.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/breeze.cfg @@ -0,0 +1,5 @@ +# 'check_breeze' command definition +define command { + command_name check_breeze + command_line /usr/lib/nagios/plugins/check_breeze -H '$HOSTADDRESS$' -w '$ARG1$' -c '$ARG2$' +} --- nagios-plugins-1.4.12.orig/debian/patches/22_check_smb_hostaddress.dpatch +++ nagios-plugins-1.4.12/debian/patches/22_check_smb_hostaddress.dpatch @@ -0,0 +1,89 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 22_check_smb_hostaddress.dpatch by +## +## DP: Allow checking disk usage via host addresses. + +@DPATCH@ +diff -urNad sid~/plugins-scripts/check_disk_smb.pl sid/plugins-scripts/check_disk_smb.pl +--- sid~/plugins-scripts/check_disk_smb.pl 2005-10-31 21:44:20.000000000 +0100 ++++ sid/plugins-scripts/check_disk_smb.pl 2005-10-31 21:44:41.000000000 +0100 +@@ -23,7 +23,7 @@ + use POSIX; + use strict; + use Getopt::Long; +-use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $verbose); ++use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_a $verbose); + use vars qw($PROGNAME); + use lib utils.pm ; + use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); +@@ -49,7 +49,8 @@ + "u=s" => \$opt_u, "username=s" => \$opt_u, + "s=s" => \$opt_s, "share=s" => \$opt_s, + "W=s" => \$opt_W, "workgroup=s" => \$opt_W, +- "H=s" => \$opt_H, "hostname=s" => \$opt_H); ++ "H=s" => \$opt_H, "hostname=s" => \$opt_H, ++ "a=s" => \$opt_a, "address=s" => \$opt_a); + + if ($opt_V) { + print_revision($PROGNAME,'$Revision: 1372 $'); #' +@@ -65,7 +66,7 @@ + # Options checking + + ($opt_H) || ($opt_H = shift) || usage("Host name not specified\n"); +-my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9]+\$?)$/); ++my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9 ]+\$?)$/); + ($host) || usage("Invalid host: $opt_H\n"); + + ($opt_s) || ($opt_s = shift) || usage("Share volume not specified\n"); +@@ -142,6 +143,8 @@ + + my $workgroup = $1 if (defined($opt_W) && $opt_W =~ /(.*)/); + ++my $address = $1 if (defined($opt_a) && $opt_a =~ /(.*)/); ++ + # end of options checking + + +@@ -160,10 +163,21 @@ + # Execute an "ls" on the share using smbclient program + # get the results into $res + if (defined($workgroup)) { +- $res = qx/$smbclient \/\/$host\/$share -W $workgroup -U $user%$pass $smbclientoptions -c ls/; ++ if (defined($address)) { ++ print "$smbclient " . "\/\/$host\/$share" ." $pass -W $workgroup -U $user $smbclientoptions -I $address -c ls\n" if ($verbose); ++ $res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup -U $user $smbclientoptions -I $address -c ls/; ++ } else { ++ print "$smbclient " . "\/\/$host\/$share" ." $pass -W $workgroup -U $user $smbclientoptions -c ls\n" if ($verbose); ++ $res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup -U $user $smbclientoptions -c ls/; ++ } + } else { +- print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -c ls\n" if ($verbose); +- $res = qx/$smbclient \/\/$host\/$share -U $user%$pass $smbclientoptions -c ls/; ++ if (defined($address)) { ++ print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -I $address -c ls\n" if ($verbose); ++ $res = qx/$smbclient "\/\/$host\/$share" $pass -U $user $smbclientoptions -I $address -c ls/; ++ } else { ++ print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -c ls\n" if ($verbose); ++ $res = qx/$smbclient "\/\/$host\/$share" $pass -U $user $smbclientoptions -c ls/; ++ } + } + #Turn off alarm + alarm(0); +@@ -239,7 +253,7 @@ + + sub print_usage () { + print "Usage: $PROGNAME -H -s -u -p +- -w -c [-W ] [-P ]\n"; ++ -w -c [-W ] [-P ] [-a ]\n"; + } + + sub print_help () { +@@ -257,6 +271,8 @@ + Share name to be tested + -W, --workgroup=STRING + Workgroup or Domain used (Defaults to \"WORKGROUP\") ++-a, --address=IP ++ IP-address of HOST (only necessary if HOST is in another network) + -u, --user=STRING + Username to log in to server. (Defaults to \"guest\") + -p, --password=STRING --- nagios-plugins-1.4.12.orig/debian/patches/35_check_http_date.dpatch +++ nagios-plugins-1.4.12/debian/patches/35_check_http_date.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 35_check_http_date.dpatch by Jan Wagner +## patch provided by Hilko Bengen +## +## DP: Prevents check_http from trying to extract Date or +## DP: Last-Modified header from file content.N + +@DPATCH@ +diff -urNad nagios-plugins-1.4.12~/plugins/check_http.c nagios-plugins-1.4.12/plugins/check_http.c +--- nagios-plugins-1.4.12~/plugins/check_http.c 2008-05-07 12:02:42.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_http.c 2008-06-06 13:03:33.000000000 +0200 +@@ -598,7 +598,10 @@ + /* Skip to the end of the header, including continuation lines. */ + while (*s && !(*s == '\n' && (s[1] != ' ' && s[1] != '\t'))) + s++; +- s++; ++ ++ /* Avoid stepping over end-of-string marker */ ++ if (*s) ++ s++; + + /* Process this header. */ + if (value && value > field+2) { --- nagios-plugins-1.4.12.orig/debian/patches/14_check_log_paths.dpatch +++ nagios-plugins-1.4.12/debian/patches/14_check_log_paths.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 14_check_log_paths.dpatch by +## +## DP: Use correct absolut path. + +@DPATCH@ +diff -urNad nagios-plugins~/plugins-scripts/check_log.sh nagios-plugins/plugins-scripts/check_log.sh +--- nagios-plugins~/plugins-scripts/check_log.sh 2005-02-04 00:51:35.000000000 +0100 ++++ nagios-plugins/plugins-scripts/check_log.sh 2005-10-09 17:29:46.000000000 +0200 +@@ -62,14 +62,14 @@ + + ECHO="/bin/echo" + GREP="/bin/egrep" +-DIFF="/bin/diff" +-TAIL="/bin/tail" ++DIFF="/usr/bin/diff" ++TAIL="/usr/bin/tail" + CAT="/bin/cat" + RM="/bin/rm" + CHMOD="/bin/chmod" + TOUCH="/bin/touch" + +-PROGNAME=`/bin/basename $0` ++PROGNAME=`/usr/bin/basename $0` + PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` + REVISION=`echo '$Revision: 1372 $' | sed -e 's/[^0-9.]//g'` + --- nagios-plugins-1.4.12.orig/debian/patches/32_check_ldap_pointer.dpatch +++ nagios-plugins-1.4.12/debian/patches/32_check_ldap_pointer.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 32_check_ldap_pointer.dpatch by Jan Wagner +## patch provided by dann frazier +## +## DP: Using deprecated interfaces of libldap API + +@DPATCH@ +--- nagios-plugins-1.4.11.orig/plugins/check_ldap.c 2007-07-07 16:20:40.000000000 -0600 ++++ nagios-plugins-1.4.11/plugins/check_ldap.c 2008-01-30 15:14:14.000000000 -0700 +@@ -42,6 +42,7 @@ + #include "utils.h" + + #include ++#define LDAP_DEPRECATED 1 + #include + + enum { --- nagios-plugins-1.4.12.orig/debian/patches/06_checkircd.dpatch +++ nagios-plugins-1.4.12/debian/patches/06_checkircd.dpatch @@ -0,0 +1,44 @@ +#! /bin/sh -e +## 06_checkircd.dpatch by +## +## DP: Make it working on multihomed host, by choosing the kernel the correct interface + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/ultrotter/docs/projects/deb/nagios/new/nagios-plugins-1.3.1.0/plugins-scripts/check_ircd.pl nagios-plugins-1.3.1.0/plugins-scripts/check_ircd.pl +--- /home/ultrotter/docs/projects/deb/nagios/new/nagios-plugins-1.3.1.0/plugins-scripts/check_ircd.pl 2002-05-07 07:35:49.000000000 +0200 ++++ nagios-plugins-1.3.1.0/plugins-scripts/check_ircd.pl 2004-08-12 15:54:50.000000000 +0200 +@@ -148,7 +148,6 @@ + my $proto = getprotobyname('tcp'); + my $sockaddr; + my $this; +- my $thisaddr = gethostbyname($in_hostname); + my $that; + my ($name, $aliases,$type,$len,$thataddr) = gethostbyname($in_remotehost); + # ($name,$aliases,$type,$len,$thisaddr) = gethostbyname($in_hostname); +@@ -158,7 +157,7 @@ + exit $ERRORS{"UNKNOWN"}; + } + $sockaddr = 'S n a4 x8'; +- $this = pack($sockaddr, AF_INET, 0, $thisaddr); ++ $this = pack($sockaddr, AF_INET, 0, INADDR_ANY); + $that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr); + if (!bind(ClientSocket, $this)) { + print "IRCD UNKNOWN: Could not bind socket ($!)\n"; --- nagios-plugins-1.4.12.orig/debian/patches/41_check_http_fix_http_header.dpatch +++ nagios-plugins-1.4.12/debian/patches/41_check_http_fix_http_header.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 41_check_http_fix_http_header.dpatch by Jan Wagner , taken +## from upstream svn +## +## DP: Re-structure the HTTP 1.1 headers to prevent 301s on servers with virtual hosts + +@DPATCH@ +diff -urNad nagios-plugins-1.4.12~/plugins/check_http.c nagios-plugins-1.4.12/plugins/check_http.c +--- nagios-plugins-1.4.12~/plugins/check_http.c 2008-08-23 15:41:49.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_http.c 2008-08-23 15:50:14.000000000 +0200 +@@ -749,15 +749,17 @@ + } + #endif /* HAVE_SSL */ + +- asprintf (&buf, "%s %s HTTP/1.0\r\n%s\r\n", http_method, server_url, user_agent); ++ /* If a hostname is provided, use HTTP/1.1 and send the hostname before the ++ * Useragent. This fixes an issue with getting 301 responses from servers ++ * with virtual hosts */ ++ if (host_name) ++ asprintf (&buf, "%s %s HTTP/1.1\r\nHost: %s:%d\r\n%s\r\n", http_method, server_url, host_name, server_port, user_agent); ++ else ++ asprintf (&buf, "%s %s HTTP/1.0\r\n%s\r\n", http_method, server_url, user_agent); + + /* tell HTTP/1.1 servers not to keep the connection alive */ + asprintf (&buf, "%sConnection: close\r\n", buf); + +- /* optionally send the host header info */ +- if (host_name) +- asprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, server_port); +- + /* optionally send any other header tag */ + if (http_opt_headers_count) { + for (i = 0; i < http_opt_headers_count ; i++) { --- nagios-plugins-1.4.12.orig/debian/patches/33_fix_emb_check_disk_smb.dpatch +++ nagios-plugins-1.4.12/debian/patches/33_fix_emb_check_disk_smb.dpatch @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 32_check_ldap_pointer.dpatch by Jan Wagner +## patch provided by Stephane Chazelas +## +## DP: fix processing vi embedded perl interpreter + +@DPATCH@ +diff -urNad nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl nagios-plugins-1.4.12/plugins-scripts/check_disk_smb.pl +--- nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl 2008-06-06 11:57:33.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins-scripts/check_disk_smb.pl 2008-06-06 11:58:03.000000000 +0200 +@@ -65,27 +65,27 @@ + + # Options checking + +-($opt_H) || ($opt_H = shift) || usage("Host name not specified\n"); ++($opt_H) || ($opt_H = shift @ARGV) || usage("Host name not specified\n"); + my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9 ]+\$?)$/); + ($host) || usage("Invalid host: $opt_H\n"); + +-($opt_s) || ($opt_s = shift) || usage("Share volume not specified\n"); ++($opt_s) || ($opt_s = shift @ARGV) || usage("Share volume not specified\n"); + my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9]+\$?)$/); + ($share) || usage("Invalid share: $opt_s\n"); + +-($opt_u) || ($opt_u = shift) || ($opt_u = "guest"); ++($opt_u) || ($opt_u = shift @ARGV) || ($opt_u = "guest"); + my $user = $1 if ($opt_u =~ /^([-_.A-Za-z0-9\\]+)$/); + ($user) || usage("Invalid user: $opt_u\n"); + +-($opt_p) || ($opt_p = shift) || ($opt_p = ""); ++($opt_p) || ($opt_p = shift @ARGV) || ($opt_p = ""); + my $pass = $1 if ($opt_p =~ /(.*)/); + $pass = "-N" if ($opt_p eq ""); + +-($opt_w) || ($opt_w = shift) || ($opt_w = 85); ++($opt_w) || ($opt_w = shift @ARGV) || ($opt_w = 85); + my $warn = $1 if ($opt_w =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/); + ($warn) || usage("Invalid warning threshold: $opt_w\n"); + +-($opt_c) || ($opt_c = shift) || ($opt_c = 95); ++($opt_c) || ($opt_c = shift @ARGV) || ($opt_c = 95); + my $crit = $1 if ($opt_c =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/); + ($crit) || usage("Invalid critical threshold: $opt_c\n"); + --- nagios-plugins-1.4.12.orig/debian/patches/27_check_radius_segfault.dpatch +++ nagios-plugins-1.4.12/debian/patches/27_check_radius_segfault.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 27_check_radius_segfault.dpatch by Yasper Casper +## +## DP: Fix for segfaulting check_radius plugin. + +@DPATCH@ +diff -urNad nagios-plugins-1.4.5~/plugins/check_radius.c nagios-plugins-1.4.5/plugins/check_radius.c +--- nagios-plugins-1.4.5~/plugins/check_radius.c 2006-10-20 01:53:28.000000000 +0200 ++++ nagios-plugins-1.4.5/plugins/check_radius.c 2006-11-20 20:38:49.000000000 +0100 +@@ -137,6 +137,14 @@ + rc_read_dictionary (rc_conf_str (str))) + die (STATE_UNKNOWN, _("Config file error")); + ++ /* Initialize Value Pair to prevent segfault on rc_avpair_add. ++ * debugging on radiuslib-ng show that the mem isn't allocated, ++ * and some random memory is in the USER-PASSWORD pair. ++ * So, after initialization, the password is filled with the correct values ++ */ ++ data.send_pairs = NULL; ++ data.receive_pairs = NULL; ++ + service = PW_AUTHENTICATE_ONLY; + + if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) && --- nagios-plugins-1.4.12.orig/debian/patches/39_check_dig_options.dpatch +++ nagios-plugins-1.4.12/debian/patches/39_check_dig_options.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 39_check_dig_options.dpatch by Jan Wagner +## patch provided by Matthias Eble +## +## DP: Add testcases for check_dig check_dig's -l option is mandatory + +@DPATCH@ +diff -urNad nagios-plugins-1.4.12~/plugins/check_dig.c nagios-plugins-1.4.12/plugins/check_dig.c +--- nagios-plugins-1.4.12~/plugins/check_dig.c 2008-05-07 12:02:42.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_dig.c 2008-06-09 22:31:59.000000000 +0200 +@@ -143,8 +143,10 @@ + } + } + +- if (result == STATE_UNKNOWN) ++ if (result == STATE_UNKNOWN) { + msg = (char *)_("No ANSWER SECTION found"); ++ result = STATE_CRITICAL; ++ } + + /* If we get anything on STDERR, at least set warning */ + if(chld_err.buflen > 0) { +@@ -295,7 +297,10 @@ + int + validate_arguments (void) + { +- return OK; ++ if (query_address != NULL) ++ return OK; ++ else ++ return ERROR; + } + + +@@ -357,7 +362,7 @@ + print_usage (void) + { + printf (_("Usage:")); +- printf ("%s -H -l [-p ]\n", progname); ++ printf ("%s -l [-H ] [-p ]\n", progname); + printf (" [-T ] [-w ] [-c ]\n"); + printf (" [-t ] [-a ] [-v]\n"); + } --- nagios-plugins-1.4.12.orig/debian/patches/40_check_http_status_line.dpatch +++ nagios-plugins-1.4.12/debian/patches/40_check_http_status_line.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40_check_http_status_line.dpatch by Jan Wagner +## patch provided by Josip Rodin +## +## DP: adds status_line to check_http output + +@DPATCH@ +diff -urNad nagios-plugins-1.4.12~/plugins/check_http.c nagios-plugins-1.4.12/plugins/check_http.c +--- nagios-plugins-1.4.12~/plugins/check_http.c 2008-08-23 15:34:17.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_http.c 2008-08-23 15:36:20.000000000 +0200 +@@ -879,11 +879,12 @@ + if (!strstr (status_line, server_expect)) { + if (server_port == HTTP_PORT) + asprintf (&msg, +- _("Invalid HTTP response received from host\n")); ++ _("Invalid HTTP response received from host: %s\n"), ++ status_line); + else + asprintf (&msg, +- _("Invalid HTTP response received from host on port %d\n"), +- server_port); ++ _("Invalid HTTP response received from host on port %d: %s\n"), ++ server_port, status_line); + die (STATE_CRITICAL, "HTTP CRITICAL - %s", msg); + } + --- nagios-plugins-1.4.12.orig/debian/patches/37_check_radius_nas-ip-address.dpatch +++ nagios-plugins-1.4.12/debian/patches/37_check_radius_nas-ip-address.dpatch @@ -0,0 +1,103 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 37_check_radius_nas-ip-address.dpatch by Jan Wagner +## patch provided by Josip Rodin +## +## DP: add nas-ip-address option + +@DPATCH@ +diff -urNad nagios-plugins-1.4.12~/plugins/check_radius.c nagios-plugins-1.4.12/plugins/check_radius.c +--- nagios-plugins-1.4.12~/plugins/check_radius.c 2008-06-06 15:00:49.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_radius.c 2008-06-06 15:02:33.000000000 +0200 +@@ -73,6 +73,7 @@ + char *username = NULL; + char *password = NULL; + char *nasid = NULL; ++char *nasipaddress = NULL; + char *expect = NULL; + char *config_file = NULL; + unsigned short port = PW_AUTH_UDP_PORT; +@@ -173,19 +174,26 @@ + memset (&data, 0, sizeof(data)); + if (!(my_rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) && + my_rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) && +- my_rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) && +- (nasid==NULL || my_rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0)))) ++ my_rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) ++ )) + die (STATE_UNKNOWN, _("Out of Memory?")); + +- /* +- * Fill in NAS-IP-Address +- */ +- +- if ((client_id = my_rc_own_ipaddress ()) == 0) +- return (ERROR_RC); ++ if (nasid != NULL) { ++ if (!(my_rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0))) ++ die (STATE_UNKNOWN, _("Invalid NAS-Identifier")); ++ } + +- if (my_rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) == +- NULL) return (ERROR_RC); ++ if (nasipaddress != NULL) { ++ if (rc_good_ipaddr (nasipaddress)) ++ die (STATE_UNKNOWN, _("Invalid NAS-IP-Address")); ++ if ((client_id = rc_get_ipaddr(nasipaddress)) == 0) ++ die (STATE_UNKNOWN, _("Invalid NAS-IP-Address")); ++ } else { ++ if ((client_id = my_rc_own_ipaddress ()) == 0) ++ die (STATE_UNKNOWN, _("Can't find local IP for NAS-IP-Address")); ++ } ++ if (my_rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) == NULL) ++ die (STATE_UNKNOWN, _("Invalid NAS-IP-Address")); + + my_rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval, + retries); +@@ -223,6 +231,7 @@ + {"username", required_argument, 0, 'u'}, + {"password", required_argument, 0, 'p'}, + {"nas-id", required_argument, 0, 'n'}, ++ {"nas-ip-address", required_argument, 0, 'N'}, + {"filename", required_argument, 0, 'F'}, + {"expect", required_argument, 0, 'e'}, + {"retries", required_argument, 0, 'r'}, +@@ -234,7 +243,7 @@ + }; + + while (1) { +- c = getopt_long (argc, argv, "+hVvH:P:F:u:p:n:t:r:e:", longopts, ++ c = getopt_long (argc, argv, "+hVvH:P:F:u:p:n:N:t:r:e:", longopts, + &option); + + if (c == -1 || c == EOF || c == 1) +@@ -279,6 +288,9 @@ + case 'n': /* nas id */ + nasid = optarg; + break; ++ case 'N': /* nas ip address */ ++ nasipaddress = optarg; ++ break; + case 'F': /* configuration file */ + config_file = optarg; + break; +@@ -342,6 +354,8 @@ + printf (" %s\n", _("Password for autentication (SECURITY RISK)")); + printf (" %s\n", "-n, --nas-id=STRING"); + printf (" %s\n", _("NAS identifier")); ++ printf (" %s\n", "-N, --nas-ip-address=STRING"); ++ printf (" %s\n", _("NAS IP Address")); + printf (" %s\n", "-F, --filename=STRING"); + printf (" %s\n", _("Configuration file")); + printf (" %s\n", "-e, --expect=STRING"); +@@ -377,8 +391,9 @@ + print_usage (void) + { + printf (_("Usage:")); +- printf ("%s -H host -F config_file -u username -p password [-n nas-id] [-P port]\n\ +- [-t timeout] [-r retries] [-e expect]\n", progname); ++ printf ("%s -H host -F config_file -u username -p password\n\ ++ [-P port] [-t timeout] [-r retries] [-e expect]\n\ ++ [-n nas-id] [-N nas-ip-addr]\n", progname); + } + + --- nagios-plugins-1.4.12.orig/debian/patches/26_implicit-basename.dpatch +++ nagios-plugins-1.4.12/debian/patches/26_implicit-basename.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 26-implicit-basename.dpatch by +## +## DP: Fix for implicit definition of basename function. + +@DPATCH@ +diff -urNad nagios-plugins-1.4.4~/plugins/check_procs.c nagios-plugins-1.4.4/plugins/check_procs.c +--- nagios-plugins-1.4.4~/plugins/check_procs.c 2006-10-19 02:25:16.000000000 +0200 ++++ nagios-plugins-1.4.4/plugins/check_procs.c 2006-11-17 09:26:57.000000000 +0100 +@@ -45,6 +45,7 @@ + #include "utils.h" + + #include ++#include + + int process_arguments (int, char **); + int validate_arguments (void); --- nagios-plugins-1.4.12.orig/debian/patches/38_fix_libexec.dpatch +++ nagios-plugins-1.4.12/debian/patches/38_fix_libexec.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_fix_libexec.dpatch by Jan Wagner +## +## DP: fix library path + +@DPATCH@ +diff -urNad nagios-plugins-1.4.12~/contrib/check_linux_raid.pl nagios-plugins-1.4.12/contrib/check_linux_raid.pl +--- nagios-plugins-1.4.12~/contrib/check_linux_raid.pl 2007-08-28 05:19:45.000000000 +0200 ++++ nagios-plugins-1.4.12/contrib/check_linux_raid.pl 2008-06-06 16:16:23.000000000 +0200 +@@ -23,7 +23,7 @@ + # WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min + + use strict; +-use lib "/usr/local/nagios/libexec"; ++use lib "/usr/lib/nagios/plugins"; + use utils qw(%ERRORS); + + # die with an error if we're not on Linux --- nagios-plugins-1.4.12.orig/debian/patches/13_subst.in_again.dpatch +++ nagios-plugins-1.4.12/debian/patches/13_subst.in_again.dpatch @@ -0,0 +1,63 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 13_subst.in_again.dpatch by +## +## DP: Use /usr/lib/nagios/plugins as path. + +@DPATCH@ +diff -urNad sid2~/plugins-scripts/subst.in sid2/plugins-scripts/subst.in +--- sid2~/plugins-scripts/subst.in 2005-08-31 00:11:42.000000000 +0200 ++++ sid2/plugins-scripts/subst.in 2005-10-07 22:37:45.000000000 +0200 +@@ -1,35 +1,9 @@ + #!/usr/bin/awk + +-function which(c,path) { +- cmd = "test -x " c; +- +- if (system(cmd)==0) { +- return c; +- } +- +- sub(/\/.*\//,"",c); +- for (dir in path) { +- cmd = "test -x " path[dir] "/" c; +- if (system(cmd)==0) { +- return path[dir] "/" c; +- } +- } +- +- +- return c; +-} +- + # used to replace "use lib utils.pm" with "use lib @libexecdir" + # + function led() { +- led1 = "@libexecdir@"; +- led2 = "@exec_prefix@"; +- led3 = "@prefix@"; +- if ( match(led1, /^\$\{exec_prefix\}/ ) != 0 ) { +- return "\"" led3 "/libexec\" " ; +- +- } +- return "\"" led1 "\"" ; ++ return "\"/usr/lib/nagios/plugins\"" ; + } + + BEGIN { +@@ -58,16 +32,6 @@ + sub(/\=.*$/,"='@with_trusted_path@' # autoconf-derived"); + } + +-# If a script contains a reference to a fully qualified command, +-# subst will replace the fully qualified command with whatever is +-# returned from the which subroutine +-# +-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// { +- match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/); +- c=substr($0,RSTART,RLENGTH); +- sub(c,which(c,path)); +-} +- + { + print; + } --- nagios-plugins-1.4.12.orig/debian/patches/50_misc_typos.dpatch +++ nagios-plugins-1.4.12/debian/patches/50_misc_typos.dpatch @@ -0,0 +1,220 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50_misc_typos.dpatch by modified for 1.4.10 by +## Jan Wagner +## +## DP: This patch fixes various typos and grammatical errors in plugins/*.c. +## DP: It is based on Malcolm Parsons' patch posted at https://launchpad.net/bugs/64595 + +@DPATCH@ +diff -urNad nagios-plugins-1.4.12~/plugins/check_dns.c nagios-plugins-1.4.12/plugins/check_dns.c +--- nagios-plugins-1.4.12~/plugins/check_dns.c 2008-05-13 11:14:45.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_dns.c 2008-06-03 11:08:17.000000000 +0200 +@@ -255,7 +255,7 @@ + printf (_("DNS CRITICAL - %s\n"), + !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg); + else +- printf (_("DNS UNKNOW - %s\n"), ++ printf (_("DNS UNKNOWN - %s\n"), + !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg); + + return result; +diff -urNad nagios-plugins-1.4.12~/plugins/check_http.c nagios-plugins-1.4.12/plugins/check_http.c +--- nagios-plugins-1.4.12~/plugins/check_http.c 2008-05-07 12:02:42.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_http.c 2008-06-03 11:08:17.000000000 +0200 +@@ -1054,7 +1054,7 @@ + + url = malloc (strcspn (pos, "\r\n")); + if (url == NULL) +- die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate url\n")); ++ die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n")); + + while (pos) { + sscanf (pos, "%1[Ll]%*1[Oo]%*1[Cc]%*1[Aa]%*1[Tt]%*1[Ii]%*1[Oo]%*1[Nn]:%n", xx, &i); +@@ -1085,7 +1085,7 @@ + + url = realloc (url, strcspn (pos, "\r\n") + 1); + if (url == NULL) +- die (STATE_UNKNOWN, _("HTTP UNKNOWN - could not allocate url\n")); ++ die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n")); + + /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */ + if (sscanf (pos, HD1, type, addr, &i, url) == 4) +@@ -1253,7 +1253,7 @@ + printf (" %s\n", _("Connect via SSL. Port defaults to 443")); + printf (" %s\n", "-C, --certificate=INTEGER"); + printf (" %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443")); +- printf (" %s\n", _("(when this option is used the url is not checked.)\n")); ++ printf (" %s\n", _("(when this option is used the URL is not checked.)\n")); + #endif + + printf (" %s\n", "-e, --expect=STRING"); +diff -urNad nagios-plugins-1.4.12~/plugins/check_ldap.c nagios-plugins-1.4.12/plugins/check_ldap.c +--- nagios-plugins-1.4.12~/plugins/check_ldap.c 2008-06-03 11:08:16.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_ldap.c 2008-06-03 11:08:17.000000000 +0200 +@@ -196,7 +196,7 @@ + LDAP_SUCCESS) { + if (verbose) + ldap_perror(ld, "ldap_bind"); +- printf (_("Could not bind to the ldap-server\n")); ++ printf (_("Could not bind to the LDAP server\n")); + return STATE_CRITICAL; + } + +diff -urNad nagios-plugins-1.4.12~/plugins/check_mysql.c nagios-plugins-1.4.12/plugins/check_mysql.c +--- nagios-plugins-1.4.12~/plugins/check_mysql.c 2008-05-07 12:02:42.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_mysql.c 2008-06-03 11:08:17.000000000 +0200 +@@ -381,7 +381,7 @@ + + printf (_(COPYRIGHT), copyright, email); + +- printf ("%s\n", _("This program tests connections to a mysql server")); ++ printf ("%s\n", _("This program tests connections to a MySQL server")); + + printf ("\n\n"); + +diff -urNad nagios-plugins-1.4.12~/plugins/check_procs.c nagios-plugins-1.4.12/plugins/check_procs.c +--- nagios-plugins-1.4.12~/plugins/check_procs.c 2008-06-03 11:08:16.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_procs.c 2008-06-03 11:14:09.000000000 +0200 +@@ -730,7 +730,7 @@ + printf (" %s\n", _("PROCS - number of processes (default)")); + printf (" %s\n", _("VSZ - virtual memory size")); + printf (" %s\n", _("RSS - resident set memory size")); +- printf (" %s\n", _("CPU - percentage cpu")); ++ printf (" %s\n", _("CPU - percentage CPU")); + /* only linux etime is support currently */ + #if defined( __linux__ ) + printf (" %s\n", _("ELAPSED - time elapsed in seconds")); +@@ -749,11 +749,11 @@ + printf (" %s\n", "-p, --ppid=PPID"); + printf (" %s\n", _("Only scan for children of the parent process ID indicated.")); + printf (" %s\n", "-z, --vsz=VSZ"); +- printf (" %s\n", _("Only scan for processes with vsz higher than indicated.")); ++ printf (" %s\n", _("Only scan for processes with VSZ higher than indicated.")); + printf (" %s\n", "-r, --rss=RSS"); +- printf (" %s\n", _("Only scan for processes with rss higher than indicated.")); ++ printf (" %s\n", _("Only scan for processes with RSS higher than indicated.")); + printf (" %s\n", "-P, --pcpu=PCPU"); +- printf (" %s\n", _("Only scan for processes with pcpu higher than indicated.")); ++ printf (" %s\n", _("Only scan for processes with PCPU higher than indicated.")); + printf (" %s\n", "-u, --user=USER"); + printf (" %s\n", _("Only scan for processes with user name or ID indicated.")); + printf (" %s\n", "-a, --argument-array=STRING"); +@@ -789,9 +789,9 @@ + printf (" %s\n", _("Warning alert if > 10 processes with command arguments containing")); + printf (" %s\n\n", _("'/usr/local/bin/perl' and owned by root")); + printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ"); +- printf (" %s\n\n", _("Alert if vsz of any processes over 50K or 100K")); ++ printf (" %s\n\n", _("Alert if VSZ of any processes over 50K or 100K")); + printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU"); +- printf (" %s\n", _("Alert if cpu of any processes over 10%% or 20%%")); ++ printf (" %s\n", _("Alert if CPU of any processes over 10%% or 20%%")); + + printf (_(UT_SUPPORT)); + } +diff -urNad nagios-plugins-1.4.12~/plugins/check_radius.c nagios-plugins-1.4.12/plugins/check_radius.c +--- nagios-plugins-1.4.12~/plugins/check_radius.c 2008-06-03 11:08:16.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_radius.c 2008-06-03 11:16:39.000000000 +0200 +@@ -325,7 +325,7 @@ + printf ("Copyright (c) 1999 Robert August Vincent II\n"); + printf (COPYRIGHT, copyright, email); + +- printf("%s\n", _("Tests to see if a radius server is accepting connections.")); ++ printf("%s\n", _("Tests to see if a RADIUS server is accepting connections.")); + + printf ("\n\n"); + +@@ -352,7 +352,7 @@ + printf (_(UT_TIMEOUT), timeout_interval); + + printf ("\n"); +- printf ("%s\n", _("This plugin tests a radius server to see if it is accepting connections.")); ++ printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections.")); + printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user")); + printf ("%s\n", _("name and password. A configuration file may also be present. The format of")); + printf ("%s\n", _("the configuration file is described in the radiusclient library sources.")); +diff -urNad nagios-plugins-1.4.12~/plugins/check_snmp.c nagios-plugins-1.4.12/plugins/check_snmp.c +--- nagios-plugins-1.4.12~/plugins/check_snmp.c 2008-05-07 12:02:42.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_snmp.c 2008-06-03 11:08:17.000000000 +0200 +@@ -928,7 +928,7 @@ + + printf (COPYRIGHT, copyright, email); + +- printf ("%s\n", _("Check status of remote machines and obtain sustem information via SNMP")); ++ printf ("%s\n", _("Check status of remote machines and obtain system information via SNMP")); + + printf ("\n\n"); + +@@ -964,8 +964,8 @@ + printf (" %s\n", "-o, --oid=OID(s)"); + printf (" %s\n", _("Object identifier(s) or SNMP variables whose value you wish to query")); + printf (" %s\n", "-m, --miblist=STRING"); +- printf (" %s\n", _("List of MIBS to be loaded (default = none if using numeric oids or 'ALL'")); +- printf (" %s\n", _("for symbolic oids.)")); ++ printf (" %s\n", _("List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'")); ++ printf (" %s\n", _("for symbolic OIDs.)")); + printf (" %s\n", "-d, --delimiter=STRING"); + printf (_(" Delimiter to use when parsing returned data. Default is \"%s\""), DEFAULT_DELIMITER); + printf (" %s\n", _("Any data on the right hand side of the delimiter is considered")); +diff -urNad nagios-plugins-1.4.12~/plugins/check_tcp.c nagios-plugins-1.4.12/plugins/check_tcp.c +--- nagios-plugins-1.4.12~/plugins/check_tcp.c 2008-05-07 12:02:42.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_tcp.c 2008-06-03 11:08:17.000000000 +0200 +@@ -623,7 +623,7 @@ + printf (" %s\n", "-q, --quit=STRING"); + printf (" %s\n", _("String to send server to initiate a clean close of the connection")); + printf (" %s\n", "-r, --refuse=ok|warn|crit"); +- printf (" %s\n", _("Accept tcp refusals with states ok, warn, crit (default: crit)")); ++ printf (" %s\n", _("Accept TCP refusals with states ok, warn, crit (default: crit)")); + printf (" %s\n", "-M, --mismatch=ok|warn|crit"); + printf (" %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)")); + printf (" %s\n", "-j, --jail"); +diff -urNad nagios-plugins-1.4.12~/plugins/check_ups.c nagios-plugins-1.4.12/plugins/check_ups.c +--- nagios-plugins-1.4.12~/plugins/check_ups.c 2008-05-07 12:02:42.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_ups.c 2008-06-03 11:19:51.000000000 +0200 +@@ -417,7 +417,7 @@ + len = strlen(ptr); + if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0; + if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) { +- printf (_("CRITICAL - no such ups '%s' on that host\n"), ups_name); ++ printf (_("CRITICAL - no such UPS '%s' on that host\n"), ups_name); + return ERROR; + } + +@@ -584,7 +584,7 @@ + validate_arguments (void) + { + if (! ups_name) { +- printf ("%s\n", _("Error : no ups indicated")); ++ printf ("%s\n", _("Error : no UPS indicated")); + return ERROR; + } + return OK; +@@ -635,7 +635,7 @@ + printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power")); + printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the")); + printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING")); +- printf ("%s\n", _("state.If the UPS is off or has a low battery the plugin will return a CRITICAL")); ++ printf ("%s\n", _("state. If the UPS is off or has a low battery the plugin will return a CRITICAL")); + printf ("%s\n", _("state.")); + + printf ("\n"); +@@ -645,7 +645,7 @@ + printf (" %s\n", _("of that variable. If the remote host has multiple UPS that are being monitored")); + printf (" %s\n", _("you will have to use the --ups option to specify which UPS to check.")); + printf ("\n"); +- printf (" %s\n", _("This plugin requires that the UPSD daemon distributed with Russel Kroll's")); ++ printf (" %s\n", _("This plugin requires that the UPSD daemon distributed with Russell Kroll's")); + printf (" %s\n", _("Smart UPS Tools be installed on the remote host. If you do not have the")); + printf (" %s\n", _("package installed on your system, you can download it from")); + printf (" %s\n", _("http://www.networkupstools.org")); +diff -urNad nagios-plugins-1.4.12~/plugins-scripts/check_mailq.pl nagios-plugins-1.4.12/plugins-scripts/check_mailq.pl +--- nagios-plugins-1.4.12~/plugins-scripts/check_mailq.pl 2006-07-05 15:45:57.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins-scripts/check_mailq.pl 2008-06-03 11:08:17.000000000 +0200 +@@ -588,7 +588,7 @@ + print " Checks the number of messages in the mail queue (supports multiple sendmail queues, qmail)\n"; + print " Feedback/patches to support non-sendmail mailqueue welcome\n\n"; + print "-w (--warning) = Min. number of messages in queue to generate warning\n"; +- print "-c (--critical) = Min. number of messages in queu to generate critical alert ( w < c )\n"; ++ print "-c (--critical) = Min. number of messages in queue to generate critical alert ( w < c )\n"; + print "-W (--Warning) = Min. number of messages for same domain in queue to generate warning\n"; + print "-C (--Critical) = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n"; + print "-t (--timeout) = Plugin timeout in seconds (default = $utils::TIMEOUT)\n"; --- nagios-plugins-1.4.12.orig/debian/patches/02_utilspm.dpatch +++ nagios-plugins-1.4.12/debian/patches/02_utilspm.dpatch @@ -0,0 +1,32 @@ +#!/bin/sh -e +## 02_utilspm.dpatch by Guido Trotter +## +## DP: Correct utils.pm script to begin with #!/usr/bin/perl + +if [ $# -lt 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/ultrotter/docs/projects/deb/nagios/nagios-plugins-1.3.1/plugins-scripts/utils.pm.in nagios-plugins-1.3.1/plugins-scripts/utils.pm.in +--- /home/ultrotter/docs/projects/deb/nagios/nagios-plugins-1.3.1/plugins-scripts/utils.pm.in 2003-02-03 21:29:55.000000000 +0100 ++++ nagios-plugins-1.3.1/plugins-scripts/utils.pm.in 2004-02-01 10:42:54.000000000 +0100 +@@ -1,3 +1,4 @@ ++#!/usr/bin/perl + # Utility drawer for Nagios plugins. + # $Id: 02_utilspm.dpatch 1371 2008-03-08 08:25:27Z waja-guest $ + # --- nagios-plugins-1.4.12.orig/debian/patches/00list +++ nagios-plugins-1.4.12/debian/patches/00list @@ -0,0 +1,19 @@ +06_checkircd.dpatch +13_subst.in_again.dpatch +14_check_log_paths.dpatch +18_check_game_cmdline.dpatch +22_check_smb_hostaddress.dpatch +23_check_smb_password.dpatch +26_implicit-basename.dpatch +27_check_radius_segfault.dpatch +32_check_ldap_pointer.dpatch +33_fix_emb_check_disk_smb.dpatch +34_fix_smbclient_check_disk_smb.dpatch +35_check_http_date.dpatch +36_check_ldap_empty_base.dpatch +37_check_radius_nas-ip-address.dpatch +38_fix_libexec.dpatch +39_check_dig_options.dpatch +40_check_http_status_line.dpatch +41_check_http_fix_http_header.dpatch +50_misc_typos.dpatch --- nagios-plugins-1.4.12.orig/debian/patches/36_check_ldap_empty_base.dpatch +++ nagios-plugins-1.4.12/debian/patches/36_check_ldap_empty_base.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 36_check_ldap_empty_base.dpatch by Jan Wagner +## patch provided by Stephane Chazelas +## +## DP: allow empty ldap base + +@DPATCH@ +diff -urNad nagios-plugins-1.4.12~/plugins/check_ldap.c nagios-plugins-1.4.12/plugins/check_ldap.c +--- nagios-plugins-1.4.12~/plugins/check_ldap.c 2008-06-06 13:40:44.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_ldap.c 2008-06-06 13:42:02.000000000 +0200 +@@ -378,7 +378,7 @@ + if (ld_host==NULL || strlen(ld_host)==0) + usage4 (_("Please specify the host name\n")); + +- if (ld_base==NULL || strlen(ld_base)==0) ++ if (ld_base == NULL) + usage4 (_("Please specify the LDAP base\n")); + + return OK; --- nagios-plugins-1.4.12.orig/debian/patches/23_check_smb_password.dpatch +++ nagios-plugins-1.4.12/debian/patches/23_check_smb_password.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 23_check_smb_password.dpatch by Alexander Wirt +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: If there is no password set call smbclient with -N (suppress password prompt) + +@DPATCH@ +diff -urNad nagios-plugins-1.4.11~/plugins-scripts/check_disk_smb.pl nagios-plugins-1.4.11/plugins-scripts/check_disk_smb.pl +--- nagios-plugins-1.4.11~/plugins-scripts/check_disk_smb.pl 2008-05-02 07:13:08.000000000 +0200 ++++ nagios-plugins-1.4.11/plugins-scripts/check_disk_smb.pl 2008-05-02 07:15:23.000000000 +0200 +@@ -79,6 +79,7 @@ + + ($opt_p) || ($opt_p = shift) || ($opt_p = ""); + my $pass = $1 if ($opt_p =~ /(.*)/); ++$pass = "-N" if ($opt_p eq ""); + + ($opt_w) || ($opt_w = shift) || ($opt_w = 85); + my $warn = $1 if ($opt_w =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/); --- nagios-plugins-1.4.12.orig/debian/patches/18_check_game_cmdline.dpatch +++ nagios-plugins-1.4.12/debian/patches/18_check_game_cmdline.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 18_check_game_cmdline.dpatch by +## +## DP: Fix usage. + +@DPATCH@ +diff -urNad nagios-plugins~/plugins/check_game.c nagios-plugins/plugins/check_game.c +--- nagios-plugins~/plugins/check_game.c 2005-10-11 16:45:44.000000000 +0200 ++++ nagios-plugins/plugins/check_game.c 2005-10-11 16:47:07.000000000 +0200 +@@ -328,7 +328,7 @@ + print_usage (void) + { + printf (_("Usage:")); +- printf (" %s [-p port] [-gf game_field] [-mf map_field] [-pf ping_field]\n", progname); ++ printf (" %s [-hvV] [-P port] [-t timeout] [-g game_field] [-m map_field] [-p ping_field] [-G game-time] [-H hostname] \n", progname); + } + + /****************************************************************************** --- nagios-plugins-1.4.12.orig/debian/patches/34_fix_smbclient_check_disk_smb.dpatch +++ nagios-plugins-1.4.12/debian/patches/34_fix_smbclient_check_disk_smb.dpatch @@ -0,0 +1,138 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 34_fix_smbclient_check_disk_smb.dpatch by Jan Wagner +## patch provided by Stephane Chazelas +## +## DP: Fixes use of smbclient + +@DPATCH@ +diff -urNad nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl nagios-plugins-1.4.12/plugins-scripts/check_disk_smb.pl +--- nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl 2008-07-02 23:08:03.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins-scripts/check_disk_smb.pl 2008-07-02 23:10:42.000000000 +0200 +@@ -26,17 +26,13 @@ + use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_a $verbose); + use vars qw($PROGNAME); + use lib utils.pm ; +-use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); ++use utils qw($TIMEOUT %ERRORS &print_revision &support &usage &output_and_error_of); + + sub print_help (); + sub print_usage (); + + $PROGNAME = "check_disk_smb"; + +-$ENV{'PATH'}=''; +-$ENV{'BASH_ENV'}=''; +-$ENV{'ENV'}=''; +- + Getopt::Long::Configure('bundling'); + GetOptions + ("v" => \$verbose, "verbose" => \$verbose, +@@ -59,9 +55,7 @@ + + if ($opt_h) {print_help(); exit $ERRORS{'OK'};} + +-my $smbclient= "$utils::PATH_TO_SMBCLIENT " ; +-my $smbclientoptions= $opt_P ? "-p $opt_P " : ""; +- ++my $smbclient = $utils::PATH_TO_SMBCLIENT; + + # Options checking + +@@ -73,13 +67,12 @@ + my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9]+\$?)$/); + ($share) || usage("Invalid share: $opt_s\n"); + +-($opt_u) || ($opt_u = shift @ARGV) || ($opt_u = "guest"); +-my $user = $1 if ($opt_u =~ /^([-_.A-Za-z0-9\\]+)$/); +-($user) || usage("Invalid user: $opt_u\n"); ++defined($opt_u) || ($opt_u = shift @ARGV) || ($opt_u = "guest"); ++my $user = $1 if ($opt_u =~ /^([-_.A-Za-z0-9\\]*)$/); ++defined($user) || usage("Invalid user: $opt_u\n"); + +-($opt_p) || ($opt_p = shift @ARGV) || ($opt_p = ""); ++defined($opt_p) || ($opt_p = shift @ARGV) || ($opt_p = ""); + my $pass = $1 if ($opt_p =~ /(.*)/); +-$pass = "-N" if ($opt_p eq ""); + + ($opt_w) || ($opt_w = shift @ARGV) || ($opt_w = 85); + my $warn = $1 if ($opt_w =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/); +@@ -163,23 +156,19 @@ + + # Execute an "ls" on the share using smbclient program + # get the results into $res +-if (defined($workgroup)) { +- if (defined($address)) { +- print "$smbclient " . "\/\/$host\/$share" ." $pass -W $workgroup -U $user $smbclientoptions -I $address -c ls\n" if ($verbose); +- $res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup -U $user $smbclientoptions -I $address -c ls/; +- } else { +- print "$smbclient " . "\/\/$host\/$share" ." $pass -W $workgroup -U $user $smbclientoptions -c ls\n" if ($verbose); +- $res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup -U $user $smbclientoptions -c ls/; +- } +-} else { +- if (defined($address)) { +- print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -I $address -c ls\n" if ($verbose); +- $res = qx/$smbclient "\/\/$host\/$share" $pass -U $user $smbclientoptions -I $address -c ls/; +- } else { +- print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -c ls\n" if ($verbose); +- $res = qx/$smbclient "\/\/$host\/$share" $pass -U $user $smbclientoptions -c ls/; +- } +-} ++my @cmd = ( ++ $smbclient, ++ "//$host/$share", ++ "-U", "$user%$pass", ++ defined($workgroup) ? ("-W", $workgroup) : (), ++ defined($address) ? ("-I", $address) : (), ++ defined($opt_P) ? ("-p", $opt_P) : (), ++ "-c", "ls" ++); ++ ++print join(" ", @cmd) . "\n" if ($verbose); ++$res = output_and_error_of(@cmd) or exit $ERRORS{"UNKNOWN"}; ++ + #Turn off alarm + alarm(0); + +diff -urNad nagios-plugins-1.4.12~/plugins-scripts/utils.pm.in nagios-plugins-1.4.12/plugins-scripts/utils.pm.in +--- nagios-plugins-1.4.12~/plugins-scripts/utils.pm.in 2007-07-07 13:55:48.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins-scripts/utils.pm.in 2008-07-02 23:08:04.000000000 +0200 +@@ -8,7 +8,8 @@ + + require Exporter; + @ISA = qw(Exporter); +-@EXPORT_OK = qw($TIMEOUT %ERRORS &print_revision &support &usage); ++@EXPORT_OK = qw($TIMEOUT %ERRORS &print_revision &support &usage ++ &output_of &output_and_error_of); + + #use strict; + #use vars($TIMEOUT %ERRORS); +@@ -67,4 +68,29 @@ + } + } + ++sub output_of { ++ local *CMD; ++ local $/ = undef; ++ if (open CMD, "-|", @_) { ++ return ; ++ close CMD; ++ } ++ return undef; ++} ++ ++sub output_and_error_of { ++ local *CMD; ++ local $/ = undef; ++ my $pid = open CMD, "-|"; ++ if (defined($pid)) { ++ if ($pid) { ++ return ; ++ } else { ++ open STDERR, ">&STDOUT" and exec @_; ++ exit(1); ++ } ++ } ++ return undef; ++} ++ + 1;