diff --git a/.abf.yml b/.abf.yml index 525c88e..396267b 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "glpi-0.80.7.tar.gz": 3425bbaac5961b9572cf7c8fc8f57e39fd1ec2cc + "glpi-0.83.6.tar.gz": 1ff38662b923407933abe7212405c6608e2d8d57 diff --git a/glpi-0.83-cron.patch b/glpi-0.83-cron.patch new file mode 100644 index 0000000..25906e5 --- /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` & 2)"; ++ $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` & 2)"; ++ $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-config_path.php b/glpi-config_path.php index e7b42b7..1027223 100644 --- a/glpi-config_path.php +++ b/glpi-config_path.php @@ -22,6 +22,7 @@ define('GLPI_CACHE_LITE_DIR', 'Cache'); define('GLPI_PHPMAILER_DIR', 'PHPMailer'); define('GLPI_EZC_BASE', 'ezc/Base/base.php'); define('GLPI_PHPCAS', 'CAS.php'); +define('GLPI_HTMLAWED', 'htmLawed/htmLawed.php'); // Fonts define('GLPI_FONT_FREESANS', '/usr/share/fonts/gnu-free/FreeSans.ttf'); diff --git a/glpi-cron.patch b/glpi-cron.patch deleted file mode 100644 index f7d62c4..0000000 --- a/glpi-cron.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ru glpi.cron/install/install.php glpi/install/install.php ---- glpi.cron/install/install.php 2011-07-21 20:50:28.000000000 +0200 -+++ glpi/install/install.php 2011-08-22 19:17:20.468262531 +0200 -@@ -357,6 +357,15 @@ - $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 `mode`=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 -ru glpi.cron/install/update.php glpi/install/update.php ---- glpi.cron/install/update.php 2011-07-21 20:50:28.000000000 +0200 -+++ glpi/install/update.php 2011-08-22 19:18:48.485449461 +0200 -@@ -762,6 +762,11 @@ - $plugin = new Plugin(); - $plugin->unactivateAll(); - -+ // RPM provides a good system cron -+ $query = "UPDATE `glpi_crontasks` SET `mode`=2 WHERE `mode`=1"; -+ $DB->query($query) -+ or die("RPM update of glpi_crontasks. " . $LANG['update'][90] . $DB->error()); -+ - echo "

".$LANG['update'][139]."

"; - - optimize_tables($migration); -Seulement dans glpi/install/: update.php~ 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 + + Require all granted + + + Order deny,allow + Allow from all + diff --git a/glpi.spec b/glpi.spec index 3c287b7..2ad5bbd 100644 --- a/glpi.spec +++ b/glpi.spec @@ -1,16 +1,9 @@ -%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.6 %if 0%{?svnrelease} -Release: 2.svn%{svnrelease}%{?dist} +Release: 3.svn%{svnrelease}%{?dist} %else Release: 1%{?dist} %endif @@ -22,10 +15,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/1314/glpi-0.83.6.tar.gz %endif Source1: glpi-httpd.conf @@ -33,7 +26,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) @@ -43,6 +36,7 @@ Requires: php >= 5.1.0, php-mysql, httpd, php-gd, php-ldap, php-imap, php- Requires: php-pear(Cache_Lite) >= 1.7.4 Requires: php-PHPMailer Requires: php-pear-CAS >= 1.2.0 +Requires: php-htmLawed %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 Requires: php-pear(components.ez.no/Graph) >= 1.5 Requires: gnu-free-sans-fonts @@ -82,13 +76,14 @@ 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 rm -rf lib/cache_lite rm -rf lib/phpmailer rm -rf lib/phpcas +rm -rf lib/htmlawed %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 rm -rf lib/ezcomponents @@ -249,6 +244,36 @@ fi %changelog +* Tue Oct 16 2012 Remi Collet - 0.83.6-1 +- version 0.83.6 released (bugfix) + https://forge.indepnet.net/projects/glpi/versions/841 + +* Tue Oct 9 2012 Remi Collet - 0.83.5-1 +- version 0.83.5 released (bugfix) + https://forge.indepnet.net/projects/glpi/versions/800 + +* Fri Jul 27 2012 Remi Collet - 0.83.4-1 +- version 0.83.4 released (bugfix) + https://forge.indepnet.net/projects/glpi/versions/777 + +* Thu Jul 12 2012 Remi Collet - 0.83.3.1-1 +- version 0.83.3 released (bugfix + security) + https://forge.indepnet.net/projects/glpi/versions/771 +- new dependency on htmLawed + +* Thu May 31 2012 Remi Collet - 0.83.2-1 +- version 0.83.2 released + https://forge.indepnet.net/projects/glpi/versions/750 + +* Thu Apr 19 2012 Remi Collet - 0.83.1-2 +- fix cron patch + +* Wed Apr 18 2012 Remi Collet - 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 - 0.80.7-1 - version 0.80.7 released (security) https://forge.indepnet.net/projects/glpi/versions/685