/[smeserver]/rpms/smeserver-php/sme10/smeserver-php-3.0.0-bz12403-addphp82.patch
ViewVC logotype

Contents of /rpms/smeserver-php/sme10/smeserver-php-3.0.0-bz12403-addphp82.patch

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


Revision 1.1 - (show annotations) (download)
Sat Aug 26 12:05:29 2023 UTC (14 months, 1 week ago) by jcrisp
Branch: MAIN
CVS Tags: smeserver-php-3_0_0-48_el7_sme, smeserver-php-3_0_0-46_el7_sme, smeserver-php-3_0_0-47_el7_sme, HEAD
Error occurred while calculating annotation data.
* Sat Aug 26 2023 John Crisp <jcrisp@safeandsoundit.co.uk>  3.0.0-46.sme
- fix missing php 81 settings
- Add php82 support [SME:12403]

1 diff -ruN smeserver-php-3.0.0.old/createlinks smeserver-php-3.0.0/createlinks
2 --- smeserver-php-3.0.0.old/createlinks 2023-02-13 14:14:05.984378854 +0000
3 +++ smeserver-php-3.0.0/createlinks 2023-02-13 14:18:51.721088697 +0000
4 @@ -14,6 +14,7 @@
5 /etc/opt/remi/php74/php.ini
6 /etc/opt/remi/php80/php.ini
7 /etc/opt/remi/php81/php.ini
8 +/etc/opt/remi/php82/php.ini
9 )){
10 templates2events($file, qw(
11 console-save
12 @@ -43,7 +44,7 @@
13 templates2events($file, $event);
14 }
15
16 -foreach $ver (qw( 55 56 70 71 72 73 74 80 81)){
17 +foreach $ver (qw( 55 56 70 71 72 73 74 80 81 82)){
18 foreach $service ( "php$ver-php-fpm" ){
19 foreach $event (qw(webapps-update ibay-create ibay-delete ibay-modify ibay-modify-files ibay-modify-servers )){
20 safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/$service");
21 @@ -65,17 +66,18 @@
22
23 foreach $file (qw( /etc/sysconfig/php-fpm
24 /etc/logrotate.d/php-fpm
25 - /etc/logrotate.d/php55-php-fpm
26 - /etc/logrotate.d/php56-php-fpm
27 - /etc/logrotate.d/php70-php-fpm
28 + /etc/logrotate.d/php55-php-fpm
29 + /etc/logrotate.d/php56-php-fpm
30 + /etc/logrotate.d/php70-php-fpm
31 /etc/logrotate.d/php70-php-fpm
32 /etc/logrotate.d/php71-php-fpm
33 /etc/logrotate.d/php72-php-fpm
34 /etc/logrotate.d/php73-php-fpm
35 /etc/logrotate.d/php74-php-fpm
36 - /etc/logrotate.d/php80-php-fpm
37 + /etc/logrotate.d/php80-php-fpm
38 /etc/logrotate.d/php81-php-fpm
39 - )){
40 + /etc/logrotate.d/php82-php-fpm
41 + )){
42 templates2events($file, qw(webapps-update bootstrap-console-save smeserver-php-update));
43 }
44
45 @@ -95,7 +97,7 @@
46 }
47
48 #php7*
49 -foreach $ver (qw( 70 71 72 73 74 80 81)){
50 +foreach $ver (qw( 70 71 72 73 74 80 81 82)){
51 foreach $file ( "/etc/opt/remi/php$ver/php-fpm.conf",
52 "/etc/opt/remi/php$ver/php-fpm.d/www.conf",
53 "/etc/opt/remi/php$ver/php-fpm.d/ibays.conf",
54 diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php81/AllowUrlFopen smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php81/AllowUrlFopen
55 --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php81/AllowUrlFopen 1970-01-01 01:00:00.000000000 +0100
56 +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php81/AllowUrlFopen 2023-02-13 14:06:40.453033093 +0000
57 @@ -0,0 +1 @@
58 +Off
59 diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php81/type smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php81/type
60 --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php81/type 1970-01-01 01:00:00.000000000 +0100
61 +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php81/type 2023-02-13 14:06:40.453033093 +0000
62 @@ -0,0 +1 @@
63 +configuration
64 diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php81-php-fpm/status smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php81-php-fpm/status
65 --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php81-php-fpm/status 1970-01-01 01:00:00.000000000 +0100
66 +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php81-php-fpm/status 2023-02-13 14:06:40.453033093 +0000
67 @@ -0,0 +1 @@
68 +enabled
69 diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php81-php-fpm/type smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php81-php-fpm/type
70 --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php81-php-fpm/type 1970-01-01 01:00:00.000000000 +0100
71 +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php81-php-fpm/type 2023-02-13 14:06:40.454033110 +0000
72 @@ -0,0 +1 @@
73 +service
74 diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php82/AllowUrlFopen smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php82/AllowUrlFopen
75 --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php82/AllowUrlFopen 1970-01-01 01:00:00.000000000 +0100
76 +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php82/AllowUrlFopen 2023-02-13 14:06:40.453033093 +0000
77 @@ -0,0 +1 @@
78 +Off
79 diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php82/type smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php82/type
80 --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php82/type 1970-01-01 01:00:00.000000000 +0100
81 +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php82/type 2023-02-13 14:06:40.453033093 +0000
82 @@ -0,0 +1 @@
83 +configuration
84 diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php82-php-fpm/status smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php82-php-fpm/status
85 --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php82-php-fpm/status 1970-01-01 01:00:00.000000000 +0100
86 +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php82-php-fpm/status 2023-02-13 14:06:40.453033093 +0000
87 @@ -0,0 +1 @@
88 +enabled
89 diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php82-php-fpm/type smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php82-php-fpm/type
90 --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php82-php-fpm/type 1970-01-01 01:00:00.000000000 +0100
91 +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php82-php-fpm/type 2023-02-13 14:06:40.454033110 +0000
92 @@ -0,0 +1 @@
93 +service
94 diff -ruN 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
95 --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults 2023-02-13 14:14:05.972378656 +0000
96 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults 2023-02-13 14:21:17.001483378 +0000
97 @@ -1,5 +1,5 @@
98
99 -for VER in php php55 php56 php70 php71 php72 php73 php74 php80 php81; do
100 +for VER in php php55 php56 php70 php71 php72 php73 php74 php80 php81 php82; do
101 /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/tmp
102 /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/opcache
103 /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/wsdlcache
104 diff -ruN 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
105 --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm 2023-02-13 14:14:05.971378640 +0000
106 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm 2023-02-13 14:22:04.417264938 +0000
107 @@ -20,6 +20,7 @@
108 /sbin/e-smith/service php74-php-fpm reload >/dev/null 2>&1 || true
109 /sbin/e-smith/service php80-php-fpm reload >/dev/null 2>&1 || true
110 /sbin/e-smith/service php81-php-fpm reload >/dev/null 2>&1 || true
111 + /sbin/e-smith/service php82-php-fpm reload >/dev/null 2>&1 || true
112 endscript
113 }
114
115 @@ -41,6 +42,7 @@
116 /sbin/e-smith/service php74-php-fpm reload >/dev/null 2>&1 || true
117 /sbin/e-smith/service php80-php-fpm reload >/dev/null 2>&1 || true
118 /sbin/e-smith/service php81-php-fpm reload >/dev/null 2>&1 || true
119 + /sbin/e-smith/service php82-php-fpm reload >/dev/null 2>&1 || true
120 endscript
121 }
122 ";
123 diff -ruN 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
124 --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/rsyslog.conf/32php 2023-02-13 14:14:05.975378705 +0000
125 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/32php 2023-02-13 14:22:33.032736612 +0000
126 @@ -22,3 +22,5 @@
127 & stop
128 :programname, startswith, "php81-fpm" /var/log/php/php81/php81-fpm.log
129 & stop
130 +:programname, startswith, "php82-fpm" /var/log/php/php82/php82-fpm.log
131 +& stop
132 diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php82/php.ini smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php82/php.ini
133 --- smeserver-php-3.0.0.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php82/php.ini 1970-01-01 01:00:00.000000000 +0100
134 +++ smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php82/php.ini 2023-02-13 14:23:29.833672870 +0000
135 @@ -0,0 +1 @@
136 +MORE_DATA={ PHP_VERSION => 82, INCLUDE_PATH => ".:/opt/remi/php82/root/usr/share/pear:/opt/remi/php82/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php82/root/usr/lib64/php/modules" }
137 diff -ruN smeserver-php-3.0.0.old/root/usr/share/perl5/vendor_perl/esmith/php.pm smeserver-php-3.0.0/root/usr/share/perl5/vendor_perl/esmith/php.pm
138 --- smeserver-php-3.0.0.old/root/usr/share/perl5/vendor_perl/esmith/php.pm 2023-02-13 14:14:05.984378854 +0000
139 +++ smeserver-php-3.0.0/root/usr/share/perl5/vendor_perl/esmith/php.pm 2023-02-13 14:27:16.160403450 +0000
140 @@ -61,6 +61,7 @@
141 'php74-php-fpm'
142 'php80-php-fpm'
143 'php81-php-fpm'
144 +'php82-php-fpm'
145
146 this will return only available and enabled
147 print "'$_'\n" for listPHPVersionFPM('enabled');
148 @@ -97,6 +98,7 @@
149 '74'
150 '80'
151 '81'
152 +'82'
153
154 this will returnonly available and enabled
155 print "'$_'\n" for listPHPVersionShort('enabled');
156 @@ -127,6 +129,7 @@
157 74 => php74-php-fpm
158 80 => php80-php-fpm
159 81 => php81-php-fpm
160 +82 => php82-php-fpm
161
162 =cut
163 sub listPHPVersionHash {
164 @@ -159,6 +162,7 @@
165 74 => php74
166 80 => php80
167 81 => php81
168 +82 => php82
169
170 =cut
171 sub listPHPVersionHashShort {

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