debian/pkg-monitoring-plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

moved check_ping over, and some more cleanup in the build-deps

Browse source
This commit is contained in:
Sean Finney 2006-01-23 19:31:28 +00:00
parent cb16874e63
commit bcf6c6d586
6 changed files with 111 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
debian/changelog vendored
View file

@ -1,6 +1,19 @@
nagios-plugins (1.4.2-6) unreleased; urgency=low nagios-plugins (1.4.2-6) unreleased; urgency=low
* NOT YET RELEASED * NOT YET RELEASED
[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 * migrate package from CVS to svn
* add 23_check_axis.dpatch, making the package suiteable to * add 23_check_axis.dpatch, making the package suiteable to
debian/-only layout debian/-only layout

6
debian/control vendored
View file

@ -3,7 +3,7 @@ Section: net
Priority: extra Priority: extra
Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org> Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
Uploaders: sean finney <seanius@debian.org>, Guido Trotter <ultrotter@debian.org> Uploaders: sean finney <seanius@debian.org>, Guido Trotter <ultrotter@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 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, snmp, mawk | awk
Standards-Version: 3.6.2 Standards-Version: 3.6.2
Package: nagios-plugins Package: nagios-plugins
@ -30,7 +30,7 @@ Description: Plugins for the nagios network monitoring and management system
Package: nagios-plugins-basic Package: nagios-plugins-basic
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, procps Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping
Conflicts: nagios-plugins (<= 1.4.2-3) Conflicts: nagios-plugins (<= 1.4.2-3)
Replaces: nagios-plugins Replaces: nagios-plugins
Suggests: nagios-text | nagios Suggests: nagios-text | nagios
@ -56,7 +56,7 @@ Package: nagios-plugins-standard
Architecture: any Architecture: any
Conflicts: nagios-plugins (<= 1.4.2-3) Conflicts: nagios-plugins (<= 1.4.2-3)
Replaces: nagios-plugins Replaces: nagios-plugins
Depends: ${shlibs:Depends}, ${misc:Depends}, fping, qstat, snmp, radiusclient1, libnet-snmp-perl, iputils-ping, dnsutils, bind9-host | host, ntpdate, ntp, smbclient Depends: ${shlibs:Depends}, ${misc:Depends}, fping, qstat, snmp, radiusclient1, libnet-snmp-perl, dnsutils, bind9-host | host, ntpdate, ntp, smbclient
Suggests: nagios-text | nagios Suggests: nagios-text | nagios
Description: Plugins for the nagios network monitoring and management system Description: Plugins for the nagios network monitoring and management system
Nagios is a host/service/network monitoring and management system. It has Nagios is a host/service/network monitoring and management system. It has

99
debian/patches/10_config.h_debiandefaults.dpatch vendored
View file

@ -5,9 +5,9 @@
## DP: No description. ## DP: No description.
@DPATCH@ @DPATCH@
diff -urNad sid~/configure sid/configure diff -urNad nagios-plugins-1.4.2~/configure nagios-plugins-1.4.2/configure
--- sid~/configure 2005-09-30 15:56:02.000000000 +0200 --- nagios-plugins-1.4.2~/configure 2005-09-19 15:58:16.000000000 +0200
+++ sid/configure 2005-10-31 21:15:42.000000000 +0100 +++ nagios-plugins-1.4.2/configure 2006-01-23 18:45:39.000000000 +0100
@@ -7760,7 +7760,7 @@ @@ -7760,7 +7760,7 @@
fi; fi;
@ -17,9 +17,84 @@ diff -urNad sid~/configure sid/configure
LDFLAGS="$LDFLAGS -L." LDFLAGS="$LDFLAGS -L."
diff -urNad sid~/np-debian.h sid/np-debian.h @@ -14743,72 +14743,10 @@
--- sid~/np-debian.h 1970-01-01 01:00:00.000000000 +0100 fi
+++ sid/np-debian.h 2005-10-31 21:15:42.000000000 +0100 fi
-# Extract the first word of "nslookup", so it can be a program name with args.
-set dummy nslookup; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PATH_TO_NSLOOKUP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $PATH_TO_NSLOOKUP in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PATH_TO_NSLOOKUP="$PATH_TO_NSLOOKUP" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PATH_TO_NSLOOKUP="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- ;;
-esac
-fi
-PATH_TO_NSLOOKUP=$ac_cv_path_PATH_TO_NSLOOKUP
-
-if test -n "$PATH_TO_NSLOOKUP"; then
- echo "$as_me:$LINENO: result: $PATH_TO_NSLOOKUP" >&5
-echo "${ECHO_T}$PATH_TO_NSLOOKUP" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
-echo "$as_me:$LINENO: checking for nslookup syntax" >&5
-echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6
-if test -n "$PATH_TO_NSLOOKUP"
-then
- if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null
- then
- ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
- echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
-echo "${ECHO_T}$ac_cv_nslookup_command" >&6
-
- else
- ac_cv_nslookup_command="$PATH_TO_NSLOOKUP -sil"
- echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
-echo "${ECHO_T}$ac_cv_nslookup_command" >&6
-
- fi
- EXTRAS="$EXTRAS check_dns"
-
-else
- { echo "$as_me:$LINENO: WARNING: nslookup command not found" >&5
-echo "$as_me: WARNING: nslookup command not found" >&2;}
-fi
-
+EXTRAS="$EXTRAS check_dns"
cat >>confdefs.h <<_ACEOF
-#define NSLOOKUP_COMMAND "$ac_cv_nslookup_command"
+#define NSLOOKUP_COMMAND "$NSLOOKUP_COMMAND"
_ACEOF
diff -urNad nagios-plugins-1.4.2~/np-debian.h nagios-plugins-1.4.2/np-debian.h
--- nagios-plugins-1.4.2~/np-debian.h 1970-01-01 01:00:00.000000000 +0100
+++ nagios-plugins-1.4.2/np-debian.h 2006-01-23 18:24:07.000000000 +0100
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
+#ifndef _NP_DEBIAN_H_ +#ifndef _NP_DEBIAN_H_
+#define _NP_DEBIAN_H_ +#define _NP_DEBIAN_H_
@ -46,9 +121,9 @@ diff -urNad sid~/np-debian.h sid/np-debian.h
+#define PATH_TO_NTPQ "/usr/bin/ntpq" +#define PATH_TO_NTPQ "/usr/bin/ntpq"
+ +
+#endif /* _NP_DEBIAN_H_ */ +#endif /* _NP_DEBIAN_H_ */
diff -urNad sid~/plugins/common.h sid/plugins/common.h diff -urNad nagios-plugins-1.4.2~/plugins/common.h nagios-plugins-1.4.2/plugins/common.h
--- sid~/plugins/common.h 2004-12-10 01:13:43.000000000 +0100 --- nagios-plugins-1.4.2~/plugins/common.h 2004-12-10 01:13:43.000000000 +0100
+++ sid/plugins/common.h 2005-10-31 21:16:22.000000000 +0100 +++ nagios-plugins-1.4.2/plugins/common.h 2006-01-23 18:24:07.000000000 +0100
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
*****************************************************************************/ *****************************************************************************/
@ -57,9 +132,9 @@ diff -urNad sid~/plugins/common.h sid/plugins/common.h
#ifdef HAVE_FEATURES_H #ifdef HAVE_FEATURES_H
#include <features.h> #include <features.h>
diff -urNad sid~/plugins-scripts/utils.pm.in sid/plugins-scripts/utils.pm.in diff -urNad nagios-plugins-1.4.2~/plugins-scripts/utils.pm.in nagios-plugins-1.4.2/plugins-scripts/utils.pm.in
--- sid~/plugins-scripts/utils.pm.in 2003-04-13 06:25:36.000000000 +0200 --- nagios-plugins-1.4.2~/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 +++ nagios-plugins-1.4.2/plugins-scripts/utils.pm.in 2006-01-23 18:24:07.000000000 +0100
@@ -35,13 +35,13 @@ @@ -35,13 +35,13 @@
sub is_hostname; sub is_hostname;

5
debian/pluginconfig/fping.cfg vendored Normal file
View file

@ -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$
}

