diff --git a/php-8.1.0-parser.patch b/php-8.2.0-parser.patch
similarity index 86%
rename from php-8.1.0-parser.patch
rename to php-8.2.0-parser.patch
index 8a28e4d420b50298f176f918e6dcde1c32eda308..dcfe617d4e80e35424a6746d1ba9759de207aded 100644
--- a/php-8.1.0-parser.patch
+++ b/php-8.2.0-parser.patch
@@ -1,7 +1,7 @@
diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
--- ./build/gen_stub.php.syslib 2020-06-25 08:11:51.782046813 +0200
+++ ./build/gen_stub.php 2020-06-25 08:13:11.188860368 +0200
-@@ -1075,6 +1075,12 @@ function initPhpParser() {
+@@ -3265,6 +3265,12 @@ function initPhpParser() {
}
$isInitialized = true;
@@ -11,6 +11,6 @@ diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
+ return;
+ }
+
- $version = "4.13.0";
+ $version = "4.15.1";
$phpParserDir = __DIR__ . "/PHP-Parser-$version";
if (!is_dir($phpParserDir)) {
diff --git a/php-8.1.14.tar.xz b/php-8.2.1.tar.xz
similarity index 58%
rename from php-8.1.14.tar.xz
rename to php-8.2.1.tar.xz
index 1c051e2f6281baba4bc0d08fb46ac1f9da4ff7bb..e5407dc42303db594bb594f6df11c7b8c979b3c5 100644
Binary files a/php-8.1.14.tar.xz and b/php-8.2.1.tar.xz differ
diff --git a/php-8.2.1.tar.xz.asc b/php-8.2.1.tar.xz.asc
new file mode 100644
index 0000000000000000000000000000000000000000..eda647afbbfd1fd01a4712162c19d50f9d709c30
--- /dev/null
+++ b/php-8.2.1.tar.xz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCgAvFiEEEZjAEXWTSXpexcGZKGrx+Yl0adwFAmO0fXgRHHBpZXJyaWNr
+QHBocC5uZXQACgkQKGrx+Yl0ady+SBAAppV+tD0iYBCxR+7meZiQj+VLhb824vOq
+GbwlUi8nE1i1dzxNLQFcCyXJK4R2hm1/Xw24hhXdAsUixEcwMaY6UvFlm2iLMedD
+vZhZ/u3X4AV4s9DWdOKOk9AtXBJMXd5oVEkMgOkFJae27eEnYMDSQ+OMTPn7qpk9
+o4ch/8fxW6A7RiQuhN5VglFZLLtESnzdNyL/M9W3/NwLlaZxb1mHBJ+cIOrQU0du
+CjArRyurMYPNocEX7na+6PqLeMnew45cmESAj+atRfJgiuJ7y/vGb56xfcS7XVP1
+z0JPJ/UsCmr4ex+EKbs1iLrgxBYkNQhf3FwbI0/UaYK+2WcznZM5eqcWlVYPnq52
+iBvm96/d8sapTk6Ydcb0CdXr3Wwz/txQjERIHB+TJRNSmB9qUpK7VVYeXKJ/jazB
+scMTOjBxEexJgY3MujPXZxaIolmd9lm71m9xbh2xvPP5aPjQUudHfoHIpdmPe5Jk
+ACLV/+UD2mFMdVfa+w5cLkVMaaZk8h7rvvrESUq0rbuESuABhWMGU/+37NOM/JpD
+fY4+qcltbqHgcE2dNGqwdIcHeaVej6hxmkdt7bUJ7FGULRwmn0cy5/hebDvqGjG8
+HSjLFe4WLqvfjHUe4wgMjZgSiA6TMuJ8BD7MnCDmbeMNSROOCOeyxe6trOCADVTD
+l+HxVWxKc+E=
+=qIiW
+-----END PGP SIGNATURE-----
diff --git a/php.conf b/php.conf
index 0639c0a6070d9efdae1db257fd4c4c51fa141231..639652b42fb579e5845fa95d9cc505bbcb9156e2 100644
--- a/php.conf
+++ b/php.conf
@@ -2,14 +2,7 @@
# The following lines prevent .user.ini files from being viewed by Web clients.
#
-
- Require all denied
-
-
- Order allow,deny
- Deny from all
- Satisfy All
-
+ Require all denied
#
@@ -23,7 +16,24 @@ AddType text/html .php
#
DirectoryIndex index.php
+#
+# Redirect to local php-fpm (no mod_php in default configuration)
+#
+
+ # Enable http authorization headers
+ SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
+
+
+ SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost"
+
+
+
+#
+# mod_php is deprecated as FPM is now used by default with httpd in event mode
+# mod_php is only used when explicitly enabled or httpd switch to prefork mode
+#
# mod_php options
+#
#
# Cause the PHP interpreter to handle files with a .php extension.
diff --git a/php.spec b/php.spec
index 175ad82c7a1d055672cc8ca977994aa31e477a7b..80ce51958b70f8b67a3d3582e07200ff06741788 100644
--- a/php.spec
+++ b/php.spec
@@ -1,8 +1,8 @@
%define anolis_release 1
# API/ABI check
-%global apiver 20210902
-%global zendver 20210902
+%global apiver 20220829
+%global zendver 20220829
%global pdover 20170320
# we don't want -z defs linker flag
@@ -12,7 +12,7 @@
%global _hardened_build 1
# version used for php embedded library soname
-%global embed_version 8.1
+%global embed_version 8.2
%global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
@@ -42,7 +42,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 8.1.14
+Version: 8.2.1
Release: %{anolis_release}%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -82,7 +82,7 @@ Patch8: php-8.1.0-libdb.patch
# Functional changes
# Use system nikic/php-parser
-Patch41: php-8.1.0-parser.patch
+Patch41: php-8.2.0-parser.patch
# use system tzdata
Patch42: php-8.1.0-systzdata-v22.patch
# Add check for php headers in phpize
@@ -93,6 +93,8 @@ Patch45: php-7.4.0-ldap_r.patch
# and only use gcc (instead of full version)
Patch47: php-8.1.0-phpinfo.patch
+# Upstream fixes (100+)
+
# Factory is droped from system tzdata
Patch300: php-7.4.0-datetests.patch
@@ -665,8 +667,6 @@ in pure PHP.
%prep
-%{?gpgverify:%{gpgverify} --keyring='%{SOURCE20}' --signature='%{SOURCE21}' --data='%{SOURCE0}'}
-
%setup -q -n php-%{version}
%patch1 -p1 -b .mpmcheck
@@ -680,6 +680,7 @@ in pure PHP.
%patch45 -p1 -b .ldap_r
%patch47 -p1 -b .phpinfo
+# upstream patches
# Fixes for tests
%patch300 -p1 -b .datetests
@@ -761,10 +762,6 @@ rm -f TSRM/tsrm_win32.h \
# Fix some bogus permissions
find . -name \*.[ch] -exec chmod 644 {} \;
-chmod 644 README.*
-
-# Some extensions have their own configuration file
-cp %{SOURCE50} %{SOURCE51} %{SOURCE53} .
%build
@@ -1492,6 +1489,12 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%changelog
+* Wed Jan 4 2023 Funda Wang - 8.2.1-1
+- Update to 8.2.1
+
+* Thu Dec 8 2022 Funda Wang - 8.2.0-1
+- Update to 8.2.0
+
* Fri Jan 6 2023 Funda Wang - 8.1.14-1
- New version 8.1.14