[Pkg-nagios-changes] [pkg-nagios] r549 - in nagios-plugins/tags: .
1.4.2-6/debian 1.4.2-6/debian/patches 1.4.2-6/debian/pluginconfig
Sean Finney
seanius at costa.debian.org
Mon Jan 23 22:55:33 UTC 2006
Author: seanius
Date: 2006-01-23 22:55:32 +0000 (Mon, 23 Jan 2006)
New Revision: 549
Added:
nagios-plugins/tags/1.4.2-6/
nagios-plugins/tags/1.4.2-6/debian/changelog
nagios-plugins/tags/1.4.2-6/debian/control
nagios-plugins/tags/1.4.2-6/debian/patches/10_config.h_debiandefaults.dpatch
nagios-plugins/tags/1.4.2-6/debian/pluginconfig/fping.cfg
nagios-plugins/tags/1.4.2-6/debian/pluginconfig/ping.cfg
nagios-plugins/tags/1.4.2-6/debian/rules
Removed:
nagios-plugins/tags/1.4.2-6/debian/changelog
nagios-plugins/tags/1.4.2-6/debian/control
nagios-plugins/tags/1.4.2-6/debian/patches/10_config.h_debiandefaults.dpatch
nagios-plugins/tags/1.4.2-6/debian/pluginconfig/ping.cfg
nagios-plugins/tags/1.4.2-6/debian/rules
Log:
forgot to tag the release
Copied: nagios-plugins/tags/1.4.2-6 (from rev 543, nagios-plugins/trunk)
Deleted: nagios-plugins/tags/1.4.2-6/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog 2006-01-23 16:24:51 UTC (rev 543)
+++ nagios-plugins/tags/1.4.2-6/debian/changelog 2006-01-23 22:55:32 UTC (rev 549)
@@ -1,365 +0,0 @@
-nagios-plugins (1.4.2-6) unreleased; urgency=low
-
- * NOT YET RELEASED
- * 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
-
- -- Marc Haber <mh+debian-packages at zugschlus.de> Fri, 20 Jan 2006 19:05:15 +0000
-
-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" <f.a.g.luteijn at knoware.nl>:
- * 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 <seanius at debian.org> 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 <seanius at debian.org> 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 <seanius at debian.org> 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 <seanius at debian.org> 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 <seanius at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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_<MTA> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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" <fungi at yuggoth.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> 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 <ultrotter at debian.org> Sun, 1 Feb 2004 10:32:04 +0100
-
Copied: nagios-plugins/tags/1.4.2-6/debian/changelog (from rev 548, nagios-plugins/trunk/debian/changelog)
Deleted: nagios-plugins/tags/1.4.2-6/debian/control
===================================================================
--- nagios-plugins/trunk/debian/control 2006-01-23 16:24:51 UTC (rev 543)
+++ nagios-plugins/tags/1.4.2-6/debian/control 2006-01-23 22:55:32 UTC (rev 549)
@@ -1,75 +0,0 @@
-Source: nagios-plugins
-Section: net
-Priority: extra
-Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
-Uploaders: sean finney <seanius at debian.org>, Guido Trotter <ultrotter at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.9), autotools-dev, libldap2-dev, postgresql-dev, libmysqlclient14-dev | libmysqlclient-dev, libsnmp9-dev | libsnmp-dev, libradius1-dev, libkrb5-dev, libnet-snmp-perl, procps, coreutils | fileutils, iputils-ping, dnsutils, bind9-host | host, snmp, mawk | awk
-Standards-Version: 3.6.2
-
-Package: nagios-plugins
-Architecture: any
-Depends: nagios-plugins-basic, nagios-plugins-standard
-Suggests: nagios-text | nagios
-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 meta-package 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
-Conflicts: nagios-plugins (<= 1.4.2-3)
-Replaces: nagios-plugins
-Suggests: nagios-text | nagios
-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, iputils-ping, dnsutils, bind9-host | host, ntpdate, ntp, smbclient
-Suggests: nagios-text | nagios
-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.
Copied: nagios-plugins/tags/1.4.2-6/debian/control (from rev 547, nagios-plugins/trunk/debian/control)
Deleted: nagios-plugins/tags/1.4.2-6/debian/patches/10_config.h_debiandefaults.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/10_config.h_debiandefaults.dpatch 2006-01-23 16:24:51 UTC (rev 543)
+++ nagios-plugins/tags/1.4.2-6/debian/patches/10_config.h_debiandefaults.dpatch 2006-01-23 22:55:32 UTC (rev 549)
@@ -1,82 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_config.h_debiandefaults.dpatch by <seanius at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad sid~/configure sid/configure
---- sid~/configure 2005-09-30 15:56:02.000000000 +0200
-+++ sid/configure 2005-10-31 21:15:42.000000000 +0100
-@@ -7760,7 +7760,7 @@
- fi;
-
-
--EXTRAS=
-+#EXTRAS=
-
- LDFLAGS="$LDFLAGS -L."
-
-diff -urNad sid~/np-debian.h sid/np-debian.h
---- sid~/np-debian.h 1970-01-01 01:00:00.000000000 +0100
-+++ sid/np-debian.h 2005-10-31 21:15:42.000000000 +0100
-@@ -0,0 +1,25 @@
-+#ifndef _NP_DEBIAN_H_
-+#define _NP_DEBIAN_H_
-+
-+#undef PATH_TO_MAILQ
-+#define PATH_TO_MAILQ "/usr/bin/mailq"
-+
-+#undef SSH_COMMAND
-+#define SSH_COMMAND "/usr/bin/ssh"
-+
-+#undef PATH_TO_FPING
-+#define PATH_TO_FPING "/usr/bin/fping"
-+
-+#undef PATH_TO_QSTAT
-+#define PATH_TO_QSTAT "/usr/bin/quakestat"
-+
-+#undef PATH_TO_SMBCLIENT
-+#define PATH_TO_SMBCLIENT "/usr/bin/smbclient"
-+
-+#undef PATH_TO_NTPDATE
-+#define PATH_TO_NTPDATE "/usr/sbin/ntpdate"
-+
-+#undef PATH_TO_NTPQ
-+#define PATH_TO_NTPQ "/usr/bin/ntpq"
-+
-+#endif /* _NP_DEBIAN_H_ */
-diff -urNad sid~/plugins/common.h sid/plugins/common.h
---- sid~/plugins/common.h 2004-12-10 01:13:43.000000000 +0100
-+++ sid/plugins/common.h 2005-10-31 21:16:22.000000000 +0100
-@@ -33,6 +33,7 @@
- *****************************************************************************/
-
- #include "config.h"
-+#include "np-debian.h"
-
- #ifdef HAVE_FEATURES_H
- #include <features.h>
-diff -urNad sid~/plugins-scripts/utils.pm.in sid/plugins-scripts/utils.pm.in
---- sid~/plugins-scripts/utils.pm.in 2003-04-13 06:25:36.000000000 +0200
-+++ sid/plugins-scripts/utils.pm.in 2005-10-31 21:15:42.000000000 +0100
-@@ -35,13 +35,13 @@
- sub is_hostname;
-
- ## updated by autoconf
--$PATH_TO_RPCINFO = "@PATH_TO_RPCINFO@" ;
--$PATH_TO_NTPDATE = "@PATH_TO_NTPDATE@" ;
--$PATH_TO_NTPDC = "@PATH_TO_NTPDC@" ;
--$PATH_TO_NTPQ = "@PATH_TO_NTPQ@" ;
-+$PATH_TO_RPCINFO = "/usr/bin/rpcinfo";
-+$PATH_TO_NTPDATE = "/usr/sbin/ntpdate";
-+$PATH_TO_NTPDC = "/usr/bin/ntpdc";
-+$PATH_TO_NTPQ = "/usr/bin/ntpq";
- $PATH_TO_LMSTAT = "@PATH_TO_LMSTAT@" ;
--$PATH_TO_SMBCLIENT = "@PATH_TO_SMBCLIENT@" ;
--$PATH_TO_MAILQ = "@PATH_TO_MAILQ@";
-+$PATH_TO_SMBCLIENT = "/usr/bin/smbclient";
-+$PATH_TO_MAILQ = "/usr/bin/mailq";
- $PATH_TO_QMAIL_QSTAT = "@PATH_TO_QMAIL_QSTAT@";
-
- ## common variables
Copied: nagios-plugins/tags/1.4.2-6/debian/patches/10_config.h_debiandefaults.dpatch (from rev 546, nagios-plugins/trunk/debian/patches/10_config.h_debiandefaults.dpatch)
Copied: nagios-plugins/tags/1.4.2-6/debian/pluginconfig/fping.cfg (from rev 546, nagios-plugins/trunk/debian/pluginconfig/fping.cfg)
Deleted: nagios-plugins/tags/1.4.2-6/debian/pluginconfig/ping.cfg
===================================================================
--- nagios-plugins/trunk/debian/pluginconfig/ping.cfg 2006-01-23 16:24:51 UTC (rev 543)
+++ nagios-plugins/tags/1.4.2-6/debian/pluginconfig/ping.cfg 2006-01-23 22:55:32 UTC (rev 549)
@@ -1,41 +0,0 @@
-# '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
- }
-
-
-# 'check-fast-alive' command definition
-define command{
- command_name check-fast-alive
- command_line /usr/lib/nagios/plugins/check_fping -H $HOSTADDRESS$
- }
-
Copied: nagios-plugins/tags/1.4.2-6/debian/pluginconfig/ping.cfg (from rev 546, nagios-plugins/trunk/debian/pluginconfig/ping.cfg)
Deleted: nagios-plugins/tags/1.4.2-6/debian/rules
===================================================================
--- nagios-plugins/trunk/debian/rules 2006-01-23 16:24:51 UTC (rev 543)
+++ nagios-plugins/tags/1.4.2-6/debian/rules 2006-01-23 22:55:32 UTC (rev 549)
@@ -1,138 +0,0 @@
-#!/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
-
-NP_LIBEXEC:=/usr/lib/nagios/plugins
-NP_ETC:=/etc/nagios-plugins/config
-NP_BASIC_DIR:=$(CURDIR)/debian/nagios-plugins-basic
-NP_STD_DIR:=$(CURDIR)/debian/nagios-plugins-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_pgsql check_disk_smb check_ldap \
- check_ping check_dns check_flexlm check_ntp check_oracle
-std_plugin_cfgs:=breeze dns flexlm games hppjd ifstatus ldap mrtg mysql \
- netware nt ntp pgsql ping radius snmp
-
-
-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
- ln -sf /usr/share/misc/config.sub .
- ln -sf /usr/share/misc/config.guess .
- rm -f config.cache
-
- # Add here commands to configure the package.
- EXTRAS="check_game check_fping check_by_ssh" 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-nagios-user=nagios --with-nagios-group=nagios --with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin --with-df-command="/bin/df -Pk"
-
-build: patch-stamp build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- #/usr/bin/docbook-to-man debian/nagios-plugins.sgml > nagios-plugins.1
-
- 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.
- -$(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 \;
- 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
- cp $(CURDIR)/debian/pluginconfig/*.cfg ${NP_BASIC_DIR}/${NP_ETC}
- # 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
- for c in ${std_plugin_cfgs}; do \
- mv ${NP_BASIC_DIR}/${NP_ETC}/$${c}.cfg ${NP_STD_DIR}/${NP_ETC}; \
- done
- # XXX upstream breakage
- ln -s check_ldap ${NP_STD_DIR}/${NP_LIBEXEC}/check_ldaps
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples command.cfg
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
-# dh_link
- dh_strip
- dh_compress
- dh_fixperms -X utils.pm
-# dh_perl
-# dh_python
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
Copied: nagios-plugins/tags/1.4.2-6/debian/rules (from rev 546, nagios-plugins/trunk/debian/rules)
More information about the Pkg-nagios-changes
mailing list