[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.7.2-1-13-geec91d0

Alexander Wirt formorer at debian.org
Wed Oct 17 13:49:44 UTC 2012


The following commit has been merged in the master branch:
commit 74ea069fe9e7a435d2de987f3caa11d83bcd01ff
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Oct 16 13:59:09 2012 +0200

    Remove obsolete patch 99_fix_epn.dpatch

diff --git a/debian/patches/00list b/debian/patches/00list
index 2ad92c3..2d4d220 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,4 +3,3 @@
 52_icinga.cfg-debianize.dpatch
 70_fix_eventhandler_paths.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
deleted file mode 100755
index ea77df7..0000000
--- a/debian/patches/99_fix_epn.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /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)



More information about the Pkg-nagios-changes mailing list