rpms/glpi/EL-4 glpi-check.patch, NONE, 1.1 glpi-config_path.php, 1.1, 1.2 glpi-httpd.conf, 1.1, 1.2 glpi-logrotate, 1.1, 1.2 glpi.spec, 1.5, 1.6 sources, 1.5, 1.6 glpi.patch, 1.2, NONE

Mon Sep 15 18:27:24 UTC 2008

Author: remi

Update of /cvs/extras/rpms/glpi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26493

Modified Files:
	glpi-config_path.php glpi-httpd.conf glpi-logrotate glpi.spec 
	sources 
Added Files:
	glpi-check.patch 
Removed Files:
	glpi.patch 
Log Message:
update to 0.71.2

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-config_path.php
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi-config_path.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-config_path.php	29 Dec 2007 07:57:37 -0000	1.1
+++ glpi-config_path.php	15 Sep 2008 18:26:53 -0000	1.2
@@ -11,5 +11,6 @@
 define("GLPI_PLUGIN_DOC_DIR", "/var/lib/glpi/files/_plugins");
 define("GLPI_LOCK_DIR",       "/var/lib/glpi/files/_lock/");
 
+define("GLPI_CACHE_LITE_DIR", "Cache");
 define("GLPI_LOG_DIR",        "/var/log/glpi");
 ?>


Index: glpi-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi-httpd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-httpd.conf	29 Dec 2007 07:57:37 -0000	1.1
+++ glpi-httpd.conf	15 Sep 2008 18:26:53 -0000	1.2
@@ -4,10 +4,20 @@
     Options None
     AllowOverride Limit Options FileInfo
 
+    php_value memory_limit 64M
+
     Order Deny,Allow
     Allow from all
 </Directory>
 
+<Directory /usr/share/glpi/install>
+
+    # 15" should be enough for migration in most case
+    php_value max_execution_time 900
+    php_value memory_limit 128M
+
+</Directory>
+
 <Directory /usr/share/glpi/config>
     Order Allow,Deny
     Deny from all


Index: glpi-logrotate
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi-logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi-logrotate	29 Dec 2007 07:57:37 -0000	1.1
+++ glpi-logrotate	15 Sep 2008 18:26:53 -0000	1.2
@@ -6,4 +6,5 @@
 	compress
 	notifempty
 	missingok
+	create 644 apache apache
 }


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glpi.spec	28 Jan 2008 18:16:56 -0000	1.5
+++ glpi.spec	15 Sep 2008 18:26:53 -0000	1.6
@@ -1,12 +1,12 @@
-%if %{?fedora}%{?rhel} >= 6
+%if %{?fedora}%{?rhel} >= 5
 %define useselinux 1
 %else
 %define useselinux 0
 %endif
 
 Name:           glpi
