packages: nagios/nagios.spec, nagios/do-not-fetch-rss.patch (NEW)=?UTF-8?Q?=20?=- rss fet...

[glen]

Author: glen                         Date: Mon May 28 21:20:25 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rss fetching optional now

---- Files affected:
packages/nagios:
   nagios.spec (1.183 -> 1.184) , do-not-fetch-rss.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.183 packages/nagios/nagios.spec:1.184
--- packages/nagios/nagios.spec:1.183	Mon May 28 23:18:56 2012
+++ packages/nagios/nagios.spec	Mon May 28 23:20:20 2012
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 # TODO
 # - /var/log/nagios/archives -> /var/log/archive/nagios
-# - system jquery
-# - don't fetch rss if update fetching is disabled (privacy!)
 #
 # Conditional build:
 %bcond_without	gd	# without statusmap and trends, which require gd library
@@ -42,6 +40,7 @@
 Patch8:		archivelog-timeformat.patch
 Patch9:		system-magpierss.patch
 Patch10:	system-jquery.patch
+Patch11:	do-not-fetch-rss.patch
 URL:		http://www.nagios.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -144,7 +143,6 @@
 Requires:	%{name}-theme
 Requires:	group(http)
 Requires:	jquery
-Requires:	php-magpierss >= 0.72
 Requires:	webapps
 Requires:	webserver
 Requires:	webserver(access)
@@ -153,6 +151,7 @@
 Requires:	webserver(cgi)
 Requires:	webserver(indexfile)
 Suggests:	%{name}-doc
+Suggests:	php-magpierss >= 0.72
 
 %description cgi
 CGI webinterface for Nagios.
@@ -242,6 +241,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 find -name .cvsignore -o -name .gitignore | xargs rm
 
@@ -580,6 +580,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.184  2012/05/28 21:20:20  glen
+- rss fetching optional now
+
 Revision 1.183  2012/05/28 21:18:56  glen
 - use system jquery package
 

================================================================
Index: packages/nagios/do-not-fetch-rss.patch
diff -u /dev/null packages/nagios/do-not-fetch-rss.patch:1.1
--- /dev/null	Mon May 28 23:20:25 2012
+++ packages/nagios/do-not-fetch-rss.patch	Mon May 28 23:20:20 2012
@@ -0,0 +1,36 @@
+do not fetch rss automatically, respect some privacy!
+
+use update_checks_enabled option to tune the default (altho new option would be
+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 @@
+ <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');	
+ 	}); 
++<?php
++	endif;
++?>
+ 
+ </script>
+ 
+@@ -47,7 +54,7 @@
+ 
+ <div id="updateversioninfo">
+ <?php
+-	$updateinfo=get_update_information();
++	//$updateinfo=get_update_information();
+ 	//print_r($updateinfo);
+ 	//$updateinfo['update_checks_enabled']=false;
+ 	//$updateinfo['update_available']=true;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/nagios/nagios.spec?r1=1.183&r2=1.184