debian/0000755000000000000000000000000012222011625007157 5ustar debian/patches/0000755000000000000000000000000012222011575010612 5ustar debian/patches/0002-Ensure-make-all-does-not-overwrite-git-hooks.patch0000644000000000000000000000113712222011575022612 0ustar From 36067dc8688a7e219798f93c814e5ea0bf310b09 Mon Sep 17 00:00:00 2001 From: Stig Sandbeck Mathisen Date: Sun, 29 Sep 2013 13:36:47 +0200 Subject: [PATCH] Ensure "make all" does not overwrite git hooks --- Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 7c7aedd..a0363ab 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,7 +57,6 @@ all: @ cd $(SRC_PL_TEST) && $(MAKE) -s -e $@ @ cd $(SRC_CONTRIB) && $(MAKE) -s -e $@ @ cd $(SRC_CONFIG) && $(MAKE) -s -e $@ - $(MAKE) hook @echo "" @echo " Make process finished" -- 1.7.10.4 debian/patches/0001-Fix-build-test-to-work-with-perl-5.18.patch0000644000000000000000000000216712222011575020721 0ustar From 6bba1ca89424d5bc005f0a50e8ceab29f7b3f1d8 Mon Sep 17 00:00:00 2001 From: Stig Sandbeck Mathisen Date: Sun, 29 Sep 2013 11:33:41 +0200 Subject: [PATCH] Fix build test to work with perl 5.18 The test "option s requires an argument - RC3" fails when building with perl 5.18. Output differs from perl 5.14, when called with wrong argument. - In perl 5.14, output goes to stdout, and looks like normal plugin output with. - In perl 5.18, output goes to stderr, which the included test module does not capture. There is a new "Usage: " output to stdout, which is checked for instead. --- plugins/t/10_check_multi.t.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/t/10_check_multi.t.in b/plugins/t/10_check_multi.t.in index d95482d..da2755d 100644 --- a/plugins/t/10_check_multi.t.in +++ b/plugins/t/10_check_multi.t.in @@ -864,7 +864,7 @@ is( ); like( $result->output, - '/OK - 0 plugins checked, \[Option s requires an argument.*\]/', + '/^Usage:/', "output correct", ); #------------------------------------------------------------------------------- -- 1.7.10.4 debian/patches/series0000644000000000000000000000027012222011575012026 0ustar # debian/source/git-patches exported from git by quilt-patches-deb-export-hook 0001-Fix-build-test-to-work-with-perl-5.18.patch 0002-Ensure-make-all-does-not-overwrite-git-hooks.patch debian/watch0000644000000000000000000000021112222011563010203 0ustar version=3 http://my-plugin.de/wiki/projects/check_multi/download \ http://my-plugin.de/check_multi/check_multi-stable-(\d+\.\d+).tar.gz debian/source/0000755000000000000000000000000012222011563010460 5ustar debian/source/git-patches0000644000000000000000000000030312222011563012607 0ustar # Patches for 0.26: # - ensure "make test" works with perl 5.18 upstream/0.26..patches/0.26-make-test # - defang "make all", remove git hook overwrite upstream/0.26..patches/0.26-defang-make-all debian/source/format0000644000000000000000000000001412222011563011666 0ustar 3.0 (quilt) debian/rules0000755000000000000000000000212512222011563010240 0ustar #!/usr/bin/make -f # -*- makefile -*- DEB_VERSION := $(shell dpkg-parsechangelog --format rfc822 | grep-dctrl -ensVersion -S .) %: dh --with autoreconf $@ override_dh_auto_build: make all override_dh_auto_clean: [ -e "Makefile" ] && make clean || true rm -f debian/check_multi.8 plugins/t/testopts.pm override_dh_auto_configure: dh_auto_configure -- \ --libexecdir=/usr/lib/nagios/plugins \ --localstatedir=/var/cache/nagios3 override_dh_auto_install: make install DESTDIR=$(CURDIR)/debian/nagios-plugin-check-multi make install-config DESTDIR=$(CURDIR)/debian/nagios-plugin-check-multi \ CFGDIR=/usr/share/doc/nagios-plugin-check-multi/examples find $(CURDIR)/debian/nagios-plugin-check-multi/usr/share/doc/nagios-plugin-check-multi/examples \ -type f -print0 | xargs -0 -r chmod 644 # Make a man page help2man --no-info --section=8 --version-string="check_multi $(DEB_VERSION)" \ -n "nagios plugin to combine multiple service checks in one run" \ $(CURDIR)/debian/nagios-plugin-check-multi/usr/lib/nagios/plugins/check_multi \ > $(CURDIR)/debian/check_multi.8 debian/multi.cfg0000644000000000000000000000025712222011563010777 0ustar define command { command_name check_multi command_line /usr/lib/nagios/plugins/check_multi $ARG1$ $ARG2$ $ARG3$ $ARG4$ } debian/manpages0000644000000000000000000000002512222011563010673 0ustar debian/check_multi.8 debian/install0000644000000000000000000000005312222011563010547 0ustar debian/multi.cfg etc/nagios-plugins/config debian/docs0000644000000000000000000000001612222011563010030 0ustar README THANKS debian/dirs0000644000000000000000000000002012222011563010034 0ustar etc/check_multi debian/copyright0000644000000000000000000000267012222011563011120 0ustar This work was packaged for Debian by: Stig Sandbeck Mathisen on Fri, 22 Oct 2010 15:53:34 +0200 It was downloaded from: http://my-plugin.de/wiki/projects/check_multi/download Upstream Author: Matthias Flacke Copyright: Copyright (C) 2008-2009 Matthias Flacke License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU General Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. The Debian packaging is: Copyright (C) 2010 Stig Sandbeck Mathisen you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. debian/control0000644000000000000000000000141012222011563010557 0ustar Source: nagios-plugin-check-multi Section: net Priority: extra Maintainer: Debian Nagios Maintainer Group Uploaders: Stig Sandbeck Mathisen Build-Depends: autotools-dev, dctrl-tools, debhelper (>= 7.0.50~), dh-autoreconf, help2man, Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-nagios/pkg-check-multi.git Vcs-Browser: http://anonscm.debian.org/git/pkg-nagios/pkg-check-multi.git Homepage: http://my-plugin.de/wiki/projects/check_multi/start Package: nagios-plugin-check-multi Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} Description: run nagios checks as a group This plugin can run other plugins, and present the results as a group, with a single status code reported back debian/compat0000644000000000000000000000000212222011563010356 0ustar 7 debian/changelog0000644000000000000000000000332112222011563011031 0ustar nagios-plugin-check-multi (0.26-2) unstable; urgency=low * Add patch to fix FTBFS with perl 5.18 (Closes: #724113) * Add patch to ensure "make all" does not overwrite local git hooks * Bump standards version (no changes) * Remove version from help2man build dependency * Use dh-autoreconf * Use "make all" to build configuration properly -- Stig Sandbeck Mathisen Sun, 29 Sep 2013 13:47:54 +0200 nagios-plugin-check-multi (0.26-1) unstable; urgency=low * New upstream release (Closes: #642780) - Remove "more specific grep" patch, included upstream - Remove ./configure argument "--docdir" * Add a debian/watch file, for uscan * Remove debhelper template(s) -- Stig Sandbeck Mathisen Sat, 26 Nov 2011 20:28:20 +0100 nagios-plugin-check-multi (0.25-1) unstable; urgency=low * New upstream version * Use a more specific grep in tests (Closes: #628351) * Update VCS-* headers to point to anonscm.debian.org * Unapply patches after build * Bump standards-version (no changes) -- Stig Sandbeck Mathisen Sat, 04 Jun 2011 13:47:17 +0200 nagios-plugin-check-multi (0.24-2) unstable; urgency=low [ Stig Sandbeck Mathisen ] * Build with defaults for nagios3; add a README.Debian for Icinga instructions [ Marc Haber ] * add plugin example configuration -- Stig Sandbeck Mathisen Thu, 27 Jan 2011 11:19:58 +0100 nagios-plugin-check-multi (0.24-1) unstable; urgency=low [ Stig Sandbeck Mathisen ] * Initial release (Closes: #601966) [ Marc Haber ] * help rules clean cleaning up completely * add versioned dependency for help2man -- Stig Sandbeck Mathisen Sun, 21 Nov 2010 19:13:17 +0100 debian/README.Debian0000644000000000000000000000057612222011563011231 0ustar This package may be run with both Nagios and Icinga, and the built-in defaults conform to nagios3. If you want to run this with Icinga, you may have to add the following command line arguments: ,---- | -s objects_cache=/var/cache/icinga/objects.cache | -s status_dat=/var/cache/icinga/status.dat `---- -- Stig Sandbeck Mathisen , Thu, 27 Jan 2011 11:18:25 +0100