diff --git a/.gitignore b/.gitignore index fc531e6..06c57eb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ glpi-0.72.4-11497.tar.gz /glpi-0.80.7.tar.gz /glpi-0.83.1.tar.gz /glpi-0.83.2.tar.gz +/glpi-0.83.31.tar.gz 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.spec b/glpi.spec index 6e61f79..add8c05 100644 --- a/glpi.spec +++ b/glpi.spec @@ -1,7 +1,7 @@ %global useselinux 1 Name: glpi -Version: 0.83.2 +Version: 0.83.3.1 %if 0%{?svnrelease} Release: 2.svn%{svnrelease}%{?dist} %else @@ -18,7 +18,7 @@ URL: http://www.glpi-project.org/ Source0: glpi-0.83-%{svnrelease}.tar.gz Source99: mktar.sh %else -Source0: https://forge.indepnet.net/attachments/download/1184/glpi-0.83.2.tar.gz +Source0: https://forge.indepnet.net/attachments/download/1210/glpi-0.83.31.tar.gz %endif Source1: glpi-httpd.conf @@ -36,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,6 +83,7 @@ find . -name \*.orig -exec rm {} \; -print 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 @@ -242,8 +244,13 @@ fi %changelog +* 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.1 released +- version 0.83.2 released https://forge.indepnet.net/projects/glpi/versions/750 * Thu Apr 19 2012 Remi Collet - 0.83.1-2 diff --git a/sources b/sources index 918a239..3de9db6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1132f87be98d6973bf7c00cccbb48876 glpi-0.83.2.tar.gz +1ef8a8bd6d9148a2426b076f00e5f811 glpi-0.83.31.tar.gz