[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 04/08: Make varnish build with v5

[Bernd Zeimetz]

This is an automated email from the git hooks/post-receive script.

bzed pushed a commit to branch jessie-backports
in repository pkg-nagios-plugins-contrib.

commit f2c1500d897f8af35938698382dff2de38ea5c13
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Tue Jan 3 16:48:10 2017 +0100

    Make varnish build with v5
---
 check_varnish/Makefile                        | 15 ++++++++++++---
 debian/patches/check_varnish/automake_foreign | 15 ---------------
 debian/patches/check_varnish/fix_for_v5       | 13 +++++++++++++
 debian/patches/series                         |  1 +
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/check_varnish/Makefile b/check_varnish/Makefile
index bb192e7..94bfcc3 100644
--- a/check_varnish/Makefile
+++ b/check_varnish/Makefile
@@ -1,6 +1,15 @@
-#/usr/bin/make -f
-
-PLUGIN = src/check_varnish
+PLUGIN := check_varnish
+CLEANFILES := check_varnish
 
 include ../common.mk
 
+check_varnish:
+	set -e; for i in guess sub; do if [ ! -e src/config.$$i.bak ]; then cp src/config.$$i src/config.$$i.bak; fi; done
+	cp /usr/share/misc/config.* src
+	cd src && ./configure --prefix=/usr
+	make -C src
+	cp src/check_varnish $@
+
+clean::
+	[ ! -f src/Makefile ] || make -C src distclean
+	set -e; for i in guess sub; do if [ -e src/config.$$i.bak ]; then mv src/config.$$i.bak src/config.$$i; fi; done
diff --git a/debian/patches/check_varnish/automake_foreign b/debian/patches/check_varnish/automake_foreign
deleted file mode 100644
index 74ada45..0000000
--- a/debian/patches/check_varnish/automake_foreign
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Jan Wagner <waja at cyconet.org>
-Description:
- Ignore missing of required files on autoreconf
-
---- a/check_varnish/src/configure.ac
-+++ b/check_varnish/src/configure.ac
-@@ -10,7 +10,7 @@ AM_CONFIG_HEADER(config.h)
- AC_CANONICAL_SYSTEM
- AC_LANG(C)
- 
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
- 
- # Checks for programs.
- AC_GNU_SOURCE
diff --git a/debian/patches/check_varnish/fix_for_v5 b/debian/patches/check_varnish/fix_for_v5
new file mode 100644
index 0000000..c37b4b8
--- /dev/null
+++ b/debian/patches/check_varnish/fix_for_v5
@@ -0,0 +1,13 @@
+--- a/check_varnish/src/check_varnish.c
++++ b/check_varnish/src/check_varnish.c
+@@ -51,6 +51,10 @@
+ #include "varnishapi.h"
+ #endif
+ 
++#if !defined(VSC_ARGS)
++#define VSC_ARGS    "f:n:N:"
++#endif
++
+ static int verbose = 0;
+ 
+ struct range {
diff --git a/debian/patches/series b/debian/patches/series
index 7a6b702..dc90707 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,3 +48,4 @@ check_cups/ParseDateDelta
 check_printer/epn
 check_nfsmounts/nfs4_support
 check_httpd_status/htdigest_auth
+check_varnish/fix_for_v5

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins-contrib.git