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.2.tar.xz
similarity index 58%
rename from php-8.1.14.tar.xz
rename to php-8.2.2.tar.xz
index 1c051e2f6281baba4bc0d08fb46ac1f9da4ff7bb..03d99171dd2252275b417005b7b135881826b3b0 100644
Binary files a/php-8.1.14.tar.xz and b/php-8.2.2.tar.xz differ
diff --git a/php-fpm.conf b/php-fpm.conf
index 53a07b6e861635e74a3c63c2413dc62f16a65370..750f987f4f19f3e51468cfc7b78a44fed53cc0fa 100644
--- a/php-fpm.conf
+++ b/php-fpm.conf
@@ -5,11 +5,6 @@
; All relative paths in this configuration file are relative to PHP's install
; prefix.
-; Include one or more files. If glob(3) exists, it is used to include a bunch of
-; files from a glob(3) pattern. This directive can be used everywhere in the
-; file.
-include=/etc/php-fpm.d/*.conf
-
;;;;;;;;;;;;;;;;;;
; Global Options ;
;;;;;;;;;;;;;;;;;;
@@ -133,5 +128,8 @@ daemonize = yes
; used in logs and stats. There is no limitation on the number of pools which
; FPM can handle. Your system will tell you anyway :)
-; See /etc/php-fpm.d/*.conf
+; Include one or more files. If glob(3) exists, it is used to include a bunch of
+; files from a glob(3) pattern. This directive can be used everywhere in the
+; file.
+include=/etc/php-fpm.d/*.conf
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..ddfed010eed0981218d1e9151b6cea47bc723de5 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.2
Release: %{anolis_release}%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -68,7 +68,6 @@ Source13: nginx-fpm.conf
Source14: nginx-php.conf
# See https://secure.php.net/gpg-keys.php
Source20: https://www.php.net/distributions/php-keyring.gpg
-Source21: https://www.php.net/distributions/php-%{version}.tar.xz.asc
# Configuration files for some extensions
Source50: 10-opcache.ini
Source51: opcache-default.blacklist
@@ -82,7 +81,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 +92,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 +666,6 @@ in pure PHP.
%prep
-%{?gpgverify:%{gpgverify} --keyring='%{SOURCE20}' --signature='%{SOURCE21}' --data='%{SOURCE0}'}
-
%setup -q -n php-%{version}
%patch1 -p1 -b .mpmcheck
@@ -680,6 +679,7 @@ in pure PHP.
%patch45 -p1 -b .ldap_r
%patch47 -p1 -b .phpinfo
+# upstream patches
# Fixes for tests
%patch300 -p1 -b .datetests
@@ -761,10 +761,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 +1488,15 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%changelog
+* Thu Dec 2 2023 Funda Wang - 8.2.2-1
+- New version 8.2.2
+
+* 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