From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Sat, 13 Dec 2014 20:51:51 +0000 (+0100)
Subject: - up to 4.0.8; untested
X-Git-Tag: auto/th/nagios-4.0.8-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=fa363e1fa845f986cbc79a5629b17e4753856209;p=packages%2Fnagios.git

- up to 4.0.8; untested
---

diff --git a/config.patch b/config.patch
index 779cac3..47a8b0d 100644
--- a/config.patch
+++ b/config.patch
@@ -13,11 +13,19 @@ diff -ur nagios.org/html/config.inc.php.in nagios/html/config.inc.php.in
 diff -ur nagios.org/Makefile.in nagios/Makefile.in
 --- nagios.org/Makefile.in	2013-09-20 21:01:20.000000000 +0200
 +++ nagios/Makefile.in	2013-10-01 21:51:45.176497587 +0200
-@@ -241,7 +241,7 @@
+@@ -234,14 +234,14 @@ install:
  	cd $(SRC_BASE) && $(MAKE) $@
  	cd $(SRC_CGI) && $(MAKE) $@
  	cd $(SRC_HTM) && $(MAKE) $@
--	$(MAKE) install-exfoliation	
+-	$(MAKE) install-exfoliation
++	$(MAKE) install-classicui
+ 	$(MAKE) install-basic
+ 
+ install-unstripped:
+ 	cd $(SRC_BASE) && $(MAKE) $@
+ 	cd $(SRC_CGI) && $(MAKE) $@
+ 	cd $(SRC_HTM) && $(MAKE) $@
+-	$(MAKE) install-exfoliation
 +	$(MAKE) install-classicui
  	$(MAKE) install-basic
  
diff --git a/do-not-fetch-rss.patch b/do-not-fetch-rss.patch
index 7a18382..8792745 100644
--- a/do-not-fetch-rss.patch
+++ b/do-not-fetch-rss.patch
@@ -5,32 +5,36 @@ more reasonable)
 
 --- nagios/html/main.php~	2012-05-29 00:04:23.000000000 +0300
 +++ nagios/html/main.php	2012-05-29 00:08:36.419474072 +0300
-@@ -15,12 +15,19 @@
+@@ -14,8 +14,11 @@ $this_year = '2014';
+ <title>Nagios Core</title>
+ <link rel="stylesheet" type="text/css" href="stylesheets/common.css?<?php echo $this_version; ?>" />
  <script type="text/javascript" src="/js/jquery/jquery.js"></script>
- 
+-
  <script type='text/javascript'>
 +<?php
 +	$updateinfo=get_update_information();
 +	if ($updateinfo['update_checks_enabled']!==false):
 +?>
- 
- 	//rss fetch by ajax to reduce page load time
- 	$(document).ready(function() {		
- 		 $('#splashbox2-contents').load('rss-corefeed.php');				
- 		 $('#splashbox4-contents').load('rss-newsfeed.php');	
- 	}); 
+ 	$(document).ready(function() {
+ 		loadRemoteFeed( // Our top banner splash.
+ 			'#splashbox0-contents', 'corebanner', 1,
+@@ -31,7 +34,9 @@ $this_year = '2014';
+ 			'#splashbox5-contents', 'corepromo', 3,
+ 			'<ul>', processPromoItem, '</ul>'
+ 		);
+-
 +<?php
-+	endif;
++		endif;
 +?>
+ 		getCoreStatus();
+ 	});
  
- </script>
- 
-@@ -47,7 +54,7 @@
+@@ -141,7 +141,7 @@ $this_year = '2014';
  
  <div id="updateversioninfo">
  <?php
--	$updateinfo=get_update_information();
-+	//$updateinfo=get_update_information();
- 	//print_r($updateinfo);
- 	//$updateinfo['update_checks_enabled']=false;
- 	//$updateinfo['update_available']=true;
+-	$updateinfo = get_update_information();
++	//$updateinfo = get_update_information();
+ 	if (!$updateinfo['update_checks_enabled']) {
+ ?>
+ 		<div class="updatechecksdisabled">
diff --git a/nagios-cgi-http_charset.patch b/nagios-cgi-http_charset.patch
index 3817877..1ee09d4 100644
--- a/nagios-cgi-http_charset.patch
+++ b/nagios-cgi-http_charset.patch
@@ -9,10 +9,10 @@ http://tracker.nagios.org/view.php?id=182
 +++ nagios/common/shared.c	2013-10-01 22:02:51.624429871 +0200
 @@ -9,6 +9,7 @@
   */
- int date_format = DATE_FORMAT_US;
- int interval_length = DEFAULT_INTERVAL_LENGTH;
+ int date_format;
+ int interval_length;
 +char *http_charset = NULL;
- char *illegal_output_chars = NULL;
+ char *illegal_output_chars;
  char illegal_output_char_map[] = CHAR_MAP_INIT(0);
  time_t program_start = 0L;
 diff -ur nagios.org/cgi/avail.c nagios/cgi/avail.c
diff --git a/nagios.spec b/nagios.spec
index 65cca6a..828106b 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -12,12 +12,12 @@ Summary:	Open Source host, service and network monitoring program
 Summary(pl.UTF-8):	Program do monitorowania serwerów/usług/sieci
 Summary(pt_BR.UTF-8):	Programa para monitoração de máquinas e serviços
 Name:		nagios
-Version:	4.0.3
+Version:	4.0.8
 Release:	1
 License:	GPL v2+
 Group:		Networking
 Source0:	http://downloads.sourceforge.net/nagios/nagios-4.x/%{name}-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	1c63271f6371226e93cbc2e1a08b1f0e
+# Source0-md5:	4bba4eef427cfb113fb513b6166a6af6
 Source1:	%{name}-apache.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
@@ -543,12 +543,15 @@ done
 %dir %{htmldir}/stylesheets
 %{htmldir}/robots.txt
 %{htmldir}/contexthelp
+%{htmldir}/jsonquery.html
 %{htmldir}/media
 %{htmldir}/ssi
 %{htmldir}/images/favicon.ico
 %{htmldir}/images/marker.png
 %{htmldir}/images/shadow50.png
 %{htmldir}/nagioswall.php
+%{htmldir}/rss-corefeed.html
+%{htmldir}/rss-newsfeed.html
 
 %files theme-classicui
 %defattr(644,root,root,755)
diff --git a/system-jquery.patch b/system-jquery.patch
index 9f44c78..9dcf295 100644
--- a/system-jquery.patch
+++ b/system-jquery.patch
@@ -1,14 +1,14 @@
 --- nagios-3.4.1/html/main.php~	2012-05-12 03:00:53.000000000 +0300
 +++ nagios-3.4.1/html/main.php	2012-05-28 23:55:54.310721306 +0300
-@@ -12,7 +12,7 @@
+@@ -13,7 +13,7 @@ $this_year = '2014';
  <meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
  <title>Nagios Core</title>
- <link rel='stylesheet' type='text/css' href='stylesheets/common.css' />
+ <link rel="stylesheet" type="text/css" href="stylesheets/common.css?<?php echo $this_version; ?>" />
 -<script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
 +<script type="text/javascript" src="/js/jquery/jquery.js"></script>
  
  <script type='text/javascript'>
- 
+ 	$(document).ready(function() {
 --- nagios-3.4.1/include/cgiutils.h~	2012-05-24 17:15:30.000000000 +0300
 +++ nagios-3.4.1/include/cgiutils.h	2012-05-28 23:56:18.921757228 +0300
 @@ -77,7 +77,7 @@