/[smeserver]/rpms/smeserver-php/sme10/smeserver-php-3.0.0-bz12405-addphp83.patch
ViewVC logotype

Annotation of /rpms/smeserver-php/sme10/smeserver-php-3.0.0-bz12405-addphp83.patch

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


Revision 1.1 - (hide annotations) (download)
Mon Sep 4 11:05:05 2023 UTC (13 months, 4 weeks ago) by jcrisp
Branch: MAIN
CVS Tags: smeserver-php-3_0_0-48_el7_sme, smeserver-php-3_0_0-47_el7_sme, HEAD
* Mon Sep 04 2023 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0-47.sme
- Add php83 support [SME:12405]

1 jcrisp 1.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-09-04 11:47:23.538828136 +0100
3     +++ smeserver-php-3.0.0/createlinks 2023-09-04 11:27:15.375207845 +0100
4     @@ -15,6 +15,7 @@
5     /etc/opt/remi/php80/php.ini
6     /etc/opt/remi/php81/php.ini
7     /etc/opt/remi/php82/php.ini
8     +/etc/opt/remi/php83/php.ini
9     )){
10     templates2events($file, qw(
11     console-save
12     @@ -44,7 +45,7 @@
13     templates2events($file, $event);
14     }
15    
16     -foreach $ver (qw( 55 56 70 71 72 73 74 80 81 82)){
17     +foreach $ver (qw( 55 56 70 71 72 73 74 80 81 82 83)){
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     @@ -77,6 +78,7 @@
22     /etc/logrotate.d/php80-php-fpm
23     /etc/logrotate.d/php81-php-fpm
24     /etc/logrotate.d/php82-php-fpm
25     + /etc/logrotate.d/php83-php-fpm
26     )){
27     templates2events($file, qw(webapps-update bootstrap-console-save smeserver-php-update));
28     }
29     @@ -97,7 +99,7 @@
30     }
31    
32     #php7*
33     -foreach $ver (qw( 70 71 72 73 74 80 81 82)){
34     +foreach $ver (qw( 70 71 72 73 74 80 81 82 83)){
35     foreach $file ( "/etc/opt/remi/php$ver/php-fpm.conf",
36     "/etc/opt/remi/php$ver/php-fpm.d/www.conf",
37     "/etc/opt/remi/php$ver/php-fpm.d/ibays.conf",
38     diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php83/AllowUrlFopen smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php83/AllowUrlFopen
39     --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php83/AllowUrlFopen 1970-01-01 01:00:00.000000000 +0100
40     +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php83/AllowUrlFopen 2023-09-04 11:26:06.456606598 +0100
41     @@ -0,0 +1 @@
42     +Off
43     diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php83/type smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php83/type
44     --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php83/type 1970-01-01 01:00:00.000000000 +0100
45     +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php83/type 2023-09-04 11:26:06.456606598 +0100
46     @@ -0,0 +1 @@
47     +configuration
48     diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php83-php-fpm/status smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php83-php-fpm/status
49     --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php83-php-fpm/status 1970-01-01 01:00:00.000000000 +0100
50     +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php83-php-fpm/status 2023-09-04 11:26:06.457606606 +0100
51     @@ -0,0 +1 @@
52     +enabled
53     diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php83-php-fpm/type smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php83-php-fpm/type
54     --- smeserver-php-3.0.0.old/root/etc/e-smith/db/configuration/defaults/php83-php-fpm/type 1970-01-01 01:00:00.000000000 +0100
55     +++ smeserver-php-3.0.0/root/etc/e-smith/db/configuration/defaults/php83-php-fpm/type 2023-09-04 11:26:06.457606606 +0100
56     @@ -0,0 +1 @@
57     +service
58     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
59     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults 2023-09-04 11:47:23.540828154 +0100
60     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults 2023-09-04 11:29:49.022548267 +0100
61     @@ -1,5 +1,5 @@
62    
63     -for VER in php php55 php56 php70 php71 php72 php73 php74 php80 php81 php82; do
64     +for VER in php php55 php56 php70 php71 php72 php73 php74 php80 php81 php82 php83; do
65     /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/tmp
66     /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/opcache
67     /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/wsdlcache
68     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
69     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm 2023-09-04 11:47:23.541828163 +0100
70     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm 2023-09-04 11:31:00.727173818 +0100
71     @@ -21,6 +21,7 @@
72     /sbin/e-smith/service php80-php-fpm reload >/dev/null 2>&1 || true
73     /sbin/e-smith/service php81-php-fpm reload >/dev/null 2>&1 || true
74     /sbin/e-smith/service php82-php-fpm reload >/dev/null 2>&1 || true
75     + /sbin/e-smith/service php83-php-fpm reload >/dev/null 2>&1 || true
76     endscript
77     }
78    
79     @@ -43,6 +44,7 @@
80     /sbin/e-smith/service php80-php-fpm reload >/dev/null 2>&1 || true
81     /sbin/e-smith/service php81-php-fpm reload >/dev/null 2>&1 || true
82     /sbin/e-smith/service php82-php-fpm reload >/dev/null 2>&1 || true
83     + /sbin/e-smith/service php83-php-fpm reload >/dev/null 2>&1 || true
84     endscript
85     }
86     ";
87     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
88     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/rsyslog.conf/32php 2023-09-04 11:47:23.541828163 +0100
89     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/32php 2023-09-04 11:31:58.663679257 +0100
90     @@ -24,3 +24,5 @@
91     & stop
92     :programname, startswith, "php82-fpm" /var/log/php/php82/php82-fpm.log
93     & stop
94     +:programname, startswith, "php83-fpm" /var/log/php/php82/php83-fpm.log
95     +& stop
96     \ No newline at end of file
97     diff -ruN smeserver-php-3.0.0.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php83/php.ini smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php83/php.ini
98     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php83/php.ini 1970-01-01 01:00:00.000000000 +0100
99     +++ smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php83/php.ini 2023-09-04 11:33:38.542555492 +0100
100     @@ -0,0 +1 @@
101     +MORE_DATA={ PHP_VERSION => 83, INCLUDE_PATH => ".:/opt/remi/php83/root/usr/share/pear:/opt/remi/php83/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php83/root/usr/lib64/php/modules" }
102     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
103     --- smeserver-php-3.0.0.old/root/usr/share/perl5/vendor_perl/esmith/php.pm 2023-09-04 11:47:23.541828163 +0100
104     +++ smeserver-php-3.0.0/root/usr/share/perl5/vendor_perl/esmith/php.pm 2023-09-04 11:46:30.320357165 +0100
105     @@ -62,6 +62,7 @@
106     'php80-php-fpm'
107     'php81-php-fpm'
108     'php82-php-fpm'
109     +'php83-php-fpm'
110    
111     this will return only available and enabled
112     print "'$_'\n" for listPHPVersionFPM('enabled');
113     @@ -99,6 +100,7 @@
114     '80'
115     '81'
116     '82'
117     +'83'
118    
119     this will returnonly available and enabled
120     print "'$_'\n" for listPHPVersionShort('enabled');
121     @@ -130,6 +132,7 @@
122     80 => php80-php-fpm
123     81 => php81-php-fpm
124     82 => php82-php-fpm
125     +83 => php83-php-fpm
126    
127     =cut
128     sub listPHPVersionHash {
129     @@ -163,6 +166,7 @@
130     80 => php80
131     81 => php81
132     82 => php82
133     +83 => php83
134    
135     =cut
136     sub listPHPVersionHashShort {

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