extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* remove requirement for deprecated php-mcrypt extension

Browse Source
This commit is contained in:
Ralf Becker 2016-06-21 10:15:23 +02:00
parent 1b4bef13f5
commit 29739f6b82
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/rpm-build/debian.control
View File

@ -51,7 +51,6 @@ Depends: apache2,
php5-mysql | php5-pgsql | php-mysql | php-pgsql, php5-mysql | php5-pgsql | php-mysql | php-pgsql,
php5-json | php-json, php5-json | php-json,
php5-gd | php-gd, php5-gd | php-gd,
php5-mcrypt | php-mcrypt,
php5-xsl | php-xsl, php5-xsl | php-xsl,
${misc:Depends} ${misc:Depends}
Recommends: mariadb-server | mysql-server, php-opcache | php-apc, php-apcu, php5-pecl-smb, php5-tidy | php-tidy, php5-zip | php-zip, Recommends: mariadb-server | mysql-server, php-opcache | php-apc, php-apcu, php5-pecl-smb, php5-tidy | php-tidy, php5-zip | php-zip,

2
doc/rpm-build/egroupware-epl.spec
View File

@ -208,7 +208,7 @@ Further contributed applications are available as separate packages.
Summary: The EGroupware core Summary: The EGroupware core
Group: Web/Database Group: Web/Database
Requires: %{php} >= 5.4.0 Requires: %{php} >= 5.4.0
Requires: %{php}-mbstring %{php}-gd %{php}-mcrypt %{extra_requires} %{cron} zip %{php}-json %{php}-xsl Requires: %{php}-mbstring %{php}-gd %{extra_requires} %{cron} zip %{php}-json %{php}-xsl
Provides: egw-core %{version} Provides: egw-core %{version}
Provides: egw-addressbook %{version} Provides: egw-addressbook %{version}
%if 0%{?suse_version} %if 0%{?suse_version}

8
doc/rpm-build/post_install.php
View File

@ -125,14 +125,6 @@ function set_distro_defaults($distro=null)
$config['start_db'] = '/etc/init.d/mysql'; $config['start_db'] = '/etc/init.d/mysql';
$config['start_webserver'] = '/etc/init.d/apache2'; $config['start_webserver'] = '/etc/init.d/apache2';
} }
// enable mcrypt
if (file_exists('/usr/sbin/php5enmod'))
{
$config['php5enmod'] = '/usr/sbin/php5enmod';
// Ubuntu only needs "-s ALL" and Debian gives an error, because it does not support it
if (!file_exists('/etc/php5/conf.d/')) $config['php5enmod'] .= ' -s ALL';
$config['php5enmod'] .= ' mcrypt';
}
$config['autostart_db'] = '/usr/sbin/update-rc.d mysql defaults'; $config['autostart_db'] = '/usr/sbin/update-rc.d mysql defaults';
$config['autostart_webserver'] = '/usr/sbin/update-rc.d apache2 defaults'; $config['autostart_webserver'] = '/usr/sbin/update-rc.d apache2 defaults';
$config['webserver_user'] = 'www-data'; $config['webserver_user'] = 'www-data';

4
setup/check_install.php
View File

@ -214,10 +214,6 @@ $checks = array(
'func' => 'extension_check', 'func' => 'extension_check',
'error' => lang("The ctype extension is needed by HTMLpurifier to check content of FCKeditor agains Cross Site Skripting."), 'error' => lang("The ctype extension is needed by HTMLpurifier to check content of FCKeditor agains Cross Site Skripting."),
), ),
'mcrypt' => array(
'func' => 'extension_check',
'warning' => lang('The mcrypt extension is used, to store eTemplate form state on the client, which is the prefered way to store it.'),
),
'json' => array( 'json' => array(
'func' => 'extension_check', 'func' => 'extension_check',
'error' => lang('The json extension is required by EGroupware for AJAX.'), 'error' => lang('The json extension is required by EGroupware for AJAX.'),