glpi 0.85.3

4 files changed, 9 insertions, 51 deletions

diff --git a/glpi-0.85-bug5218.patch b/glpi-0.85-bug5218.patch
deleted file mode 100644
index 0da9fe6..0000000
--- a/glpi-0.85-bug5218.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: trunk/inc/user.class.php
-===================================================================
---- trunk/inc/user.class.php	(révision 23364)
-+++ trunk/inc/user.class.php	(révision 23365)
-@@ -602,7 +602,9 @@
-       // Add default profile
-       if (!$rulesplayed) {
-          $affectation = array();
--         if (isset($this->input['_profiles_id']) && $this->input['_profiles_id']) {
-+         if (isset($this->input['_profiles_id']) && $this->input['_profiles_id']
-+            && Profile::currentUserHaveMoreRightThan(array($this->input['_profiles_id']))
-+            ) {
-             $profile                   = $this->input['_profiles_id'];
-             // Choosen in form, so not dynamic
-             $affectation['is_dynamic'] = 0;
diff --git a/glpi-0.85-cron.patch b/glpi-0.85-cron.patch
index 9ea752c..a84650c 100644
--- a/glpi-0.85-cron.patch
+++ b/glpi-0.85-cron.patch
@@ -1,13 +1,12 @@
 diff -up install/install.php.rpm install/install.php
 --- install/install.php.rpm	2014-12-17 13:36:22.420558338 +0100
 +++ install/install.php	2014-12-17 13:38:45.278209044 +0100
-@@ -345,6 +345,11 @@ function step4 ($databasename, $newdatab
+@@ -347,6 +347,10 @@ function step4 ($databasename, $newdatab
        $query = "UPDATE `glpi_users`
                  SET `language` = NULL";
        $DB->queryOrDie($query, "4203");
 +
 +      // RPM provides a good system cron
-+      Config::setConfigurationValues('core', array('cron_limit' => '6'));
 +      $query = "UPDATE `glpi_crontasks` SET `mode`=2 WHERE `name`!='watcher' AND (`allowmode` & 2)";
 +      $DB->queryOrDie($query, "4203");
     }
@@ -16,7 +15,7 @@ diff -up install/install.php.rpm install/install.php
 diff -up install/update.php.rpm install/update.php
 --- install/update.php.rpm	2014-12-11 14:16:55.000000000 +0100
 +++ install/update.php	2014-12-17 13:36:22.420558338 +0100
-@@ -803,6 +803,10 @@ function updateDbUpTo031() {
+@@ -808,6 +808,10 @@ function updateDbUpTo031() {
     $plugin = new Plugin();
     $plugin->unactivateAll();
  
diff --git a/glpi-0.85-upload.patch b/glpi-0.85-upload.patch
deleted file mode 100644
index 128b6f4..0000000
--- a/glpi-0.85-upload.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up ./front/fileupload.php.old ./front/fileupload.php
---- ./front/fileupload.php.old	2015-02-27 10:03:26.350805386 +0100
-+++ ./front/fileupload.php	2015-02-27 10:04:09.149972196 +0100
-@@ -66,7 +66,7 @@ $errors =  array(
-         'min_height'          => __('Image requires a minimum height')
-     );
- 
--$upload_handler = new UploadHandler(array('upload_dir'        => GLPI_ROOT.'/files/_tmp/',
-+$upload_handler = new UploadHandler(array('upload_dir'        => GLPI_TMP_DIR.'/',
-                                           'param_name'        => $_GET['name'],
-                                           'orient_image'      => false,
-                                           'image_versions'    => array()),
-diff -up ./inc/html.class.php.old ./inc/html.class.php
---- ./inc/html.class.php.old	2015-02-27 10:03:34.849838511 +0100
-+++ ./inc/html.class.php	2015-02-27 10:04:27.798044878 +0100
-@@ -5118,7 +5118,7 @@ class Html {
-          && is_array($p['values']['filename']) && count($p['values']['filename'])) {
-          foreach ($p['values']['filename'] as $key => $name) {
-             if (isset($p['values']['tag'][$key])) {
--               $file = GLPI_ROOT.'/files/_tmp/'.$p['values']['filename'][$key];
-+               $file = GLPI_TMP_DIR.'/'.$p['values']['filename'][$key];
-                if (file_exists($file)) {
-                   $display = sprintf('%1$s %2$s', $p['values']['filename'][$key],
-                                                   Toolbox::getSize(filesize($file)));
diff --git a/glpi-dev.spec b/glpi-dev.spec
index 47cf3f6..aeb54cf 100644
--- a/glpi-dev.spec
+++ b/glpi-dev.spec
@@ -27,15 +27,15 @@
 %endif
 
 Name:           glpi
-Version:        0.85.2
-Release:        2%{?dist}
+Version:        0.85.3
+Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
 Group:          Applications/Internet
 License:        GPLv2+ and GPLv3+
 URL:            http://www.glpi-project.org/
-Source0:        https://forge.indepnet.net/attachments/download/1954/glpi-0.85.2.tar.gz
+Source0:        https://forge.indepnet.net/attachments/download/2006/glpi-0.85.3.tar.gz
 
 Source1:        glpi-httpd.conf
 Source2:        glpi-0.85-config_path.php
@@ -44,10 +44,6 @@ Source4:        glpi-nginx.conf
 
 # Switch all internal cron tasks to system
 Patch0:         glpi-0.85-cron.patch
-# See https://forge.indepnet.net/projects/glpi/repository/revisions/23370
-Patch1:         glpi-0.85-upload.patch
-# See https://forge.indepnet.net/projects/glpi/repository/revisions/23365
-Patch2:         glpi-0.85-bug5218.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -129,8 +125,6 @@ techniciens grâce à une maintenance plus cohérente.
 %setup -q -n glpi
 
 %patch0 -p0
-%patch1 -p1
-%patch2 -p1
 
 find . -name \*.orig -exec rm {} \; -print
 
@@ -313,6 +307,10 @@ fi
 
 
 %changelog
+* Fri Apr 17 2015 Remi Collet <remi@fedoraproject.org> - 0.85.3-1
+- update to 0.85.3
+  https://forge.indepnet.net/versions/1118
+
 * Fri Feb 27 2015 Remi Collet <remi@fedoraproject.org> - 0.85.2-2
 - add security fix https://forge.indepnet.net/issues/5218
 - add fix for temporary directory relocation