From af765cf50b34b35b24aa64226ff14f15668bff25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 11 Sep 2009 13:30:13 +0000 Subject: [PATCH] - do not escape and corrupt utf8; rel 4 Changed files: nagios-cgi-http_charset.patch -> 1.6 nagios.spec -> 1.143 --- nagios-cgi-http_charset.patch | 14 ++++++++++++-- nagios.spec | 5 ++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/nagios-cgi-http_charset.patch b/nagios-cgi-http_charset.patch index 9790cbb..c6f4dfd 100644 --- a/nagios-cgi-http_charset.patch +++ b/nagios-cgi-http_charset.patch @@ -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 @@ diff --git a/nagios.spec b/nagios.spec index 749bfa2..a1b190d 100644 --- a/nagios.spec +++ b/nagios.spec @@ -9,7 +9,7 @@ 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.2.0 -Release: 3 +Release: 4 License: GPL v2 Group: Networking Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz @@ -186,6 +186,9 @@ find -name .cvsignore | xargs rm 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, -- 2.44.0