[glpi/f16] update to 0.83.7
Remi Collet
remi at fedoraproject.org
Wed Dec 12 12:21:59 UTC 2012
commit 55c224e3cc608fbceccd3d6ab67b0c3430b0116a
Author: Remi Collet <remi at fedoraproject.org>
Date: Wed Dec 12 13:21:48 2012 +0100
update to 0.83.7
.gitignore | 7 +++++++
glpi-0.83-cron.patch | 34 ++++++++++++++++++++++++++++++++++
glpi-config_path.php | 1 +
glpi-cron.patch | 35 -----------------------------------
glpi-httpd.conf | 9 +++++++--
glpi.spec | 46 +++++++++++++++++++++++++++++++++-------------
sources | 2 +-
7 files changed, 83 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7a178d4..7e8c611 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,10 @@ glpi-0.72.4-11497.tar.gz
/glpi-0.80.6.tar.gz
/glpi-0.80.61.tar.gz
/glpi-0.80.7.tar.gz
+/glpi-0.83.1.tar.gz
+/glpi-0.83.2.tar.gz
+/glpi-0.83.31.tar.gz
+/glpi-0.83.4.tar.gz
+/glpi-0.83.5.tar.gz
+/glpi-0.83.6.tar.gz
+/glpi-0.83.7.tar.gz
diff --git a/glpi-0.83-cron.patch b/glpi-0.83-cron.patch
new file mode 100644
index 0000000..25906e5
--- /dev/null
+++ b/glpi-0.83-cron.patch
@@ -0,0 +1,34 @@
+diff -up install/install.php.orig install/install.php
+--- install/install.php.orig 2012-01-24 12:22:16.000000000 +0100
++++ install/install.php 2012-02-26 10:04:57.482199413 +0100
+@@ -351,6 +351,15 @@ function step4 ($host, $user, $password,
+ $query = "UPDATE `glpi_users`
+ SET `language` = NULL";
+ $DB->query($query) or die("4203 ".$LANG['update'][90].$DB->error());
++
++ // RPM provides a good system cron
++ $query = "UPDATE `glpi_crontasks` SET `mode`=2 WHERE `name`!='watcher' AND (`allowmode` & 2)";
++ $DB->query($query)
++ or die("RPM update of glpi_crontasks. " . $LANG['update'][90] . $DB->error());
++
++ $query = "UPDATE `glpi_configs` SET `cron_limit` = '3'";
++ $DB->query($query)
++ or die("RPM update of glpi_configs. " . $LANG['update'][90] . $DB->error());
+ }
+
+
+diff -up install/update.php.orig install/update.php
+--- install/update.php.orig 2012-02-09 21:19:30.000000000 +0100
++++ install/update.php 2012-02-26 10:07:24.899206029 +0100
+@@ -770,6 +770,11 @@ 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->query($query)
++ or die("RPM update of glpi_crontasks. " . $LANG['update'][90] . $DB->error());
++
+ DBmysql::optimize_tables($migration);
+
+ return $ret;
diff --git a/glpi-config_path.php b/glpi-config_path.php
index e7b42b7..1027223 100644
--- a/glpi-config_path.php
+++ b/glpi-config_path.php
@@ -22,6 +22,7 @@ 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');
// Fonts
define('GLPI_FONT_FREESANS', '/usr/share/fonts/gnu-free/FreeSans.ttf');
diff --git a/glpi-httpd.conf b/glpi-httpd.conf
index ecb4270..dc48482 100644
--- a/glpi-httpd.conf
+++ b/glpi-httpd.conf
@@ -6,8 +6,13 @@ Alias /glpi /usr/share/glpi
php_value memory_limit 64M
- Order Deny,Allow
- Allow from all
+ <IfModule mod_authz_core.c>
+ Require all granted
+ </IfModule>
+ <IfModule !mod_authz_core.c>
+ Order deny,allow
+ Allow from all
+ </IfModule>
</Directory>
<Directory /usr/share/glpi/install>
diff --git a/glpi.spec b/glpi.spec
index 3c287b7..656ad69 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -1,16 +1,9 @@
-%if %{?fedora}%{?rhel} >= 5
%global useselinux 1
-%else
-%global useselinux 0
-%endif
-
-#global svnrelease 12930
Name: glpi
-# upstream is 0.80.61, use 0.80.6.1 to be < 0.80.7
-Version: 0.80.7
+Version: 0.83.7
%if 0%{?svnrelease}
-Release: 2.svn%{svnrelease}%{?dist}
+Release: 3.svn%{svnrelease}%{?dist}
%else
Release: 1%{?dist}
%endif
@@ -22,10 +15,10 @@ License: GPLv2+ and GPLv3+
URL: http://www.glpi-project.org/
%if 0%{?svnrelease}
# launch mktar %{svnrelease} to create
-Source0: glpi-0.78-%{svnrelease}.tar.gz
+Source0: glpi-0.83-%{svnrelease}.tar.gz
Source99: mktar.sh
%else
-Source0: https://forge.indepnet.net/attachments/download/1054/glpi-0.80.7.tar.gz
+Source0: https://forge.indepnet.net/attachments/download/1387/glpi-0.83.7.tar.gz
%endif
Source1: glpi-httpd.conf
@@ -33,7 +26,7 @@ Source2: glpi-config_path.php
Source3: glpi-logrotate
# Switch all internal cron tasks to system
-Patch0: glpi-cron.patch
+Patch0: glpi-0.83-cron.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +36,7 @@ Requires: php >= 5.1.0, php-mysql, httpd, php-gd, php-ldap, php-imap, php-
Requires: php-pear(Cache_Lite) >= 1.7.4
Requires: php-PHPMailer
Requires: php-pear-CAS >= 1.2.0
+Requires: php-htmLawed
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
Requires: php-pear(components.ez.no/Graph) >= 1.5
Requires: gnu-free-sans-fonts
@@ -82,13 +76,14 @@ techniciens grâce à une maintenance plus cohérente.
%prep
%setup -q -n glpi
-%patch0 -p1
+%patch0 -p0
find . -name \*.orig -exec rm {} \; -print
# Use system lib
rm -rf lib/cache_lite
rm -rf lib/phpmailer
rm -rf lib/phpcas
+rm -rf lib/htmlawed
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
rm -rf lib/ezcomponents
@@ -249,6 +244,31 @@ fi
%changelog
+* Tue Dec 4 2012 Remi Collet <remi at fedoraproject.org> - 0.83.7-1
+- version 0.83.7 released (bugfix)
+ https://forge.indepnet.net/projects/glpi/versions/843
+
+- version 0.83.6 released (bugfix)
+ https://forge.indepnet.net/projects/glpi/versions/841
+
+- version 0.83.5 released (bugfix)
+ https://forge.indepnet.net/projects/glpi/versions/800
+
+- version 0.83.4 released (bugfix)
+ https://forge.indepnet.net/projects/glpi/versions/777
+
+- version 0.83.3 released (bugfix + security)
+ https://forge.indepnet.net/projects/glpi/versions/771
+- new dependency on htmLawed
+
+- version 0.83.2 released
+ https://forge.indepnet.net/projects/glpi/versions/750
+
+- version 0.83.1 released
+ 0.83.1 https://forge.indepnet.net/projects/glpi/versions/696
+ 0.83 https://forge.indepnet.net/projects/glpi/versions/538
+- adapt config for httpd 2.4
+
* Thu Feb 09 2012 Remi Collet <remi at fedoraproject.org> - 0.80.7-1
- version 0.80.7 released (security)
https://forge.indepnet.net/projects/glpi/versions/685
diff --git a/sources b/sources
index 9e9af09..053750b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c1c87e23e391327632e00e4a4097b92 glpi-0.80.7.tar.gz
+4fb880bc154e2f1a9a9b609e0d73cf7c glpi-0.83.7.tar.gz
More information about the scm-commits
mailing list