[glpi] update to 0.83.1
Remi Collet
remi at fedoraproject.org
Thu Apr 19 12:23:49 UTC 2012
commit 29e344c730c595801068d2f55ad3cca226e768d4
Author: remi <fedora at famillecollet.com>
Date: Thu Apr 19 14:22:29 2012 +0200
update to 0.83.1
.gitignore | 1 +
glpi-0.83-cron.patch | 34 ++++++++++++++++++++++++++++++++++
glpi-cron.patch | 35 -----------------------------------
glpi-httpd.conf | 9 +++++++--
glpi.spec | 22 +++++++++++-----------
mktar.sh | 8 ++++----
sources | 2 +-
7 files changed, 58 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7a178d4..db6c9e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ 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
diff --git a/glpi-0.83-cron.patch b/glpi-0.83-cron.patch
new file mode 100644
index 0000000..f442768
--- /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` & 1)";
++ $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` & 1)";
++ $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-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..3a525e3 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -1,14 +1,8 @@
-%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.1
%if 0%{?svnrelease}
Release: 2.svn%{svnrelease}%{?dist}
%else
@@ -22,10 +16,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/1151/glpi-0.83.1.tar.gz
%endif
Source1: glpi-httpd.conf
@@ -33,7 +27,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)
@@ -82,7 +76,7 @@ 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
@@ -249,6 +243,12 @@ fi
%changelog
+* Wed Apr 18 2012 Remi Collet <remi at fedoraproject.org> - 0.83.1-1
+- 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/mktar.sh b/mktar.sh
index 1e2db0a..cf62020 100755
--- a/mktar.sh
+++ b/mktar.sh
@@ -5,11 +5,11 @@ if [ "$1" = "" ]; then
exit 1
fi
-svn export -r $1 https://forge.indepnet.net/svn/glpi/branches/0.78-bugfixes glpi
+svn export -r $1 https://forge.indepnet.net/svn/glpi/branches/0.83-bugfixes glpi
rm -rf glpi/tools
-mv glpi/install/mysql/glpi-0.78.2-empty.sql .
+mv glpi/install/mysql/glpi-0.83-empty.sql .
rm -f glpi/install/mysql/*.sql
-mv glpi-0.78.2-empty.sql glpi/install/mysql/
-tar czf glpi-0.78-$1.tar.gz glpi && echo glpi-0.78-$1.tar.gz created
+mv glpi-0.83-empty.sql glpi/install/mysql/
+tar czf glpi-0.83-$1.tar.gz glpi && echo glpi-0.83-$1.tar.gz created
rm -rf glpi
diff --git a/sources b/sources
index 9e9af09..25cde3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c1c87e23e391327632e00e4a4097b92 glpi-0.80.7.tar.gz
+3f9cfb11c09c457a0f0a8fa1563b45a7 glpi-0.83.1.tar.gz
More information about the scm-commits
mailing list