rpms/ocsinventory/F-9 ocsinventory-r1447.patch, NONE, 1.1 ocsinventory-r1462.patch, NONE, 1.1 ocsinventory.spec, 1.5, 1.6

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/ocsinventory/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10651

Modified Files:
	ocsinventory.spec 
Added Files:
	ocsinventory-r1447.patch ocsinventory-r1462.patch 
Log Message:
minor bug fixes

ocsinventory-r1447.patch:

--- NEW FILE ocsinventory-r1447.patch ---
--- trunk/server/Apache/Ocsinventory/Server/Inventory.pm	2008/02/27 16:46:48	1035
+++ trunk/server/Apache/Ocsinventory/Server/Inventory.pm	2008/12/04 09:40:40	1447
@@ -39,6 +39,7 @@
 use Apache::Ocsinventory::Server::Inventory::Export;
 use Apache::Ocsinventory::Server::Inventory::Update;
 use Apache::Ocsinventory::Server::Inventory::Filter;
+use Apache::Ocsinventory::Server::Inventory::Update::AccountInfos;
 
 our %XML_PARSER_OPT = (
 	'ForceArray' => []

ocsinventory-r1462.patch:

--- NEW FILE ocsinventory-r1462.patch ---
--- trunk/server/Apache/Ocsinventory/Interface/Inventory.pm	2008/02/18 14:48:14	981
+++ trunk/server/Apache/Ocsinventory/Interface/Inventory.pm	2009/01/08 12:07:03	1462
@@ -24,7 +24,14 @@
 /;
 
 sub get_computers {
-  my $request = decode_xml( shift );
+  my ($data) = @_;
+
+  die unless $data;
+
+  # Remove non printable char from the XML
+  $data =~ s/[[:cntrl:]]//g;
+
+  my $request = decode_xml( $data );
   
   my %build_functions = (
     'INVENTORY' => \&Apache::Ocsinventory::Interface::Inventory::build_xml_inventory,


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/F-9/ocsinventory.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocsinventory.spec	20 Oct 2008 19:21:48 -0000	1.5
+++ ocsinventory.spec	11 Jan 2009 11:31:10 -0000	1.6
@@ -10,7 +10,7 @@
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.9.rc3%{?dist}.1
+Release:     0.10.rc3%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -22,10 +22,15 @@
 # Database Schema
 # http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
 Patch0:      ocsinventory-r1413.patch
-
 # Update Script
 # http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
 Patch1:      ocsinventory-r1423.patch
+# Missing Include
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
+Patch2:      ocsinventory-r1447.patch
+# Clean XML
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
+Patch3:      ocsinventory-r1462.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,7 +61,7 @@
 
 %description -l fr
 Open Computer and Software Inventory Next Generation est une application 
-déstinée à aider l'administrateur système ou réseau à garder un oeil 
+destinée à aider l'administrateur système ou réseau à garder un oeil 
 sur la configuration des machines du réseau et sur les logiciels qui y
 sont installés.
 
@@ -130,6 +135,8 @@
 
 %patch0 -p2
 %patch1 -p2
+%patch2 -p2
+%patch3 -p2
 
 
 %build
@@ -210,10 +217,10 @@
 %if %{useselinux}
 (
 # New File context
-semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?" 
+semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?" 
 # files created by app
 restorecon -R %{_localstatedir}/log/ocsinventory-server
-) ||:
+) &>/dev/null ||:
 %endif
 
 
@@ -226,7 +233,7 @@
 # files created by app
 restorecon -R %{_sysconfdir}/ocsinventory/ocsinventory-reports
 restorecon -R %{_localstatedir}/lib/ocsinventory-reports
-) ||:
+) &>/dev/null ||:
 %endif
 
 
@@ -234,7 +241,7 @@
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
     # Remove the File Context
-    semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" || :
+    semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" &>/dev/null || :
 fi
 %endif
 
@@ -243,8 +250,8 @@
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
     # Remove the File Context
-    semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" ||:
-    semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" ||:
+    semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" &>/dev/null ||:
+    semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" &>/dev/null ||:
 fi
 %endif
 
@@ -276,8 +283,9 @@
 
 
 %changelog
-* Mon Oct 20 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.9.rc3.fc9.1
-- bump release 
+* Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
+- add r1447 and r1462 patch
+- change log selinux context (httpd_log_t)
 
 * Fri Oct 17 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.9.rc3
 - upstream r1423 patch - migration script