[packages/nagios] - up to 3.5.0

[arekm]

commit 33fd05903a1698f27a9cb08b8d45b781311c303e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Mar 20 11:02:32 2013 +0100

    - up to 3.5.0

 nagios-cgi-http_charset.patch | 10 ----------
 nagios.spec                   |  6 +++---
 system-jquery.patch           | 14 +++++++-------
 3 files changed, 10 insertions(+), 20 deletions(-)
---
diff --git a/nagios.spec b/nagios.spec
index 085e7cb..7d08524 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -11,12 +11,12 @@ Summary:	Host/service/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:	3.4.3
+Version:	3.5.0
 Release:	1
 License:	GPL v2+
 Group:		Networking
-Source0:	http://downloads.sourceforge.net/nagios/%{name}-%{version}.tar.gz
-# Source0-md5:	adb04a255a3bb1574840ebd4a0f2eb76
+Source0:	http://downloads.sourceforge.net/nagios/nagios-3.x/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	aeef195d2033cc362bf6cb972bcc8f07
 Source1:	%{name}-apache.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
diff --git a/nagios-cgi-http_charset.patch b/nagios-cgi-http_charset.patch
index 3dd0b61..e2ef5e5 100644
--- a/nagios-cgi-http_charset.patch
+++ b/nagios-cgi-http_charset.patch
@@ -58,16 +58,6 @@ http://tracker.nagios.org/view.php?id=182
  		else if(!strcmp(var, "notes_url_target"))
  			notes_url_target = strdup(val);
  
-@@ -1478,6 +1485,9 @@
- 				}
- 		        }
- 
-+		/* high bit chars don't get encoded, so we won't be breaking utf8 characters */
-+		else if ((unsigned char)input[x] >= 0x7f)
-+			encoded_html_string[y++]=input[x];
- 		/* for simplicity, all other chars represented by their numeric value */
- 		else{
- 			if(escape_html_tags == FALSE)
 --- nagios-3.0.3/cgi/cmd.c	2008-05-19 21:42:26.000000000 +0300
 +++ nagios-3.0.3-cgi/cgi/cmd.c	2008-10-11 12:34:44.496658785 +0300
 @@ -39,6 +39,8 @@
diff --git a/system-jquery.patch b/system-jquery.patch
index a89bf09..2fc8e28 100644
--- a/system-jquery.patch
+++ b/system-jquery.patch
@@ -24,13 +24,13 @@
 +++ nagios-3.4.1/cgi/status.c	2012-05-28 23:57:04.933694000 +0300
 @@ -558,7 +558,7 @@
  		}
- 	
- 	/* added jquery library 1/31/2012 */	
--	printf("<script type='text/javascript' src='%s%s'></script>\n",url_js_path, JQUERY_JS); 
-+	printf("<script type='text/javascript' src='%s'></script>\n", JQUERY_JS); 
- 	/* JS function to append content to elements on page */ 
- 	printf("<script type='text/javascript'>\n"); 
- 	printf("$(document).ready(function() { $('#top_page_numbers').append($('#bottom_page_numbers').html() ); });");	
+ 
+ 	/* added jquery library 1/31/2012 */
+-	printf("<script type='text/javascript' src='%s%s'></script>\n", url_js_path, JQUERY_JS);
++	printf("<script type='text/javascript' src='%s'></script>\n", JQUERY_JS);
+ 	/* JS function to append content to elements on page */
+ 	printf("<script type='text/javascript'>\n");
+ 	printf("$(document).ready(function() { $('#top_page_numbers').append($('#bottom_page_numbers').html() ); });");
 --- nagios-3.4.1/html/Makefile.in~	2012-05-28 23:52:30.000000000 +0300
 +++ nagios-3.4.1/html/Makefile.in	2012-05-28 23:59:43.973722231 +0300
 @@ -61,8 +61,6 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios.git/commitdiff/33fd05903a1698f27a9cb08b8d45b781311c303e