7
debian/pluginconfig/ping.cfg vendored
View file

@ -32,10 +32,3 @@ define command{
command_line /usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1 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$
}

6
debian/rules vendored
View file

@ -24,9 +24,9 @@ NP_STD_DIR:=$(CURDIR)/debian/nagios-plugins-standard
std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \ std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \
check_rpc check_snmp check_wave check_fping check_game \ check_rpc check_snmp check_wave check_fping check_game \
check_radius check_mysql check_pgsql check_disk_smb check_ldap \ check_radius check_mysql check_pgsql check_disk_smb check_ldap \
check_ping check_dns check_flexlm check_ntp check_oracle check_dns check_dig check_flexlm check_ntp check_oracle
std_plugin_cfgs:=breeze dns flexlm games hppjd ifstatus ldap mrtg mysql \ std_plugin_cfgs:=breeze dns flexlm games hppjd ifstatus ldap mrtg mysql \
netware nt ntp pgsql ping radius snmp netware nt ntp pgsql radius snmp
PATH = /bin:/sbin:/usr/bin:/usr/sbin PATH = /bin:/sbin:/usr/bin:/usr/sbin
@ -49,7 +49,7 @@ config.status: configure
rm -f config.cache rm -f config.cache
# Add here commands to configure the package. # 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" EXTRAS="check_game check_fping check_by_ssh check_dig check_dns" PATH_TO_DIG="/usr/bin/dig" PATH_TO_NSLOOKUP="/usr/bin/nslookup" NSLOOKUP_COMMAND="/usr/bin/nslookup -sil" PATH_TO_HOST="/usr/bin/host" 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: patch-stamp build-stamp