[Pkg-nagios-devel] Bug#555532: Bug#555532: nagios: uninstallable/unbuildable on non-linux

[Petr Salinger]

> a short status update of the bug. With upstream I managed to get the stuff to
> compile and running on the first look.
> After testing the package for a while, I recognized that the migration over to
> iputils-ping introduces a regression. If a echo reply is missing, check_ping
> seems to return nothing, which results into a "Plugin timed out after 10
> seconds". A bit more information can be found at
> https://sourceforge.net/tracker/?func=detail&atid=397597&aid=2896201&group_id=29880
> and I contacted upstream about the problem ~3 weeks ago, but as you may
> imagine, the holidays we had, slowed the process a bit down.
>
> Anyhow ... this bug is at the moment the main showstopper to upload an updated
> package. Leaving it unfixed with the next upload seems not an option, but
> having the freeze in march in mind, things will get a bit into rush, as I
> don't want to upload the package in the last minutes. Fixing new bugs
> (possible introduced with the new upload) before the freeze, will be more
> comfortable for all related parties.
>
> So ... if anybody has a solution in mind to get the package using iputils-ping
> (at least on non-linux) and not introducing the regression on the remaining
> arch, feel free to step forward and provide patches now! :)

You can of course conditionalize build-dependencies and dependencies based 
on architecture. This way configuration on linux could remain the same
(no regression) and on previously uninstallable architectures
there could be limited functionality (improvement). See bellow for idea.

I looked into sources of inetutils-ping - it looks like its general 
timeout is 10 seconds. So please could be also possible to alter
"plugin timeout" to use 15 seconds ?

Thanks for your care about GNU/kFreeBSD.

Petr

--- debian/control~
+++ debian/control
@@ -33,7 +33,7 @@

  Package: nagios-plugins-basic
  Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping [linux-any], inetutils-ping [kfreebsd-any hurd-any], ucf
  Conflicts: nagios-plugins (<= 1.4.2-3)
  Replaces: nagios-plugins, nagios-plugins-standard
  Suggests: nagios3



--- debian/rules~
+++ debian/rules
@@ -14,6 +14,7 @@
  # 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)
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)

  CFLAGS = -Wall -g

@@ -47,6 +48,15 @@
         INSTALL_PROGRAM += -s
  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
         export PATH=$(PATH)
         dh_testdir
@@ -81,8 +91,7 @@
                 --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" \
+               $(PING_CONFIGURE_ARGS) \
                 --with-nslookup-command="/usr/bin/nslookup -sil" \
                 --with-uptime-command="/usr/bin/uptime" \
                 --with-rpcinfo-command="/usr/bin/rpcinfo" \