[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.7.1-2-6-g683ca22

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 683ca2266319ff1e4f226cb60c21e417b74e3e25
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Sep 9 13:00:02 2012 +0200

    Cherrypick epn fix from git

diff --git a/debian/patches/00list b/debian/patches/00list
index 4b8d6cf..1530c3b 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -4,3 +4,4 @@
 70_fix_eventhandler_paths.dpatch
 80_fix_dbd_handling.dpatch
 95_fix_db_upgrade.dpatch
+99_fix_epn.dpatch
diff --git a/debian/patches/99_fix_epn.dpatch b/debian/patches/99_fix_epn.dpatch
new file mode 100755
index 0000000..ea77df7
--- /dev/null
+++ b/debian/patches/99_fix_epn.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_fix_epn.dpatch by Alexander Wirt <formorer at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix for segfault in epn, cherrypicked from git
+## DP: cedcb4a3f9fd34e2a72988e560a884fb0d8891af
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-icinga~/base/utils.c pkg-icinga/base/utils.c
+--- pkg-icinga~/base/utils.c	2012-08-29 21:50:46.000000000 +0200
++++ pkg-icinga/base/utils.c	2012-09-09 12:37:44.408419317 +0200
+@@ -3601,6 +3601,7 @@
+ 	/* grab the first line - we should see Perl. go home if not */
+ 	if (fgets(buf, 80, fp) == NULL || strstr(buf, "/bin/perl") == NULL) {
+ 		fclose(fp);
++		return FALSE;
+ 	}
+ 
+ 	/* epn directives must be found in first ten lines of plugin */

-- 
debian packaging of icinga(-core)