rpms/php
7
0
Fork 0
Code Issues Pull Requests Releases Activity

rebase to 8.1.7

Browse Source 
Related: #2070040
This commit is contained in:
Remi Collet 2022-06-09 10:39:18 +02:00
parent 259728f92a
commit 34c1d585d6
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,4 @@
/php-8.1.6.tar.xz /php-8.1.6.tar.xz
/php-8.1.6.tar.xz.asc /php-8.1.6.tar.xz.asc
/php-8.1.7.tar.xz
/php-8.1.7.tar.xz.asc

6
php.conf
View File

@ -19,15 +19,13 @@ DirectoryIndex index.php
# #
# Redirect to local php-fpm (no mod_php in default configuration) # Redirect to local php-fpm (no mod_php in default configuration)
# #
<IfModule !mod_php5.c> <IfModule !mod_php.c>
<IfModule !mod_php7.c>
# Enable http authorization headers # Enable http authorization headers
SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
<FilesMatch \.(php|phar)$> <FilesMatch \.(php|phar)$>
SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost" SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost"
</FilesMatch> </FilesMatch>
</IfModule>
</IfModule> </IfModule>
# #
@ -36,7 +34,7 @@ DirectoryIndex index.php
# #
# mod_php options # mod_php options
# #
<IfModule mod_php7.c> <IfModule mod_php.c>
# #
# Cause the PHP interpreter to handle files with a .php extension. # Cause the PHP interpreter to handle files with a .php extension.
# #

9
php.modconf
View File

@ -3,10 +3,11 @@
# easy for developers to write dynamically generated webpages. # easy for developers to write dynamically generated webpages.
# #
# Cannot load both php5 and php7 modules # Cannot load both php5, php7 and php modules
<IfModule !mod_php5.c> <IfModule !mod_php5.c>
<IfModule prefork.c> <IfModule !mod_php7.c>
LoadModule php7_module modules/libphp7.so <IfModule prefork.c>
LoadModule php_module modules/libphp.so
</IfModule>
</IfModule> </IfModule>
</IfModule> </IfModule>

9
php.spec
View File

@ -64,13 +64,13 @@
%bcond_with imap %bcond_with imap
%bcond_without lmdb %bcond_without lmdb
%global upver 8.1.6 %global upver 8.1.7
#global rcver RC1 #global rcver RC1
Summary: PHP scripting language for creating dynamic web sites Summary: PHP scripting language for creating dynamic web sites
Name: php Name: php
Version: %{upver}%{?rcver:~%{rcver}} Version: %{upver}%{?rcver:~%{rcver}}
Release: 2%{?dist} Release: 1%{?dist}
# All files licensed under PHP version 3.01, except # All files licensed under PHP version 3.01, except
# Zend is licensed under Zend # Zend is licensed under Zend
# TSRM is licensed under BSD # TSRM is licensed under BSD
@ -1026,7 +1026,7 @@ build --enable-fpm \
popd popd
# Build for inclusion as embedded script language into applications, # Build for inclusion as embedded script language into applications,
# /usr/lib[64]/libphp7.so # /usr/lib[64]/libphp.so
pushd build-embedded pushd build-embedded
build --enable-embed \ build --enable-embed \
--without-mysqli --disable-pdo \ --without-mysqli --disable-pdo \
@ -1544,6 +1544,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%changelog %changelog
* Thu Jun 9 2022 Remi Collet <rcollet@redhat.com> - 8.1.7-1
- update to 8.1.7 #2070040
* Fri Jun 3 2022 Remi Collet <rcollet@redhat.com> - 8.1.6-2 * Fri Jun 3 2022 Remi Collet <rcollet@redhat.com> - 8.1.6-2
- add upstream patch to initialize pcre before mbstring - add upstream patch to initialize pcre before mbstring
- add upstream patch to use more sha256 in openssl tests - add upstream patch to use more sha256 in openssl tests

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (php-8.1.6.tar.xz) = df5ab8e90aced1cc904c6abd25f42b0c59a327fe4f7b518591c23820e711952f3b1e70b31a1c2e90282621891400b492fb099cbadafcd0ef7991ccc2962156de SHA512 (php-8.1.7.tar.xz) = 1d72db220f3485310e02b67c41dd6434c26b7118f673ba7f425ff6b79cc96c86fc45bfe9c90b302d719eb9b7a5334f363a92ac309c367aacc93ab31a72a63c45
SHA512 (php-8.1.6.tar.xz.asc) = ead312fec9b1adfab76540cc9f4ede83fe2e4ea3c06a358b2be0ee92720fa2e011de558c78574ef7c1bbcd25a70ab5a8af4288a5637ebba2b2fd1d09fff3aa24 SHA512 (php-8.1.7.tar.xz.asc) = 9c34d74718261ed2a3375bb06a1e4d68b71d091c12558868bd0ab0325a5046e88af0b8a09fc4035169d681f98b14e108c04ea24053d7d80ca4a0cee5510054fa