[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.1-2-9-g6ec83b0

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 6ec83b016f3bd1b23cac0b98b4b61fb07c9aa125
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Mar 31 10:45:48 2012 +0200

    Fix json output of tac.cgi
    
    Closes: #663224

diff --git a/debian/patches/00list b/debian/patches/00list
index a096444..36bcb19 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,3 +3,4 @@
 52_icinga.cfg-debianize.dpatch
 55_idoutils-debianize
 70_fix_eventhandler_paths.dpatch
+80_fix_tac_json
diff --git a/debian/patches/80_fix_tac_json.dpatch b/debian/patches/80_fix_tac_json.dpatch
new file mode 100755
index 0000000..57f5d0d
--- /dev/null
+++ b/debian/patches/80_fix_tac_json.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_fix_tac_json.dpatch by Alexander Wirt <formorer at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix for https://dev.icinga.org/issues/2160
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-icinga~/cgi/tac.c pkg-icinga/cgi/tac.c
+--- pkg-icinga~/cgi/tac.c	2011-11-26 09:13:04.000000000 +0100
++++ pkg-icinga/cgi/tac.c	2012-03-31 10:44:49.921561000 +0200
+@@ -1710,8 +1710,8 @@
+ 		printf("\"total_active_host_checks_with_passive_disabled\": %d,\n", total_active_host_checks_with_passive_disabled);
+ 
+ 		printf("\"total_active_service_checks\": %d,\n", total_active_service_checks);
+-		printf("\"total_passive_service_checks\": %d\n", total_passive_service_checks);
+-		printf("\"total_disabled_service_checks\": %d\n", total_disabled_service_checks);
++		printf("\"total_passive_service_checks\": %d,\n", total_passive_service_checks);
++		printf("\"total_disabled_service_checks\": %d,\n", total_disabled_service_checks);
+ 		printf("\"total_active_service_checks_with_passive_disabled\": %d\n", total_active_service_checks_with_passive_disabled);
+ 
+ 		printf(" }\n");

-- 
debian packaging of icinga(-core)