From 0851da0807f85315d7a43831552b8da5a559dcce Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 May 2015 09:15:16 +0200 Subject: glpi: 0.85.4 --- glpi-0.85-config_path.php | 12 ++++++------ glpi-dev.spec | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/glpi-0.85-config_path.php b/glpi-0.85-config_path.php index bc97248..1085cf1 100644 --- a/glpi-0.85-config_path.php +++ b/glpi-0.85-config_path.php @@ -11,12 +11,12 @@ define('GLPI_CACHE_DIR', '/var/lib/glpi/files/_cache/'); define('GLPI_CRON_DIR', '/var/lib/glpi/files/_cron'); define('GLPI_SESSION_DIR', '/var/lib/glpi/files/_sessions'); define('GLPI_PLUGIN_DOC_DIR', '/var/lib/glpi/files/_plugins'); -define('GLPI_LOCK_DIR', '/var/lib/glpi/files/_lock/'); -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_PICTURE_DIR', '/var/lib/glpi/files/_pictures/'); +define('GLPI_LOCK_DIR', '/var/lib/glpi/files/_lock'); +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_PICTURE_DIR', '/var/lib/glpi/files/_pictures'); // Log define('GLPI_LOG_DIR', '/var/log/glpi'); diff --git a/glpi-dev.spec b/glpi-dev.spec index aeb54cf..c912ff0 100644 --- a/glpi-dev.spec +++ b/glpi-dev.spec @@ -27,7 +27,7 @@ %endif Name: glpi -Version: 0.85.3 +Version: 0.85.4 Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -35,7 +35,7 @@ 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/2006/glpi-0.85.3.tar.gz +Source0: https://forge.indepnet.net/attachments/download/2020/glpi-0.85.4.tar.gz Source1: glpi-httpd.conf Source2: glpi-0.85-config_path.php @@ -241,10 +241,15 @@ rm -rf %{buildroot} %if %{useselinux} ( # New File context +%if 0%{?rhel} == 5 +semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/%{name}(/.*)?" +semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/%{name}(/.*)?" +%else semanage fcontext -a -s system_u -t httpd_sys_rw_content_t -r s0 "%{_sysconfdir}/%{name}(/.*)?" +semanage fcontext -a -s system_u -t httpd_var_lib_t -r s0 "%{_localstatedir}/lib/%{name}(/.*)?" +%endif semanage fcontext -a -s system_u -t httpd_sys_content_t -r s0 "%{_datadir}/%{name}(/.*)?" semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/%{name}(/.*)?" -semanage fcontext -a -s system_u -t httpd_var_lib_t -r s0 "%{_localstatedir}/lib/%{name}(/.*)?" # files created by app restorecon -R %{_sysconfdir}/%{name} restorecon -R %{_datadir}/%{name} @@ -307,6 +312,11 @@ fi %changelog +* Mon May 4 2015 Remi Collet - 0.85.4-1 +- update to 0.85.4 + https://forge.indepnet.net/versions/1136 +- fix SELinux context on EL-5 + * Fri Apr 17 2015 Remi Collet - 0.85.3-1 - update to 0.85.3 https://forge.indepnet.net/versions/1118 -- cgit