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

just use inetutils-ping on non-linux

Browse source
This commit is contained in:
Jan Wagner 2010-01-12 21:46:33 +00:00
parent ffaf5adbfe
commit d056e2d95c
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
debian/changelog vendored
View file

@ -18,11 +18,10 @@ nagios-plugins (1.4.14-1) unstable; urgency=low
* Add 40_check_http_proxy_auth.dpatch to make check_http able to check proxy * Add 40_check_http_proxy_auth.dpatch to make check_http able to check proxy
authorization authorization
* Update copyright, thanks to Robert Millan (Closes: 548303) * Update copyright, thanks to Robert Millan (Closes: 548303)
* Depend on inetutils-ping instead of iputils-ping, thanks to Petr Salinger * Depend on inetutils-ping on kfreebsd and hurd, thanks to Petr Salinger
(Closes: #555532) (Closes: #555532)
- Use '-n -c %d %s' as ping argument, since unfortunately '-U -w %d' isn't - Use '-n -c %d %s' as ping argument on archs where inetutils-ping is used
supported by inetutils-ping - Add 41_check_ping_detect_args.dpatch, thanks to Thomas Guyot-Sionnest
- Add 41_check_ping_detect_args.dpatch, that to Thomas Guyot-Sionnest
* Add hint to NEWS.Debian, that check_linux_raid.pl and check_bgpstate will * Add hint to NEWS.Debian, that check_linux_raid.pl and check_bgpstate will
be removed in the next future be removed in the next future
* Add 42_check_linux_raid_fix_r10.dpatch, which fixes RAID Levels with more * Add 42_check_linux_raid_fix_r10.dpatch, which fixes RAID Levels with more

13
debian/rules vendored
View file

@ -14,6 +14,7 @@ include /usr/share/dpatch/dpatch.make
# from having to guess our platform (since we know it already) # from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
CFLAGS = -Wall -g CFLAGS = -Wall -g
@ -47,6 +48,15 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s INSTALL_PROGRAM += -s
endif endif
ifeq ($(DEB_HOST_ARCH_OS),linux)
PING_CONFIGURE_ARGS = --with-ping-command="/bin/ping -n -U -w %d -c %d %s" \
--with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s"
else
PING_CONFIGURE_ARGS = --with-ping-command="/bin/ping -n -c %d %s" \
--with-ping6-command="/bin/ping6 -n -c %d %s"
endif
config.status: configure config.status: configure
export PATH=$(PATH) export PATH=$(PATH)
dh_testdir dh_testdir
@ -81,8 +91,7 @@ config.status: configure
--with-ps-format="%s %d %d %d %d %d %f %s %s %n" \ --with-ps-format="%s %d %d %d %d %d %f %s %s %n" \
--with-ps-cols=10 \ --with-ps-cols=10 \
--with-ps-varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos" \ --with-ps-varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos" \
--with-ping-command="/bin/ping -n -c %d %s" \ $(PING_CONFIGURE_ARGS) \
--with-ping6-command="/bin/ping6 -n -c %d %s" \
--with-nslookup-command="/usr/bin/nslookup -sil" \ --with-nslookup-command="/usr/bin/nslookup -sil" \
--with-uptime-command="/usr/bin/uptime" \ --with-uptime-command="/usr/bin/uptime" \
--with-rpcinfo-command="/usr/bin/rpcinfo" \ --with-rpcinfo-command="/usr/bin/rpcinfo" \