[ocsinventory/el6/master] upstream patch, workaround XML::SAX issue on EL5, see #641735

[Remi Collet]

commit aed6552a46f2f763889408ecb32fa36bbc21df65
Author: remi <fedora at famillecollet.com>
Date:   Wed Oct 27 07:37:10 2010 +0200

    upstream patch, workaround XML::SAX issue on EL5, see #641735

 ocsinventory-upstream.patch |   45 +++++++++++++++++++++++++++++++++++-------
 ocsinventory.spec           |    7 ++++-
 2 files changed, 42 insertions(+), 10 deletions(-)
---
diff --git a/ocsinventory-upstream.patch b/ocsinventory-upstream.patch
index 129bc23..713bd60 100644
--- a/ocsinventory-upstream.patch
+++ b/ocsinventory-upstream.patch
@@ -14,9 +14,14 @@ Fix bug with old cookies when you update OCSREPORT, tx to Remi!!!
 	http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-ocsreports/stable/diff/59
 	http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-ocsreports/stable/diff/59
 
+Force XML::Simple to use XML::Parser instead of XML::SAX to fix disastrous performance issues
+in Redhat distribution due to the perl-XML-SAX package problems.
+Thanks to Remi Collet for his report.
+	http://bazaar.launchpad.net/~ocsinventory-server/ocsinventory-server/stable-1.03/revision/600
+
 === modified file 'dbconfig.inc.php'
---- dbconfig.inc.php	2009-11-03 19:45:02 +0000
-+++ dbconfig.inc.php	2010-05-19 18:36:54 +0000
+--- ocsreports/dbconfig.inc.php	2009-11-03 19:45:02 +0000
++++ ocsreports/dbconfig.inc.php	2010-05-19 18:36:54 +0000
 @@ -1,5 +1,5 @@
  <?php 
 -$_SESSION["SERVEUR_SQL"]="";
@@ -27,8 +32,8 @@ Fix bug with old cookies when you update OCSREPORT, tx to Remi!!!
 \ No newline at end of file
 
 === modified file 'js/datetimepicker.js'
---- js/datetimepicker.js	2009-06-29 11:51:53 +0000
-+++ js/datetimepicker.js	2010-05-26 06:36:17 +0000
+--- ocsreports/js/datetimepicker.js	2009-06-29 11:51:53 +0000
++++ ocsreports/js/datetimepicker.js	2010-05-26 06:36:17 +0000
 @@ -105,7 +105,7 @@
  		if (YearPattern.test(strYear))
  			Cal.Year=parseInt(strYear,10);
@@ -40,8 +45,8 @@ Fix bug with old cookies when you update OCSREPORT, tx to Remi!!!
  		if (Cal.ShowTime==true)
 
 === modified file 'preferences.php'
---- preferences.php	2010-05-03 15:15:39 +0000
-+++ preferences.php	2010-06-17 10:03:38 +0000
+--- ocsreports/preferences.php	2010-05-03 15:15:39 +0000
++++ ocsreports/preferences.php	2010-06-17 10:03:38 +0000
 @@ -57,6 +57,19 @@
  		$_SESSION["queryString"] .= "&".$key."=".$val;
  }
@@ -135,8 +140,8 @@ Fix bug with old cookies when you update OCSREPORT, tx to Remi!!!
  				echo "{$prefG}-2><img src='image/proch24.png'></a>&nbsp;&nbsp;";
 
 === modified file 'preferences.php'
---- preferences.php	2010-06-17 10:03:38 +0000
-+++ preferences.php	2010-06-17 10:08:54 +0000
+--- ocsreports/preferences.php	2010-06-17 10:03:38 +0000
++++ ocsreports/preferences.php	2010-06-17 10:08:54 +0000
 @@ -59,15 +59,15 @@
  
  
@@ -157,3 +162,27 @@ Fix bug with old cookies when you update OCSREPORT, tx to Remi!!!
  
  if( isset($_GET["uid"]) ) {
 
+=== modified file 'Apache/Ocsinventory.pm'
+--- Apache/Ocsinventory.pm	2009-09-07 13:40:04 +0000
++++ Apache/Ocsinventory.pm	2010-10-26 13:09:41 +0000
+@@ -28,6 +28,7 @@
+ }
+ 
+ $Apache::Ocsinventory::VERSION = '1.02';
++$XML::Simple::PREFERRED_PARSER = 'XML::Parser';
+ 
+ # Ocs modules
+ use Apache::Ocsinventory::Server::Constants;
+
+=== modified file 'Apache/Ocsinventory/SOAP.pm'
+--- Apache/Ocsinventory/SOAP.pm	2008-02-25 16:09:48 +0000
++++ Apache/Ocsinventory/SOAP.pm	2010-10-26 13:09:41 +0000
+@@ -23,6 +23,7 @@
+ 			require SOAP::Transport::HTTP2;
+ 			our $server = SOAP::Transport::HTTP2::Apache->dispatch_to('Apache::Ocsinventory::Interface');
+ 		}
++		$XML::Simple::PREFERRED_PARSER = 'XML::Parser';	
+ 		require Apache::Ocsinventory::Interface;
+ 	};
+ 	if($@){
+
diff --git a/ocsinventory.spec b/ocsinventory.spec
index 3898c83..696022f 100644
--- a/ocsinventory.spec
+++ b/ocsinventory.spec
@@ -12,7 +12,7 @@ Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.3.2
-Release:     3%{?dist}
+Release:     4%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -134,7 +134,6 @@ navigateur favori.
 %setup -q -n %{tarname}-%{version}
 
 %patch0 -p1
-cd ocsreports
 %patch1 -p0
 
 
@@ -284,6 +283,10 @@ fi
 
 
 %changelog
+* Sat Jun 19 2010 Remi Collet <Fedora at famillecollet.com> - 1.3.2-4
+- upstream patch to set XML default parser
+  (workaround XML::SAX issue on EL5, see #641735)
+
 * Sat Jun 19 2010 Remi Collet <Fedora at famillecollet.com> - 1.3.2-3
 - update to new version
 - remove schema patch (upstream)