/[smeserver]/rpms/smeserver-php/sme10/smeserver-php-3.0.0-bz11717-addphp81.patch
ViewVC logotype

Annotation of /rpms/smeserver-php/sme10/smeserver-php-3.0.0-bz11717-addphp81.patch

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


Revision 1.1 - (hide annotations) (download)
Sun Oct 24 05:58:24 2021 UTC (3 years ago) by jpp
Branch: MAIN
CVS Tags: 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-44_el7_sme, smeserver-php-3_0_0-47_el7_sme, smeserver-php-3_0_0-42_el7_sme, HEAD
* Sun Oct 24 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-41.sme
- add php81 support [SME: 11717]

1 jpp 1.1 diff -Nur --no-dereference smeserver-php-3.0.0.old/createlinks smeserver-php-3.0.0/createlinks
2     --- smeserver-php-3.0.0.old/createlinks 2021-10-24 01:31:44.487000000 -0400
3     +++ smeserver-php-3.0.0/createlinks 2021-10-24 01:43:06.666000000 -0400
4     @@ -13,6 +13,7 @@
5     /etc/opt/remi/php73/php.ini
6     /etc/opt/remi/php74/php.ini
7     /etc/opt/remi/php80/php.ini
8     +/etc/opt/remi/php81/php.ini
9     )){
10     templates2events($file, qw(
11     console-save
12     @@ -42,7 +43,7 @@
13     templates2events($file, $event);
14     }
15    
16     -foreach $ver (qw( 55 56 70 71 72 73 74 80)){
17     +foreach $ver (qw( 55 56 70 71 72 73 74 80 81)){
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     @@ -73,6 +74,7 @@
22     /etc/logrotate.d/php73-php-fpm
23     /etc/logrotate.d/php74-php-fpm
24     /etc/logrotate.d/php80-php-fpm
25     + /etc/logrotate.d/php81-php-fpm
26     )){
27     templates2events($file, qw(webapps-update bootstrap-console-save smeserver-php-update));
28     }
29     @@ -93,7 +95,7 @@
30     }
31    
32     #php7*
33     -foreach $ver (qw( 70 71 72 73 74 80)){
34     +foreach $ver (qw( 70 71 72 73 74 80 81)){
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 -Nur --no-dereference 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
39     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults 2021-10-24 01:31:44.395000000 -0400
40     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults 2021-10-24 01:43:27.351000000 -0400
41     @@ -1,5 +1,5 @@
42    
43     -for VER in php php55 php56 php70 php71 php72 php73 php74 php80; do
44     +for VER in php php55 php56 php70 php71 php72 php73 php74 php80 php81; do
45     /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/tmp
46     /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/opcache
47     /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/wsdlcache
48     diff -Nur --no-dereference 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
49     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm 2021-10-24 01:31:44.395000000 -0400
50     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm 2021-10-24 01:44:03.890000000 -0400
51     @@ -19,6 +19,7 @@
52     /sbin/e-smith/service php73-php-fpm reload >/dev/null 2>&1 || true
53     /sbin/e-smith/service php74-php-fpm reload >/dev/null 2>&1 || true
54     /sbin/e-smith/service php80-php-fpm reload >/dev/null 2>&1 || true
55     + /sbin/e-smith/service php81-php-fpm reload >/dev/null 2>&1 || true
56     endscript
57     }
58    
59     @@ -39,6 +40,7 @@
60     /sbin/e-smith/service php73-php-fpm reload >/dev/null 2>&1 || true
61     /sbin/e-smith/service php74-php-fpm reload >/dev/null 2>&1 || true
62     /sbin/e-smith/service php80-php-fpm reload >/dev/null 2>&1 || true
63     + /sbin/e-smith/service php81-php-fpm reload >/dev/null 2>&1 || true
64     endscript
65     }
66     ";
67     diff -Nur --no-dereference 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
68     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/rsyslog.conf/32php 2021-10-24 01:31:44.508000000 -0400
69     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/32php 2021-10-24 01:45:09.816000000 -0400
70     @@ -20,4 +20,5 @@
71     & stop
72     :programname, startswith, "php80-fpm" /var/log/php/php80/php80-fpm.log
73     & stop
74     -
75     +:programname, startswith, "php81-fpm" /var/log/php/php81/php81-fpm.log
76     +& stop
77     diff -Nur --no-dereference smeserver-php-3.0.0.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php.ini smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php.ini
78     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php.ini 1969-12-31 19:00:00.000000000 -0500
79     +++ smeserver-php-3.0.0/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php.ini 2021-10-24 01:46:44.547000000 -0400
80     @@ -0,0 +1 @@
81     +MORE_DATA={ PHP_VERSION => 81, INCLUDE_PATH => ".:/opt/remi/php81/root/usr/share/pear:/opt/remi/php81/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php81/root/usr/lib64/php/modules" }
82     diff -Nur --no-dereference 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
83     --- smeserver-php-3.0.0.old/root/usr/share/perl5/vendor_perl/esmith/php.pm 2021-10-24 01:31:44.504000000 -0400
84     +++ smeserver-php-3.0.0/root/usr/share/perl5/vendor_perl/esmith/php.pm 2021-10-24 01:48:13.671000000 -0400
85     @@ -60,6 +60,7 @@
86     'php73-php-fpm'
87     'php74-php-fpm'
88     'php80-php-fpm'
89     +'php81-php-fpm'
90    
91     this will return only available and enabled
92     print "'$_'\n" for listPHPVersionFPM('enabled');
93     @@ -95,6 +96,7 @@
94     '73'
95     '74'
96     '80'
97     +'81'
98    
99     this will returnonly available and enabled
100     print "'$_'\n" for listPHPVersionShort('enabled');
101     @@ -124,6 +126,8 @@
102     73 => php73-php-fpm
103     74 => php74-php-fpm
104     80 => php80-php-fpm
105     +81 => php81-php-fpm
106     +
107     =cut
108     sub listPHPVersionHash {
109     my $status = shift || 'all';
110     @@ -154,6 +158,8 @@
111     73 => php73
112     74 => php74
113     80 => php80
114     +81 => php81
115     +
116     =cut
117     sub listPHPVersionHashShort {
118     my $status = shift || 'all';

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