-Version:        0.70.2
-Release:        2%{?dist}
+Version:        0.71.2
+Release:        1%{?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
 
@@ -27,6 +31,7 @@
 Requires:       php-domxml
 %else
 Requires:       php-xml
+Requires:       php-pear(Cache_Lite) >= 1.7.4
 %endif
 Requires:       %{_sysconfdir}/logrotate.d
 Requires(postun): /sbin/service
@@ -34,8 +39,9 @@
 BuildRequires:  dos2unix
 %if %{useselinux}
 Requires:       policycoreutils
-BuildRequires:  selinux-policy-devel, checkpolicy
 %endif
+Requires:       %{_sysconfdir}/cron.d
+
 
 %description
 GLPI is the Information Resource-Manager with an additional Administration-
@@ -59,42 +65,36 @@
 %prep
 %setup -q -n glpi
 
+%patch0 -p0
+
+%if 0%{?rhel} == 4
+
+# use bundled lib
 mv lib/cache_lite/LICENSE   LICENSE.cache_lite
+grep -v GLPI_CACHE_LITE_DIR %{SOURCE2} >config/config_path.php 
+
+%else
+
+# Use system lib
+rm -rf lib/cache_lite
+cp %{SOURCE2} config/config_path.php 
+
+%endif
 mv lib/phpmailer/LICENSE    LICENSE.phpmailer
 mv lib/tiny_mce/license.txt LICENSE.tiny_mce
 dos2unix -o LICENSE.phpmailer LICENSE.tiny_mce
 iconv -f ISO-8859-15 -t UTF-8 LISEZMOI.txt >a && mv a LISEZMOI.txt
 iconv -f ISO-8859-15 -t UTF-8 README.txt   >a && mv a README.txt
 
-%if %{useselinux}
-mkdir selinux
-pushd selinux
-
-cat >%{name}.te <<EOF
-policy_module(%{name},0.70)
-require {
-  type httpd_sys_content_t;
-  type httpd_log_t;
-  type httpd_var_lib_t;
-}
-EOF
-
-cat >%{name}.fc <<EOF
-%{_sysconfdir}/%{name}(/.*)?          root:object_r:httpd_sys_content_t:s0
-%{_localstatedir}/log/%{name}(/.*)?   system_u:object_r:httpd_sys_content_t:s0
-%{_localstatedir}/lib/%{name}(/.*)?   system_u:object_r:httpd_sys_content_t:s0
+cat >cron <<EOF
+# GLPI core
+# Run cron from to execute task even when no user connected
+*/4 * * * * apache %{_bindir}/php %{_datadir}/%{name}/front/cron.php
 EOF
-popd
-%endif
 
 
 %build
-%if %{useselinux}
-# SElinux 
-pushd selinux
-make -f %{_datadir}/selinux/devel/Makefile
-popd
-%endif
+# empty build
 
 
 %install
@@ -117,7 +117,6 @@
 
 # ===== config =====
 cp -ar config %{buildroot}/%{_datadir}/%{name}/config
-install --mode 644 %{SOURCE2} %{buildroot}/%{_datadir}/%{name}/config/config_path.php
 
 mkdir -p %{buildroot}/%{_sysconfdir}/%{name}
 touch %{buildroot}%{_sysconfdir}/%{name}/config_db.php
@@ -133,6 +132,10 @@
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
+# ====== Cron =====
+mkdir -p %{buildroot}%{_sysconfdir}/cron.d
+install -m 644 cron %{buildroot}%{_sysconfdir}/cron.d/%{name}
+
 # cleanup
 find %{buildroot} -name remove.txt -exec rm -f {} \; -print
 
@@ -144,11 +147,6 @@
 rm -f %{buildroot}%{_datadir}/%{name}/config/.htaccess
 rm -f %{buildroot}%{_datadir}/%{name}/scripts/.htaccess
 
-%if %{useselinux}
-# SElinux 
-mkdir -p %{buildroot}%{_datadir}/selinux/packages/%{name}
-install -m644 selinux/%{name}.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}.pp
-%endif
 
 # Lang
 for i in %{buildroot}%{_datadir}/%{name}/locales/*
@@ -164,26 +162,37 @@
 
 %post
 %if %{useselinux}
-# Install/update Selinux policy
-semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp
-# files owned by RPM
-fixfiles -R %{name} restore
+(
+# Remove Selinux policy (from previous packaging)
+semodule -s targeted -r %{name} &>/dev/null
+# Remove old httpd_sys_script_rw_t
+semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?"
+# New File context
+semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/glpi(/.*)?" 
+semanage fcontext -a -s system_u -t httpd_log_t           -r s0 "%{_localstatedir}/log/glpi(/.*)?"
+# keep httpd_sys_script_rw_t (httpd_var_lib_t prevent dir creation)
+semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/glpi(/.*)?"
 # files created by app
 restorecon -R %{_sysconfdir}/%{name}
 restorecon -R %{_localstatedir}/lib/%{name}
 restorecon -R %{_localstatedir}/log/%{name}
+) &>/dev/null
 %endif
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
 
 
 %postun
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
-    # Remove the SElinux policy.
-    semodule -r %{name} || :
+    # Remove the File Context
+    (
+    semanage fcontext -d "%{_sysconfdir}/glpi(/.*)?"
+    semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?"
+    semanage fcontext -d "%{_localstatedir}/lib/glpi(/.*)?"
+    ) &>/dev/null
 fi
 %endif
+/sbin/service httpd condrestart > /dev/null 2>&1 || :
 
 
 %files -f %{name}.lang
@@ -194,7 +203,9 @@
 %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/glpi.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/cron.d/%{name}
 
+# This folder can contain private information (sessions, docs, ...)
 %dir %_localstatedir/lib/%{name}
 %attr(750,apache,root) %{_localstatedir}/lib/%{name}/files
 
@@ -215,11 +226,27 @@
 %attr(750,apache,root) %dir %{_localstatedir}/log/%{name}
 %dir %{_datadir}/%{name}/locales
 
-%if %{useselinux}
-%{_datadir}/selinux/packages/%{name}/%{name}.pp
-%endif
 
 %changelog
+* Mon Sep 15 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.2-1
+- update to 0.71.2 bugfix
+
+* 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
+- increase memory_limit / max_execution_time for upgrade
+
+* Fri Jul 11 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71-1
+- update to 0.71 stable
+- fix bug #452353 (selinux)
+
+* Fri Apr 25 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.70.2-3
+- remplace module policy by simple semanage (#442706)
+
 * Mon Jan 28 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.70.2-2
 - rebuild (fix sources tarball)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Jan 2008 18:16:56 -0000	1.5
+++ sources	15 Sep 2008 18:26:53 -0000	1.6
@@ -1 +1 @@
-5e755472c887a54bc532569ec36add99  glpi-0.70.2.tar.gz
+404265b0efa8300a0f303665ff2c741b  glpi-0.71.2.tar.gz


--- glpi.patch DELETED ---


