rpms/glpi/F-11 glpi.spec,1.27,1.28 sources,1.20,1.21

[Remi Collet]

Author: remi

Update of /cvs/pkgs/rpms/glpi/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22559

Modified Files:
	glpi.spec sources 
Log Message:
security fix for embedded phpCAS


Index: glpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glpi/F-11/glpi.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- glpi.spec	2 Mar 2010 18:21:46 -0000	1.27
+++ glpi.spec	22 Mar 2010 19:28:18 -0000	1.28
@@ -5,17 +5,32 @@
 %endif
 
 %global tarballversion 0.72.4
+%global svnrelease 11035
 
 Name:           glpi
 Version:        0.72.4
+%if 0%{?svnrelease}
+Release:        2.svn%{svnrelease}%{?dist}
+%else
 Release:        1%{?dist}
+%endif
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.glpi-project.org/
+%if 0%{?svnrelease}
+# svn export -r 11035 https://forge.indepnet.net/svn/glpi/branches/0.72-bugfixes glpi
+# rm -rf glpi/tools
+# mv glpi/install/mysql/glpi-0.72.3-empty.sql .
+# rm glpi/install/mysql/*.sql
+# mv glpi-0.72.3-empty.sql glpi/install/mysql/
+# tar czf glpi-0.72.4-11035.tar.gz glpi
+Source0:        glpi-0.72.4-11035.tar.gz
+%else
 Source0:        https://forge.indepnet.net/attachments/download/597/glpi-0.72.4.tar.gz
+%endif
 
 Source1:        glpi-httpd.conf
 Source2:        glpi-config_path.php
@@ -69,7 +84,6 @@ mv lib/tiny_mce/license.txt LICENSE.tiny
 mv lib/extjs/license.txt    LICENSE.extjs
 rm lib/extjs/{CHANGES.html,INCLUDE_ORDER.txt}
 mv lib/icalcreator/lgpl.txt LICENSE.icalcreator
-mv lib/phpcas/COPYRIGHT     LICENSE.phpcas
 mv lib/phpcas/README        README.phpcas
 rm scripts/glpi_cron_*.sh
 
@@ -218,6 +232,9 @@ fi
 
 
 %changelog
+* Mon Mar 22 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.72.4-2.svn11035
+- update embedded phpCAS to 1.1.0RC7 (security fix - #575906)
+
 * Tue Mar  2 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.72.4-1
 - update to 0.72.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glpi/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	2 Mar 2010 18:21:46 -0000	1.20
+++ sources	22 Mar 2010 19:28:18 -0000	1.21
@@ -1 +1 @@
-8a17bfe68ddabbf1f6b7f06fd7f378f5  glpi-0.72.4.tar.gz
+778a2deafa249235ca105922f5fb6470  glpi-0.72.4-11035.tar.gz