[glpi] Update to 0.85.1 0.85 https://forge.indepnet.net/versions/539 0.85.1 https://forge.indepnet.ne
Remi Collet
remi at fedoraproject.org
Mon Dec 22 11:18:25 UTC 2014
commit 56d1689376d46daac940bc46d0d64ecc4d583e70
Author: Remi Collet <remi at fedoraproject.org>
Date: Mon Dec 22 12:18:17 2014 +0100
Update to 0.85.1
0.85 https://forge.indepnet.net/versions/539
0.85.1 https://forge.indepnet.net/versions/1071
- drop dependency on pear/Cache_Lite
- add dependency on php-tcpdf
- increase system cron frequency and limit
.gitignore | 1 +
glpi-0.84-CVE-2014-9258.patch | 62 ---------------------
glpi-0.84-cron.patch | 31 ----------
glpi-0.84-zend.patch | 55 ------------------
glpi-config_path.php => glpi-0.85-config_path.php | 7 +-
glpi-0.85-cron.patch | 29 ++++++++++
glpi.spec | 30 ++++++----
sources | 2 +-
8 files changed, 51 insertions(+), 166 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 554734d..dfb4a07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ glpi-0.72.4-11497.tar.gz
/glpi-0.84.6.tar.gz
/glpi-0.84.7.tar.gz
/glpi-0.84.8.tar.gz
+/glpi-0.85.1.tar.gz
diff --git a/glpi-config_path.php b/glpi-0.85-config_path.php
similarity index 86%
rename from glpi-config_path.php
rename to glpi-0.85-config_path.php
index 7293422..bc97248 100644
--- a/glpi-config_path.php
+++ b/glpi-0.85-config_path.php
@@ -16,20 +16,19 @@ define('GLPI_GRAPH_DIR', '/var/lib/glpi/files/_graphs/');
define('GLPI_TMP_DIR', '/var/lib/glpi/files/_tmp/');
define('GLPI_RSS_DIR', '/var/lib/glpi/files/_rss/');
define('GLPI_UPLOAD_DIR', '/var/lib/glpi/files/_uploads/');
-//define('GLPI_SCRIPT_DIR',
+define('GLPI_PICTURE_DIR', '/var/lib/glpi/files/_pictures/');
// Log
define('GLPI_LOG_DIR', '/var/log/glpi');
// System libraries
-define('GLPI_CACHE_LITE_DIR', 'Cache');
define('GLPI_PHPMAILER_DIR', 'PHPMailer');
define('GLPI_EZC_BASE', 'ezc/Base/base.php');
define('GLPI_PHPCAS', 'CAS.php');
define('GLPI_HTMLAWED', 'htmLawed/htmLawed.php');
define('GLPI_ZEND_PATH', '/usr/share/php/Zend');
-define("GLPI_SIMPLEPIE_PATH", '/usr/share/php/php-simplepie');
+define('GLPI_SIMPLEPIE_PATH', '/usr/share/php/php-simplepie');
+define('GLPI_TCPDF_DIR', '/usr/share/php/tcpdf');
// Fonts
define('GLPI_FONT_FREESANS', '/usr/share/fonts/gnu-free/FreeSans.ttf');
-?>
diff --git a/glpi-0.85-cron.patch b/glpi-0.85-cron.patch
new file mode 100644
index 0000000..9ea752c
--- /dev/null
+++ b/glpi-0.85-cron.patch
@@ -0,0 +1,29 @@
+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
+ $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");
+ }
+
+ //Check if the port is in url
+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() {
+ $plugin = new Plugin();
+ $plugin->unactivateAll();
+
++ // RPM provides a good system cron
++ $query = "UPDATE `glpi_crontasks` SET `mode`=2 WHERE `name`!='watcher' AND (`allowmode` & 2)";
++ $DB->queryOrDie($query);
++
+ DBmysql::optimize_tables($migration);
+
+ return $ret;
diff --git a/glpi.spec b/glpi.spec
index ee952cc..fa55ab1 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -27,25 +27,23 @@
%endif
Name: glpi
-Version: 0.84.8
-Release: 3%{?dist}
+Version: 0.85.1
+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/1873/glpi-0.84.8.tar.gz
+Source0: https://forge.indepnet.net/attachments/download/1928/glpi-0.85.1.tar.gz
Source1: glpi-httpd.conf
-Source2: glpi-config_path.php
+Source2: glpi-0.85-config_path.php
Source3: glpi-logrotate
Source4: glpi-nginx.conf
# Switch all internal cron tasks to system
-Patch0: glpi-0.84-cron.patch
-# Upstream security patch
-Patch1: glpi-0.84-CVE-2014-9258.patch
+Patch0: glpi-0.85-cron.patch
BuildArch: noarch
BuildRequires: gettext
@@ -74,8 +72,8 @@ Requires: php-mysqli
Requires: php-pcre
Requires: php-session
Requires: php-xml
-Requires: php-pear(Cache_Lite) >= 1.7.4
Requires: php-PHPMailer
+Requires: php-tcpdf
Requires: php-pear-CAS >= 1.2.0
Requires: php-htmLawed
Requires: php-simplepie
@@ -122,7 +120,6 @@ techniciens grâce à une maintenance plus cohérente.
%setup -q -n glpi
%patch0 -p0
-%patch1 -p2
find . -name \*.orig -exec rm {} \; -print
@@ -130,18 +127,17 @@ find . -name \*.orig -exec rm {} \; -print
find lib -name \*.swf -exec rm {} \; -print
# Use system lib
-rm -rf lib/cache_lite
rm -rf lib/phpmailer
rm -rf lib/phpcas
rm -rf lib/htmlawed
rm -rf lib/Zend
rm -rf lib/simplepie
+rm -rf lib/tcpdf
rm -rf lib/ezcomponents
cp %{SOURCE2} config/config_path.php
mv lib/tiny_mce/license.txt LICENSE.tiny_mce
-mv lib/extjs/gpl-3.0.txt LICENSE.extjs
mv lib/icalcreator/lgpl.txt LICENSE.icalcreator
rm scripts/glpi_cron_*.sh
@@ -153,8 +149,8 @@ done
cat >cron <<EOF
# GLPI core
-# Run cron from to execute task even when no user connected
-*/3 * * * * apache %{_bindir}/php %{_datadir}/%{name}/front/cron.php
+# Run cron to execute task even when no user connected
+* * * * * apache %{_bindir}/php %{_datadir}/%{name}/front/cron.php
EOF
@@ -293,6 +289,14 @@ fi
%changelog
+* Mon Dec 22 2014 Remi Collet <remi at fedoraproject.org> - 0.85.1-1
+- update to 0.85.1
+ 0.85 https://forge.indepnet.net/versions/539
+ 0.85.1 https://forge.indepnet.net/versions/1071
+- drop dependency on pear/Cache_Lite
+- add dependency on php-tcpdf
+- increase system cron frequency and limit
+
* Mon Dec 22 2014 Remi Collet <remi at fedoraproject.org> - 0.84.8-3
- fix SQL Injection CVE-2014-9258
diff --git a/sources b/sources
index e17d9ac..196dd98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08e6864e32c06e9f5c7f0f631daedd16 glpi-0.84.8.tar.gz
+ff099b987e09e37eda099f9669cccb56 glpi-0.85.1.tar.gz
More information about the scm-commits
mailing list