rpms/glpi/F-9 glpi-check.patch, NONE, 1.1 glpi-logrotate, 1.1, 1.2 glpi.spec, 1.16, 1.17
Remi Collet (remi)
fedora-extras-commits at redhat.com
Sat Aug 9 12:59:30 UTC 2008
Author: remi
Update of /cvs/extras/rpms/glpi/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1230
Modified Files:
glpi-logrotate glpi.spec
Added Files:
glpi-check.patch
Log Message:
fix SElinux AVC
glpi-check.patch:
--- NEW FILE glpi-check.patch ---
--- inc/common.function.php.orig 2008-08-09 14:14:22.000000000 +0200
+++ inc/common.function.php 2008-08-09 14:21:16.000000000 +0200
@@ -601,8 +601,7 @@
GLPI_CONFIG_DIR => $LANG["install"][23],
GLPI_SESSION_DIR => $LANG["install"][50],
GLPI_CRON_DIR => $LANG["install"][52],
- GLPI_CACHE_DIR => $LANG["install"][99],
- GLPI_LOG_DIR => $LANG["install"][53]
+ GLPI_CACHE_DIR => $LANG["install"][99]
);
$error=0;
foreach ($dir_to_check as $dir => $message){
@@ -633,6 +632,13 @@
break;
}
}
+ echo "<tr class='tab_bg_1'><td><strong>".$LANG["install"][53]."</strong></td>";
+ if (error_log("Test\n", 3, GLPI_LOG_DIR."/php-errors.log")) {
+ echo "<td>".$LANG["install"][20]."</td></tr>";
+ } else {
+ echo "<td><p class='red'>".$LANG["install"][19]."</p> ".$LANG["install"][97]."'".GLPI_LOG_DIR."'. ".$LANG["install"][98]."</td></tr>";
+ $error=1;
+ }
return $error;
}
Index: glpi-logrotate
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-9/glpi-logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-logrotate 9 Oct 2007 11:53:22 -0000 1.1
+++ glpi-logrotate 9 Aug 2008 12:59:00 -0000 1.2
@@ -6,4 +6,5 @@
compress
notifempty
missingok
+ create 644 apache apache
}
Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-9/glpi.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- glpi.spec 1 Aug 2008 16:44:35 -0000 1.16
+++ glpi.spec 9 Aug 2008 12:59:00 -0000 1.17
@@ -6,7 +6,7 @@
Name: glpi
Version: 0.71.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -19,6 +19,10 @@
Source2: glpi-config_path.php
Source3: glpi-logrotate
+# Avoid SELinux AVC when testing write access to log file.
+Patch0: glpi-check.patch
+
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -61,6 +65,8 @@
%prep
%setup -q -n glpi
+%patch0 -p0
+
%if 0%{?rhel} == 4
# use bundled lib
@@ -222,6 +228,10 @@
%changelog
+* Sat Aug 09 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.1-2
+- fix SElinux bug on install test (glpi-check.patch)
+- add create option on logrotate conf
+
* Fri Aug 01 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.1-1
- update to 0.71.1 bugfix
- use system cron
More information about the fedora-extras-commits
mailing list