packages: nagios/nagios-cgi-http_charset.patch, nagios/nagios.spec - do not...

[glen]

Author: glen                         Date: Fri Sep 11 13:30:18 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not escape and corrupt utf8; rel 4

---- Files affected:
packages/nagios:
   nagios-cgi-http_charset.patch (1.5 -> 1.6) , nagios.spec (1.142 -> 1.143) 

---- Diffs:

================================================================
Index: packages/nagios/nagios-cgi-http_charset.patch
diff -u packages/nagios/nagios-cgi-http_charset.patch:1.5 packages/nagios/nagios-cgi-http_charset.patch:1.6
--- packages/nagios/nagios-cgi-http_charset.patch:1.5	Wed Sep  9 09:48:01 2009
+++ packages/nagios/nagios-cgi-http_charset.patch	Fri Sep 11 15:30:13 2009
@@ -21,8 +21,8 @@
  		return;
  	        }
  
---- nagios-3.0.3/cgi/cgiutils.c	2008-06-23 23:47:44.000000000 +0300
-+++ nagios-3.0.3-cgi/cgi/cgiutils.c	2008-10-11 12:34:44.472657400 +0300
+--- nagios-3.0.3-cgi/cgi/cgiutils.c	2008-10-11 12:34:44.472657400 +0300
++++ nagios-3.2.0/cgi/cgiutils.c	2009-09-11 16:14:43.130251761 +0300
 @@ -55,6 +55,7 @@
  char            *statuswrl_include=NULL;
  
@@ -51,6 +51,16 @@
  		else if(!strcmp(var,"notes_url_target"))
  			notes_url_target=strdup(val);
  
+@@ -1553,6 +1560,9 @@
+ 		else if(((char)input[x]==(char)' ') || ((char)input[x]==(char)'-') || ((char)input[x]==(char)'.') || ((char)input[x]==(char)'_') || ((char)input[x]==(char)':'))
+ 			encoded_html_string[y++]=input[x];
+ 
++		/* 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{
+ 			encoded_html_string[y]='\x0';
 --- 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 @@

================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.142 packages/nagios/nagios.spec:1.143
--- packages/nagios/nagios.spec:1.142	Fri Sep 11 00:03:28 2009
+++ packages/nagios/nagios.spec	Fri Sep 11 15:30:13 2009
@@ -10,7 +10,7 @@
 Summary(pt_BR.UTF-8):	Programa para monitoração de máquinas e serviços
 Name:		nagios
 Version:	3.2.0
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
@@ -187,6 +187,9 @@
 mv nagios-config-*/objects/*.cfg sample-config/template-object
 mv nagios-config-*/*.cfg sample-config
 
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
 sed -i -e '
 	s,".*/var/rw/nagios.cmd,"%{_localstatedir}/rw/nagios.cmd,
 	s,".*/libexec/eventhandlers,"%{_libdir}/%{name}/eventhandlers,
@@ -443,6 +446,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.143  2009/09/11 13:30:13  glen
+- do not escape and corrupt utf8; rel 4
+
 Revision 1.142  2009/09/10 22:03:28  glen
 - no need for g+s in config dirs
 - simplify config packaging
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios-cgi-http_charset.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios.spec?r1=1.142&r2=1.143&f=u