/[smeserver]/rpms/smeserver-php/sme10/smeserver-php-3.0.0-bz11295-addphp80.patch
ViewVC logotype

Contents of /rpms/smeserver-php/sme10/smeserver-php-3.0.0-bz11295-addphp80.patch

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


Revision 1.2 - (show annotations) (download)
Tue Feb 23 03:32:48 2021 UTC (3 years, 2 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-php-3_0_0-44_el7_sme, smeserver-php-3_0_0-47_el7_sme, smeserver-php-3_0_0-31_el7_sme, smeserver-php-3_0_0-25_el7_sme, smeserver-php-3_0_0-28_el7_sme, smeserver-php-3_0_0-45_el7_sme, smeserver-php-3_0_0-48_el7_sme, smeserver-php-3_0_0-43_el7_sme, smeserver-php-3_0_0-46_el7_sme, smeserver-php-3_0_0-41_el7_sme, smeserver-php-3_0_0-30_el7_sme, smeserver-php-3_0_0-29_el7_sme, smeserver-php-3_0_0-42_el7_sme, smeserver-php-3_0_0-34_el7_sme, smeserver-php-3_0_0-37_el7_sme, smeserver-php-3_0_0-40_el7_sme, smeserver-php-3_0_0-35_el7_sme, smeserver-php-3_0_0-26_el7_sme, smeserver-php-3_0_0-32_el7_sme, smeserver-php-3_0_0-38_el7_sme, smeserver-php-3_0_0-27_el7_sme, smeserver-php-3_0_0-39_el7_sme, smeserver-php-3_0_0-36_el7_sme, smeserver-php-3_0_0-33_el7_sme, HEAD
Changes since 1.1: +20 -0 lines
* Mon Feb 22 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-25.sme
- add missing default db configuration for php80* [SME: 11378]

1 diff -Nur smeserver-php-3.0.0.old/createlinks smeserver-php-3.0.0/createlinks
2 --- smeserver-php-3.0.0.old/createlinks 2021-02-21 00:25:54.793000000 -0500
3 +++ smeserver-php-3.0.0/createlinks 2021-02-21 00:30:37.322000000 -0500
4 @@ -11,7 +11,9 @@
5 /etc/opt/remi/php71/php.ini
6 /etc/opt/remi/php72/php.ini
7 /etc/opt/remi/php73/php.ini
8 -/etc/opt/remi/php74/php.ini)){
9 +/etc/opt/remi/php74/php.ini
10 +/etc/opt/remi/php80/php.ini
11 +)){
12 templates2events($file, qw(
13 console-save
14 bootstrap-console-save
15 @@ -40,7 +42,7 @@
16 templates2events($file, $event);
17 }
18
19 -foreach $ver (qw( 55 56 70 71 72 73 74 )){
20 +foreach $ver (qw( 55 56 70 71 72 73 74 80)){
21 foreach $service ( "php$ver-php-fpm" ){
22 foreach $event (qw(webapps-update ibay-create ibay-delete ibay-modify ibay-modify-files ibay-modify-servers )){
23 safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/$service");
24 @@ -70,6 +72,7 @@
25 /etc/logrotate.d/php72-php-fpm
26 /etc/logrotate.d/php73-php-fpm
27 /etc/logrotate.d/php74-php-fpm
28 + /etc/logrotate.d/php80-php-fpm
29 )){
30 templates2events($file, qw(webapps-update bootstrap-console-save smeserver-php-update));
31 }
32 @@ -90,7 +93,7 @@
33 }
34
35 #php7*
36 -foreach $ver (qw( 70 71 72 73 74 )){
37 +foreach $ver (qw( 70 71 72 73 74 80)){
38 foreach $file ( "/etc/opt/remi/php$ver/php-fpm.conf",
39 "/etc/opt/remi/php$ver/php-fpm.d/www.conf",
40 "/etc/opt/remi/php$ver/php-fpm.d/ibays.conf",
41 diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults smeserver-php-3.0.0/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults
42 --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults 2019-12-09 22:59:28.000000000 -0500
43 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults 2021-02-21 00:32:12.126000000 -0500
44 @@ -1,5 +1,5 @@
45
46 -for VER in php php55 php56 php70 php71 php72 php73 php74; do
47 +for VER in php php55 php56 php70 php71 php72 php73 php74 php80; do
48 /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/tmp
49 /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/opcache
50 /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/wsdlcache
51 diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm smeserver-php-3.0.0/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm
52 --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm 2021-02-21 00:25:54.783000000 -0500
53 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm 2021-02-21 00:31:51.320000000 -0500
54 @@ -18,6 +18,7 @@
55 /sbin/e-smith/service php72-php-fpm reload >/dev/null 2>&1 || true
56 /sbin/e-smith/service php73-php-fpm reload >/dev/null 2>&1 || true
57 /sbin/e-smith/service php74-php-fpm reload >/dev/null 2>&1 || true
58 + /sbin/e-smith/service php80-php-fpm reload >/dev/null 2>&1 || true
59 endscript
60 }
61
62 @@ -37,6 +38,7 @@
63 /sbin/e-smith/service php72-php-fpm reload >/dev/null 2>&1 || true
64 /sbin/e-smith/service php73-php-fpm reload >/dev/null 2>&1 || true
65 /sbin/e-smith/service php74-php-fpm reload >/dev/null 2>&1 || true
66 + /sbin/e-smith/service php80-php-fpm reload >/dev/null 2>&1 || true
67 endscript
68 }
69 ";
70 diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php.ini/10LanguageOptions smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php.ini/10LanguageOptions
71 --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php.ini/10LanguageOptions 2021-02-21 00:25:54.691000000 -0500
72 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php.ini/10LanguageOptions 2021-02-21 00:35:52.039000000 -0500
73 @@ -36,6 +36,6 @@
74 }
75 if ( $PHP_VERSION >= 74)
76 {
77 -$OUT .="zend.exception_ignore_args = On-1\n";
78 +$OUT .="zend.exception_ignore_args = On\n";
79 }
80 }
81 diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/rsyslog.conf/32php smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/32php
82 --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/rsyslog.conf/32php 2021-02-21 00:25:54.793000000 -0500
83 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/32php 2021-02-21 00:36:56.688000000 -0500
84 @@ -18,4 +18,6 @@
85 :programname, startswith, "php73-fpm" stop
86 :programname, startswith, "php74-fpm" /var/log/php/php74/php74-fpm.log
87 :programname, startswith, "php74-fpm" stop
88 +:programname, startswith, "php80-fpm" /var/log/php/php80/php80-fpm.log
89 +:programname, startswith, "php80-fpm" stop
90
91 diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php80/php.ini smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php80/php.ini
92 --- smeserver-php-3.0.0.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php80/php.ini 1969-12-31 19:00:00.000000000 -0500
93 +++ smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php80/php.ini 2021-02-21 00:37:57.655000000 -0500
94 @@ -0,0 +1 @@
95 +MORE_DATA={ PHP_VERSION => 80, INCLUDE_PATH => ".:/opt/remi/php80/root/usr/share/pear:/opt/remi/php80/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php80/root/usr/lib64/php/modules" }
96 diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php80/AllowUrlFopen smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php80/AllowUrlFopen
97 --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php80/AllowUrlFopen 1969-12-31 19:00:00.000000000 -0500
98 +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php80/AllowUrlFopen 2021-02-22 22:27:30.479000000 -0500
99 @@ -0,0 +1 @@
100 +Off
101 diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php80/type smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php80/type
102 --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php80/type 1969-12-31 19:00:00.000000000 -0500
103 +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php80/type 2021-02-22 22:27:30.479000000 -0500
104 @@ -0,0 +1 @@
105 +configuration
106 diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php80-php-fpm/status smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php80-php-fpm/status
107 --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php80-php-fpm/status 1969-12-31 19:00:00.000000000 -0500
108 +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php80-php-fpm/status 2021-02-22 22:27:30.480000000 -0500
109 @@ -0,0 +1 @@
110 +enabled
111 diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php80-php-fpm/type smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php80-php-fpm/type
112 --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php80-php-fpm/type 1969-12-31 19:00:00.000000000 -0500
113 +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php80-php-fpm/type 2021-02-22 22:27:30.480000000 -0500
114 @@ -0,0 +1 @@
115 +service

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