From acf8be925925627d80923a8b88c2886026bad85b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Jul 12 2008 07:36:44 +0000 Subject: update to 0.71 --- diff --git a/glpi-config_path.php b/glpi-config_path.php index 4609221..a55147b 100644 --- a/glpi-config_path.php +++ b/glpi-config_path.php @@ -11,5 +11,6 @@ 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_CACHE_LITE_DIR", "Cache"); define("GLPI_LOG_DIR", "/var/log/glpi"); ?> diff --git a/glpi-httpd.conf b/glpi-httpd.conf index 8145f29..8d20c6e 100644 --- a/glpi-httpd.conf +++ b/glpi-httpd.conf @@ -4,6 +4,8 @@ Alias /glpi /usr/share/glpi Options None AllowOverride Limit Options FileInfo + php_value memory_limit 64M + Order Deny,Allow Allow from all diff --git a/glpi.patch b/glpi.patch deleted file mode 100644 index 797af33..0000000 --- a/glpi.patch +++ /dev/null @@ -1,321 +0,0 @@ -Fixes since 0.70 finale - -fix a memory leak https://dev.indepnet.net:8080/glpi/changeset/6190 -clean code https://dev.indepnet.net:8080/glpi/changeset/6191 -Correction reports https://dev.indepnet.net:8080/glpi/changeset/6194 -fix search end warranty https://dev.indepnet.net:8080/glpi/changeset/6196 -mailgate https://dev.indepnet.net:8080/glpi/changeset/6226 -mailgate https://dev.indepnet.net:8080/glpi/changeset/6228 - -Index: branches/0.70-bugfixes/inc/rulesengine.class.php -=================================================================== ---- trunk/inc/rulesengine.class.php (revision 6127) -+++ branches/0.70-bugfixes/inc/rulesengine.class.php (revision 6190) -@@ -67,4 +67,5 @@ - $result = $DB->query($sql); - if ($result){ -+ $this->rule_list = array(); - while ($rule=$DB->fetch_array($result)) { - //For each rule, get a Rule object with all the criterias and actions -Index: branches/0.70-bugfixes/inc/software.function.php -=================================================================== ---- trunk/inc/software.function.php (revision 6096) -+++ branches/0.70-bugfixes/inc/software.function.php (revision 6191) -@@ -69,5 +69,5 @@ - $nb_licences=$DB->result($result, 0, "COUNT"); - $result_update = $DB->query($query_update); -- $nb_updates=$DB->result($result_update, 0, "COUNT");; -+ $nb_updates=$DB->result($result_update, 0, "COUNT"); - $installed = getInstalledLicence($sID); - $tobuy=getLicenceToBuy($sID); -@@ -128,5 +128,4 @@ - - $params=array('type'=>'__VALUE__', -- 'sID'=>$sID, - 'sID'=>$sID, - ); -Index: branches/0.70-bugfixes/front/report.infocom.conso.php -=================================================================== ---- trunk/front/report.infocom.conso.php (revision 5788) -+++ branches/0.70-bugfixes/front/report.infocom.conso.php (revision 6194) -@@ -204,5 +204,5 @@ - - --echo "

".$LANG["common"][33].": ".$LANG["financial"][21]."=".number_format($valeurtot,$CFG_GLPI["decimal_number"])." - ".$LANG["financial"][81]."=".number_format($valeurnettetot,$CFG_GLPI["decimal_number"])."

"; -+echo "

".$LANG["common"][33].": ".$LANG["financial"][21]."=".number_format($valeurtot,$CFG_GLPI["decimal_number"],"."," ")." - ".$LANG["financial"][81]."=".number_format($valeurnettetot,$CFG_GLPI["decimal_number"],"."," ")."

"; - - if (count($valeurnettegraphtot)>0){ -Index: branches/0.70-bugfixes/front/report.infocom.php -=================================================================== ---- trunk/front/report.infocom.php (revision 5857) -+++ branches/0.70-bugfixes/front/report.infocom.php (revision 6194) -@@ -160,5 +160,5 @@ - $valeurnettetot+=$valeurnettesoustot; - -- echo "

".$LANG["common"][33].": ".$LANG["financial"][21]."=$valeursoustot - ".$LANG["financial"][81]."=$valeurnettesoustot

"; -+ echo "

".$LANG["common"][33].": ".$LANG["financial"][21]."=".number_format($valeursoustot,$CFG_GLPI["decimal_number"],"."," ")." - ".$LANG["financial"][81]."=".number_format($valeurnettesoustot,$CFG_GLPI["decimal_number"],"."," ")."

"; - - -@@ -221,5 +221,5 @@ - - --echo "

".$LANG["common"][33].": ".$LANG["financial"][21]."=".number_format($valeurtot,$CFG_GLPI["decimal_number"])." - ".$LANG["financial"][81]."=".number_format($valeurnettetot,$CFG_GLPI["decimal_number"])."

"; -+echo "

".$LANG["common"][33].": ".$LANG["financial"][21]."=".number_format($valeurtot,$CFG_GLPI["decimal_number"],"."," ")." - ".$LANG["financial"][81]."=".number_format($valeurnettetot,$CFG_GLPI["decimal_number"],"."," ")."

"; - - if (count($valeurnettegraphtot)>0){ -Index: branches/0.70-bugfixes/inc/search.constant.php -=================================================================== ---- trunk/inc/search.constant.php (revision 6154) -+++ branches/0.70-bugfixes/inc/search.constant.php (revision 6196) -@@ -373,14 +373,8 @@ - - $SEARCH_OPTION[COMPUTER_TYPE][120]['table']='glpi_infocoms'; --$SEARCH_OPTION[COMPUTER_TYPE][120]['field']='end_warranty_buy'; -+$SEARCH_OPTION[COMPUTER_TYPE][120]['field']='end_warranty'; - $SEARCH_OPTION[COMPUTER_TYPE][120]['linkfield']=''; --$SEARCH_OPTION[COMPUTER_TYPE][120]['name']=$LANG["financial"][14]." - ".$LANG["financial"][80]; -+$SEARCH_OPTION[COMPUTER_TYPE][120]['name']=$LANG["financial"][80]; - $SEARCH_OPTION[COMPUTER_TYPE][120]['meta']=0; -- --$SEARCH_OPTION[COMPUTER_TYPE][121]['table']='glpi_infocoms'; --$SEARCH_OPTION[COMPUTER_TYPE][121]['field']='end_warranty_buy'; --$SEARCH_OPTION[COMPUTER_TYPE][121]['linkfield']=''; --$SEARCH_OPTION[COMPUTER_TYPE][121]['name']=$LANG["financial"][76]." - ".$LANG["financial"][80]; --$SEARCH_OPTION[COMPUTER_TYPE][121]['meta']=0; - - $SEARCH_OPTION[COMPUTER_TYPE][53]['table']='glpi_enterprises_infocoms'; -@@ -724,14 +718,8 @@ - - $SEARCH_OPTION[NETWORKING_TYPE][120]['table']='glpi_infocoms'; --$SEARCH_OPTION[NETWORKING_TYPE][120]['field']='end_warranty_buy'; -+$SEARCH_OPTION[NETWORKING_TYPE][120]['field']='end_warranty'; - $SEARCH_OPTION[NETWORKING_TYPE][120]['linkfield']=''; --$SEARCH_OPTION[NETWORKING_TYPE][120]['name']=$LANG["financial"][14]." - ".$LANG["financial"][80]; -+$SEARCH_OPTION[NETWORKING_TYPE][120]['name']=$LANG["financial"][80]; - $SEARCH_OPTION[NETWORKING_TYPE][120]['meta']=0; -- --$SEARCH_OPTION[NETWORKING_TYPE][121]['table']='glpi_infocoms'; --$SEARCH_OPTION[NETWORKING_TYPE][121]['field']='end_warranty_buy'; --$SEARCH_OPTION[NETWORKING_TYPE][121]['linkfield']=''; --$SEARCH_OPTION[NETWORKING_TYPE][121]['name']=$LANG["financial"][76]." - ".$LANG["financial"][80]; --$SEARCH_OPTION[NETWORKING_TYPE][121]['meta']=0; - - $SEARCH_OPTION[NETWORKING_TYPE][53]['table']='glpi_enterprises_infocoms'; -@@ -1017,14 +1005,8 @@ - - $SEARCH_OPTION[PRINTER_TYPE][120]['table']='glpi_infocoms'; --$SEARCH_OPTION[PRINTER_TYPE][120]['field']='end_warranty_buy'; -+$SEARCH_OPTION[PRINTER_TYPE][120]['field']='end_warranty'; - $SEARCH_OPTION[PRINTER_TYPE][120]['linkfield']=''; --$SEARCH_OPTION[PRINTER_TYPE][120]['name']=$LANG["financial"][14]." - ".$LANG["financial"][80]; -+$SEARCH_OPTION[PRINTER_TYPE][120]['name']=$LANG["financial"][80]; - $SEARCH_OPTION[PRINTER_TYPE][120]['meta']=0; -- --$SEARCH_OPTION[PRINTER_TYPE][121]['table']='glpi_infocoms'; --$SEARCH_OPTION[PRINTER_TYPE][121]['field']='end_warranty_buy'; --$SEARCH_OPTION[PRINTER_TYPE][121]['linkfield']=''; --$SEARCH_OPTION[PRINTER_TYPE][121]['name']=$LANG["financial"][76]." - ".$LANG["financial"][80]; --$SEARCH_OPTION[PRINTER_TYPE][121]['meta']=0; - - $SEARCH_OPTION[PRINTER_TYPE][53]['table']='glpi_enterprises_infocoms'; -@@ -1265,15 +1247,8 @@ - - $SEARCH_OPTION[MONITOR_TYPE][120]['table']='glpi_infocoms'; --$SEARCH_OPTION[MONITOR_TYPE][120]['field']='end_warranty_buy'; -+$SEARCH_OPTION[MONITOR_TYPE][120]['field']='end_warranty'; - $SEARCH_OPTION[MONITOR_TYPE][120]['linkfield']=''; --$SEARCH_OPTION[MONITOR_TYPE][120]['name']=$LANG["financial"][14]." - ".$LANG["financial"][80]; -+$SEARCH_OPTION[MONITOR_TYPE][120]['name']=$LANG["financial"][80]; - $SEARCH_OPTION[MONITOR_TYPE][120]['meta']=0; -- --$SEARCH_OPTION[MONITOR_TYPE][121]['table']='glpi_infocoms'; --$SEARCH_OPTION[MONITOR_TYPE][121]['field']='end_warranty_buy'; --$SEARCH_OPTION[MONITOR_TYPE][121]['linkfield']=''; --$SEARCH_OPTION[MONITOR_TYPE][121]['name']=$LANG["financial"][76]." - ".$LANG["financial"][80]; --$SEARCH_OPTION[MONITOR_TYPE][121]['meta']=0; -- - - $SEARCH_OPTION[MONITOR_TYPE][53]['table']='glpi_enterprises_infocoms'; -@@ -1553,14 +1528,8 @@ - - $SEARCH_OPTION[PERIPHERAL_TYPE][120]['table']='glpi_infocoms'; --$SEARCH_OPTION[PERIPHERAL_TYPE][120]['field']='end_warranty_buy'; -+$SEARCH_OPTION[PERIPHERAL_TYPE][120]['field']='end_warranty'; - $SEARCH_OPTION[PERIPHERAL_TYPE][120]['linkfield']=''; --$SEARCH_OPTION[PERIPHERAL_TYPE][120]['name']=$LANG["financial"][14]." - ".$LANG["financial"][80]; -+$SEARCH_OPTION[PERIPHERAL_TYPE][120]['name']=$LANG["financial"][80]; - $SEARCH_OPTION[PERIPHERAL_TYPE][120]['meta']=0; -- --$SEARCH_OPTION[PERIPHERAL_TYPE][121]['table']='glpi_infocoms'; --$SEARCH_OPTION[PERIPHERAL_TYPE][121]['field']='end_warranty_buy'; --$SEARCH_OPTION[PERIPHERAL_TYPE][121]['linkfield']=''; --$SEARCH_OPTION[PERIPHERAL_TYPE][121]['name']=$LANG["financial"][76]." - ".$LANG["financial"][80]; --$SEARCH_OPTION[PERIPHERAL_TYPE][121]['meta']=0; - - $SEARCH_OPTION[PERIPHERAL_TYPE][53]['table']='glpi_enterprises_infocoms'; -@@ -1790,14 +1759,8 @@ - - $SEARCH_OPTION[SOFTWARE_TYPE][120]['table']='glpi_infocoms'; --$SEARCH_OPTION[SOFTWARE_TYPE][120]['field']='end_warranty_buy'; -+$SEARCH_OPTION[SOFTWARE_TYPE][120]['field']='end_warranty'; - $SEARCH_OPTION[SOFTWARE_TYPE][120]['linkfield']=''; --$SEARCH_OPTION[SOFTWARE_TYPE][120]['name']=$LANG["financial"][14]." - ".$LANG["financial"][80]; -+$SEARCH_OPTION[SOFTWARE_TYPE][120]['name']=$LANG["financial"][80]; - $SEARCH_OPTION[SOFTWARE_TYPE][120]['meta']=0; -- --$SEARCH_OPTION[SOFTWARE_TYPE][121]['table']='glpi_infocoms'; --$SEARCH_OPTION[SOFTWARE_TYPE][121]['field']='end_warranty_buy'; --$SEARCH_OPTION[SOFTWARE_TYPE][121]['linkfield']=''; --$SEARCH_OPTION[SOFTWARE_TYPE][121]['name']=$LANG["financial"][76]." - ".$LANG["financial"][80]; --$SEARCH_OPTION[SOFTWARE_TYPE][121]['meta']=0; - - $SEARCH_OPTION[SOFTWARE_TYPE][53]['table']='glpi_enterprises_infocoms'; -@@ -2665,14 +2628,8 @@ - - $SEARCH_OPTION[PHONE_TYPE][120]['table']='glpi_infocoms'; --$SEARCH_OPTION[PHONE_TYPE][120]['field']='end_warranty_buy'; -+$SEARCH_OPTION[PHONE_TYPE][120]['field']='end_warranty'; - $SEARCH_OPTION[PHONE_TYPE][120]['linkfield']=''; --$SEARCH_OPTION[PHONE_TYPE][120]['name']=$LANG["financial"][14]." - ".$LANG["financial"][80]; -+$SEARCH_OPTION[PHONE_TYPE][120]['name']=$LANG["financial"][80]; - $SEARCH_OPTION[PHONE_TYPE][120]['meta']=0; -- --$SEARCH_OPTION[PHONE_TYPE][121]['table']='glpi_infocoms'; --$SEARCH_OPTION[PHONE_TYPE][121]['field']='end_warranty_buy'; --$SEARCH_OPTION[PHONE_TYPE][121]['linkfield']=''; --$SEARCH_OPTION[PHONE_TYPE][121]['name']=$LANG["financial"][76]." - ".$LANG["financial"][80]; --$SEARCH_OPTION[PHONE_TYPE][121]['meta']=0; - - $SEARCH_OPTION[PHONE_TYPE][53]['table']='glpi_enterprises_infocoms'; -Index: branches/0.70-bugfixes/inc/search.function.php -=================================================================== ---- trunk/inc/search.function.php (revision 6154) -+++ branches/0.70-bugfixes/inc/search.function.php (revision 6196) -@@ -45,5 +45,5 @@ - $todel=array(); - if (!haveRight('contract_infocom',$action)&&in_array($type,$CFG_GLPI["infocom_types"])){ -- $todel=array_merge($todel,array('financial',25,26,27,28,29,30,37,38,50,51,52,53,54,55,56,57,58,59,120,121,122)); -+ $todel=array_merge($todel,array('financial',25,26,27,28,29,30,37,38,50,51,52,53,54,55,56,57,58,59,120,122)); - } - -@@ -1389,9 +1389,6 @@ - return " ORDER BY ADDDATE(glpi_contracts.begin_date, INTERVAL glpi_contracts.duration MONTH) $order "; - break; -- case "glpi_infocoms.end_warranty_buy": -+ case "glpi_infocoms.end_warranty": - return " ORDER BY ADDDATE(glpi_infocoms.buy_date, INTERVAL glpi_infocoms.warranty_duration MONTH) $order "; -- break; -- case "glpi_infocoms.end_warranty_use": -- return " ORDER BY ADDDATE(glpi_infocoms.use_date, INTERVAL glpi_infocoms.warranty_duration MONTH) $order "; - break; - case "glpi_contracts.expire": -@@ -1571,9 +1568,6 @@ - return $pretable.$table.$addtable.".begin_date AS ".$NAME."_$num, ".$pretable.$table.$addtable.".duration AS ".$NAME."_".$num."_2, "; - break; -- case "glpi_infocoms.end_warranty_buy": -+ case "glpi_infocoms.end_warranty": - return $pretable.$table.$addtable.".buy_date AS ".$NAME."_$num, ".$pretable.$table.$addtable.".warranty_duration AS ".$NAME."_".$num."_2, "; -- break; -- case "glpi_infocoms.end_warranty_use": -- return $pretable.$table.$addtable.".use_date AS ".$NAME."_$num, ".$pretable.$table.$addtable.".warranty_duration AS ".$NAME."_".$num."_2, "; - break; - case "glpi_contracts.expire_notice" : // ajout jmd -@@ -1763,6 +1757,5 @@ - break; - -- case "glpi_infocoms.end_warranty_use" : -- case "glpi_infocoms.end_warranty_buy" : -+ case "glpi_infocoms.end_warranty" : - case "glpi_contracts.end_date" : - case "glpi_ocs_link.last_update": -@@ -1789,8 +1782,5 @@ - $date_computation=" ADDDATE($table.begin_date, INTERVAL $table.duration MONTH) "; - break; -- case "glpi_infocoms.end_warranty_use": -- $date_computation=" ADDDATE($table.use_date, INTERVAL $table.warranty_duration MONTH) "; -- break; -- case "glpi_infocoms.end_warranty_buy": -+ case "glpi_infocoms.end_warranty": - $date_computation=" ADDDATE($table.buy_date, INTERVAL $table.warranty_duration MONTH) "; - break; -@@ -2522,6 +2512,5 @@ - return convDateTime($data["ITEM_$num"]); - break; -- case "glpi_infocoms.end_warranty_use": -- case "glpi_infocoms.end_warranty_buy": -+ case "glpi_infocoms.end_warranty": - case "glpi_contracts.end_date": - if ($data["ITEM_$num"]!=''&&$data["ITEM_$num"]!="0000-00-00"){ -Index: branches/0.70-bugfixes/inc/mailgate.class.php -=================================================================== ---- trunk/inc/mailgate.class.php (revision 6096) -+++ branches/0.70-bugfixes/inc/mailgate.class.php (revision 6226) -@@ -260,4 +260,6 @@ - // Mail request type - $tkt['request_type']=2; -+ // AUto_import -+ $tkt['_auto_import']=1; - $body=$this->getBody($i); - -Index: branches/0.70-bugfixes/inc/tracking.class.php -=================================================================== ---- branches/0.70-bugfixes/inc/tracking.class.php (revision 6177) -+++ branches/0.70-bugfixes/inc/tracking.class.php (revision 6226) -@@ -414,12 +414,19 @@ - unset($input["type"]); - -- if (!isset($input["author"])){ -+ // No Auto set Import for external source -+ if (!isset($input['_auto_import'])&&!isset($input["author"])){ - if (isset($_SESSION["glpiID"])&&$_SESSION["glpiID"]>0) - $input["author"]=$_SESSION["glpiID"]; - else $input["author"]=1; // Helpdesk injector -- } -- -- if (isset($_SESSION["glpiID"])) $input["recipient"]=$_SESSION["glpiID"]; -- else if ($input["author"]) $input["recipient"]=$input["author"]; -+ } else { -+ $input["author"]=0; -+ } -+ -+ // No Auto set Import for external source -+ if (isset($_SESSION["glpiID"])&&!isset($input['_auto_import'])) { -+ $input["recipient"]=$_SESSION["glpiID"]; -+ } else if ($input["author"]) { -+ $input["recipient"]=$input["author"]; -+ } - - if (!isset($input["request_type"])) $input["request_type"]=1; -@@ -440,5 +447,4 @@ - $input["computer"]=0; - } -- - - // Auto group define -Index: branches/0.70-bugfixes/inc/tracking.class.php -=================================================================== ---- branches/0.70-bugfixes/inc/tracking.class.php (revision 6226) -+++ branches/0.70-bugfixes/inc/tracking.class.php (revision 6228) -@@ -415,15 +415,15 @@ - - // No Auto set Import for external source -- if (!isset($input['_auto_import'])&&!isset($input["author"])){ -- if (isset($_SESSION["glpiID"])&&$_SESSION["glpiID"]>0) -- $input["author"]=$_SESSION["glpiID"]; -- else $input["author"]=1; // Helpdesk injector -- } else { -- $input["author"]=0; -+ if (!isset($input['_auto_import'])){ -+ if (!isset($input["author"])){ -+ if (isset($_SESSION["glpiID"])&&$_SESSION["glpiID"]>0) -+ $input["author"]=$_SESSION["glpiID"]; -+ else $input["author"]=1; // Helpdesk injector -+ } - } - - // No Auto set Import for external source - if (isset($_SESSION["glpiID"])&&!isset($input['_auto_import'])) { -- $input["recipient"]=$_SESSION["glpiID"]; -+ $input["recipient"]=$_SESSION["glpiID"]; - } else if ($input["author"]) { - $input["recipient"]=$input["author"]; diff --git a/glpi.spec b/glpi.spec index 6fda90f..4d83cd9 100644 --- a/glpi.spec +++ b/glpi.spec @@ -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 +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -27,6 +27,7 @@ Requires: php, php-mysql, httpd, php-gd, php-ldap, php-imap 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,7 +35,6 @@ Requires(post): /sbin/service BuildRequires: dos2unix %if %{useselinux} Requires: policycoreutils -BuildRequires: selinux-policy-devel, checkpolicy %endif %description @@ -59,42 +59,28 @@ techniciens grâce à une maintenance plus cohérente. %prep %setup -q -n glpi +%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 <%{name}.fc </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 @@ -215,11 +206,15 @@ fi %attr(750,apache,root) %dir %{_localstatedir}/log/%{name} %dir %{_datadir}/%{name}/locales -%if %{useselinux} -%{_datadir}/selinux/packages/%{name}/%{name}.pp -%endif %changelog +* Fri Jul 11 2008 Remi Collet - 0.71-1 +- update to 0.71 stable +- fix bug #452353 (selinux) + +* Fri Apr 25 2008 Remi Collet - 0.70.2-3 +- remplace module policy by simple semanage (#442706) + * Mon Jan 28 2008 Remi Collet - 0.70.2-2 - rebuild (fix sources tarball) diff --git a/sources b/sources index a0748df..067b9ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e755472c887a54bc532569ec36add99 glpi-0.70.2.tar.gz +9715471ac8e3be2a59f2888a180f26c2 glpi-0.71.tar.gz