[Pkg-nagios-devel] Bug#929335: nagios-plugins-contrib FTCBFS: multiple reasons

[Helmut Grohne]

Source: nagios-plugins-contrib
Version: 24.20190301
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

nagios-plugins-contrib fails to build from source. The first failure is
installing Build-Depends as python and python-debian are not cross
satisfiable. Since these are only used for scripts, we can annotate them
with :native. Then, check_varnish is configured without --host. The
attached patch uses dh_auto_configure to fix that. Finally,
check_memcached hard codes the build architecture pkg-config. The
attached patch makes nagios-plugins-contrib cross buildable. Please
consider applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru nagios-plugins-contrib-24.20190301/debian/changelog nagios-plugins-contrib-24.20190301+nmu1/debian/changelog
--- nagios-plugins-contrib-24.20190301/debian/changelog	2019-03-01 14:22:08.000000000 +0100
+++ nagios-plugins-contrib-24.20190301+nmu1/debian/changelog	2019-05-21 21:15:19.000000000 +0200
@@ -1,3 +1,13 @@
+nagios-plugins-contrib (24.20190301+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Annotate python* build-depends with :native.
+    + Perform the check_varnish build using dh_auto_*
+    + cross.patch: Make pkg-config substitutable.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 21 May 2019 21:15:19 +0200
+
 nagios-plugins-contrib (24.20190301) unstable; urgency=medium
 
   * [94e6962] check_rbl: Update to 1.4.4
diff --minimal -Nru nagios-plugins-contrib-24.20190301/debian/control nagios-plugins-contrib-24.20190301+nmu1/debian/control
--- nagios-plugins-contrib-24.20190301/debian/control	2019-03-01 14:22:08.000000000 +0100
+++ nagios-plugins-contrib-24.20190301+nmu1/debian/control	2019-05-21 21:15:19.000000000 +0200
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bzed at debian.org>, Jan Wagner <waja at cyconet.org>, Stefan Schoerghofer <amd1212 at 4md.gr>, Petter Reinholdtsen <pere at hungry.com>, Leo Antunes <leo at costela.net>
-Build-Depends: debhelper (>= 8.0.0),
+Build-Depends: debhelper (>= 9.20160114),
                dh-autoreconf,
-               python,
-               python-debian,
+               python:any,
+               python-debian:native,
                quilt (>= 0.46-7),
                autotools-dev, flex, libmemcached-dev [!hurd-i386], libvarnishapi-dev [!hurd-i386 !m68k], pkg-config, automake-1.15
 Standards-Version: 4.3.0
diff --minimal -Nru nagios-plugins-contrib-24.20190301/debian/patches/cross.patch nagios-plugins-contrib-24.20190301+nmu1/debian/patches/cross.patch
--- nagios-plugins-contrib-24.20190301/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ nagios-plugins-contrib-24.20190301+nmu1/debian/patches/cross.patch	2019-05-21 21:15:19.000000000 +0200
@@ -0,0 +1,11 @@
+--- nagios-plugins-contrib-24.20190301+nmu1.orig/check_memcached/Makefile
++++ nagios-plugins-contrib-24.20190301+nmu1/check_memcached/Makefile
+@@ -1,6 +1,7 @@
+ #/usr/bin/make -f
+ CLEANFILES = check_memcached check_memcached.c
+-LIBS += $(shell pkg-config --libs libmemcached) -lpthread
++PKG_CONFIG ?= pkg-config
++LIBS += $(shell $(PKG_CONFIG) --libs libmemcached) -lpthread
+ 
+ include ../common.mk
+ 
diff --minimal -Nru nagios-plugins-contrib-24.20190301/debian/patches/series nagios-plugins-contrib-24.20190301+nmu1/debian/patches/series
--- nagios-plugins-contrib-24.20190301/debian/patches/series	2019-03-01 14:22:08.000000000 +0100
+++ nagios-plugins-contrib-24.20190301+nmu1/debian/patches/series	2019-05-21 21:15:19.000000000 +0200
@@ -52,3 +52,4 @@
 check_varnish/fix_for_v56
 check_raid/no_epn
 percona-nagios-plugins/fix_bashism
+cross.patch
diff --minimal -Nru nagios-plugins-contrib-24.20190301/debian/rules nagios-plugins-contrib-24.20190301+nmu1/debian/rules
--- nagios-plugins-contrib-24.20190301/debian/rules	2019-03-01 14:22:08.000000000 +0100
+++ nagios-plugins-contrib-24.20190301+nmu1/debian/rules	2019-05-21 21:15:19.000000000 +0200
@@ -11,6 +11,12 @@
 	dh $@ --with quilt,python2
 
 override_dh_auto_build:
+	dh_update_autotools_config
+	# Perform check_varnish/ build separately to use dh_auto_*
+	dh_auto_configure --sourcedirectory=check_varnish/src
+	dh_auto_build --sourcedirectory=check_varnish/src
+	cp check_varnish/src/check_varnish check_varnish/check_varnish
+
 	dh_auto_build
 	$(PACKAGING_HELPER) --generate-readme