averi pushed to check-mk (f20). "Include the 02-Downtime-Struct-Update patch to prevent Nagios to core dump when a downtime is set. (..more)"

[notifications at fedoraproject.org]

>From bdc477692fcc32c53af58010e59a6fe406d2aac9 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Fri, 10 Apr 2015 13:21:32 +0200
Subject: Include the 02-Downtime-Struct-Update patch to prevent Nagios to core
 dump when a downtime is set.

This was caused by a change on the downtime struct applied in the
course of Nagios 3's development. Thanks Mike Battersby for the patch. (BZ: #1083003)

diff --git a/02-Downtime-Struct-Update.patch b/02-Downtime-Struct-Update.patch
new file mode 100644
index 0000000..3d76b17
--- /dev/null
+++ b/02-Downtime-Struct-Update.patch
@@ -0,0 +1,22 @@
+--- nagios/downtime.h.orig	2013-03-04 22:48:41.000000000 +1100
++++ nagios/downtime.h	2015-03-19 12:15:09.000000000 +1100
+@@ -42,16 +42,18 @@
+ 	char *service_description;
+ 	time_t entry_time;
+ 	time_t start_time;
++	time_t flex_downtime_start;
+ 	time_t end_time;
+ 	int fixed;
+ 	unsigned long triggered_by;
+ 	unsigned long duration;
+ 	unsigned long downtime_id;
++	int is_in_effect;
++	int start_notification_sent;
+ 	char *author;
+ 	char *comment;
+ #ifdef NSCORE
+ 	unsigned long comment_id;
+-	int is_in_effect;
+ 	int start_flex_downtime;
+ 	int incremented_pending_downtime;
+ #endif
diff --git a/check-mk.spec b/check-mk.spec
index 9c0c9a9..26654df 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -21,6 +21,7 @@ Source1:    First-Installation.txt
 Source2:    defaults
 Source3:    defaults.py
 Patch0:     01-Set-Legacy-Eval-True.patch
+Patch1:     02-Downtime-Struct-Update.patch
 AutoReq:    0
 
 # Do not get provides from any of the documentation files 
@@ -97,6 +98,11 @@ tar xf agents.tar.gz
 tar xf web.tar.gz && rm -f web.tar.gz
 %patch0 -p0
 tar zcf web.tar.gz htdocs plugins
+gunzip livestatus.tar.gz
+tar xf livestatus.tar
+%patch1 -p0
+tar rf livestatus.tar nagios/downtime.h
+gzip livestatus.tar
 
 %build
 rm -f waitmax
@@ -338,6 +344,10 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
   (.cc, .c) for livestatus, mkeventd and waitmax anymore on the tarballs
   they release. We want to have these binaries built during the RPM build,
   thus the need to repack the tarball with the procedure outlined above.
+- Include the 02-Downtime-Struct-Update patch to prevent Nagios to core dump
+  when a downtime is set. This was caused by a change on the downtime struct
+  applied in the course of Nagios 3's development. Thanks Mike Battersby for
+  the patch. (BZ: #1083003)
 
 * Tue Sep 30 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p5-2
 - Do not require any other shell than bash since that's the default
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/check-mk.git/commit/?h=f20&id=bdc477692fcc32c53af58010e59a6fe406d2aac9