/[smecontribs]/rpms/smeserver-php-scl/contribs9/smeserver-php-scl-0.4.bz10665-horde3-vs-php7.patch
ViewVC logotype

Contents of /rpms/smeserver-php-scl/contribs9/smeserver-php-scl-0.4.bz10665-horde3-vs-php7.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Sun Dec 23 03:22:29 2018 UTC (5 years, 4 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-php-scl-0_4-24_el6_sme, smeserver-php-scl-0_4-22_el6_sme, smeserver-php-scl-0_4-25_el6_sme, smeserver-php-scl-0_4-23_el6_sme, HEAD
* Sat Dec 22 2018 Jean-Philipe Pialasse <tests@pialasse.com> 0.4-22.sme
- apply locale 2018-12-14 patch
- fix horde 3 not running with php7 or higher set as php module for httpd [SME: 10665]

1 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90php_rhscl smeserver-php-scl-0.4/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90php_rhscl
2 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90php_rhscl 2018-12-22 22:11:17.507000000 -0500
3 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90php_rhscl 2018-12-22 22:20:55.238000000 -0500
4 @@ -131,4 +131,44 @@
5
6 }
7
8 + my $horde = $horde{'status'};
9 + if ($horde eq 'enabled')
10 + {
11 + my $php_version ='default';
12 + $php_version = ($php54{PhpModule} eq "enabled" )? 'php54' : $php_version;
13 + $php_version = ($php55{PhpModule} eq "enabled" )? 'php55' : $php_version;
14 + $php_version = ($php56{PhpModule} eq "enabled" )? 'php56' : $php_version;
15 + $php_version = ($php70{PhpModule} eq "enabled" )? 'php70' : $php_version;
16 + $php_version = ($php71{PhpModule} eq "enabled" )? 'php71' : $php_version;
17 + $php_version = ($php72{PhpModule} eq "enabled" )? 'php72' : $php_version;
18 + $php_version = ($php73{PhpModule} eq "enabled" )? 'php73' : $php_version;
19 + $OUT .= "\n";
20 + $OUT .= "\n";
21 + $OUT .= "#### Horde php-scl cgi to php56 if needed\n";
22 +
23 + # check Horde version; not needed if Horde 5 is installed
24 + my $cmd = "rpm -q horde --queryformat \"%{VERSION}\n\"";
25 + my $result = `$cmd`;
26 +
27 + if ( ($result le 3.9) && ($php_version eq 'php70' || $php_version eq 'php71' || $php_version eq 'php72' || $php_version eq 'php73'))
28 + {
29 +
30 + # write the configuration
31 +
32 + $OUT .= "\n";
33 + $OUT .= "\n";
34 + $OUT .= "<Directory /home/httpd/html/horde>\n";
35 + $OUT .= " # use PHP56 SCL from Remi repository instead of the default PHP as horde 3 does not support php 7\n";
36 + $OUT .= " AddHandler phpscl-cgi .php\n";
37 + $OUT .= " Action phpscl-cgi /phpscl-cgi/php56_REMI\n";
38 + $OUT .= "</Directory>\n";
39 + $OUT .= "\n";
40 + $OUT .= "\n";
41 +
42 + }
43 + else
44 + {
45 + $OUT .= "#Not needed php mod value < php70\n";
46 + }
47 + }
48 }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed