svn commit: r351522 - in head/net-mgmt/nagios: . files

[Mathieu Arnold]

Author: mat
Date: Fri Apr 18 08:54:01 2014
New Revision: 351522
URL: http://svnweb.freebsd.org/changeset/ports/351522
QAT: https://qat.redports.org/buildarchive/r351522/

Log:
  Fix a segfault when using livestatus, downtime and logrotate.
  
  Issue:		http://tracker.nagios.org/view.php?id=455
  Sponsored by:	Absolight

Added:
  head/net-mgmt/nagios/files/patch-0007-fix_downtime_struct   (contents, props changed)
Modified:
  head/net-mgmt/nagios/Makefile

Modified: head/net-mgmt/nagios/Makefile
==============================================================================
--- head/net-mgmt/nagios/Makefile	Fri Apr 18 08:09:22 2014	(r351521)
+++ head/net-mgmt/nagios/Makefile	Fri Apr 18 08:54:01 2014	(r351522)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	3.5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
 

Added: head/net-mgmt/nagios/files/patch-0007-fix_downtime_struct
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/nagios/files/patch-0007-fix_downtime_struct	Fri Apr 18 08:54:01 2014	(r351522)
@@ -0,0 +1,32 @@
+--- ./include/downtime.h.orig	2013-08-30 19:46:14.000000000 +0200
++++ ./include/downtime.h	2014-04-18 10:49:26.000000000 +0200
+@@ -39,24 +39,26 @@
+ 	char *service_description;
+ 	time_t entry_time;
+ 	time_t start_time;
+-	time_t flex_downtime_start;		/* Time the flexible downtime started */
+ 	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;
++#endif
++	int is_in_effect;
++#ifdef NSCORE
+ 	int start_flex_downtime;
+ 	int incremented_pending_downtime;
+ //	int start_event; 
+ //	int stop_event;
+ #endif
+ 	struct scheduled_downtime_struct *next;
++	time_t flex_downtime_start;		/* Time the flexible downtime started */
++	int	start_notification_sent;
+ 	} scheduled_downtime;
+ 
+