From a2cdb1b06ead3dd0e5e4aa6d89d2d2a43aa53ea6 Mon Sep 17 00:00:00 2001
From: Remi Collet <rcollet@redhat.com>
Date: Tue, 26 May 2026 13:01:11 +0200
Subject: [PATCH] rebase to 8.3.31

Resolves: RHEL-177995

add tmpfiles.d configuration file for ImageMode

Resolves: RHEL-119865
---
 .gitignore   |  2 ++
 php.spec     | 12 +++++++++++-
 php.tmpfiles |  5 +++++
 sources      |  4 ++--
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 php.tmpfiles

diff --git a/.gitignore b/.gitignore
index 8b5cc4f..1b249ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ TODO
 /php-8.3.26.tar.xz.asc
 /php-8.3.29.tar.xz
 /php-8.3.29.tar.xz.asc
+/php-8.3.31.tar.xz
+/php-8.3.31.tar.xz.asc
diff --git a/php.spec b/php.spec
index 117c92e..338204d 100644
--- a/php.spec
+++ b/php.spec
@@ -63,7 +63,7 @@
 %bcond_with      imap
 %bcond_without   lmdb
 
-%global upver        8.3.29
+%global upver        8.3.31
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -91,6 +91,7 @@ Source9: php.modconf
 Source12: php-fpm.wants
 Source13: nginx-fpm.conf
 Source14: nginx-php.conf
+Source15: php.tmpfiles
 # See https://secure.php.net/gpg-keys.php
 Source20: https://www.php.net/distributions/php-keyring.gpg
 Source21: https://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz.asc
@@ -1200,6 +1201,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 # For third-party packaging:
 install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php/preload
 
+# Install tmpfiles.d file
+install -p -D -m 0644 %{SOURCE15} %{buildroot}%{_tmpfilesdir}/php.conf
+
 %if %{with modphp}
 # install the DSO
 install -m 755 -d $RPM_BUILD_ROOT%{_httpd_moddir}
@@ -1414,6 +1418,7 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 %attr(0770,root,apache) %dir %{_sharedstatedir}/php/wsdlcache
 %attr(0770,root,apache) %dir %{_sharedstatedir}/php/opcache
 %config(noreplace) %{_httpd_confdir}/php.conf
+%{_tmpfilesdir}/php.conf
 %endif
 
 %files common -f files.common
@@ -1488,6 +1493,7 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 %{_mandir}/man8/php-fpm.8*
 %dir %{_datadir}/fpm
 %{_datadir}/fpm/status.html
+%{_tmpfilesdir}/php.conf
 
 %files devel
 %{_bindir}/php-config
@@ -1554,6 +1560,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
+* Tue May 26 2026 Remi Collet <rcollet@redhat.com> - 8.3.31-1
+- rebase to 8.3.31
+- add tmpfiles.d configuration file for ImageMode
+
 * Thu Jan  8 2026 Remi Collet <rcollet@redhat.com> - 8.3.29-1
 - rebase to 8.3.29
 
diff --git a/php.tmpfiles b/php.tmpfiles
new file mode 100644
index 0000000..c586895
--- /dev/null
+++ b/php.tmpfiles
@@ -0,0 +1,5 @@
+d /var/lib/php           0755 root   root   -
+d /var/lib/php/opcache   0770 root   apache -
+d /var/lib/php/session   0770 root   apache -
+d /var/lib/php/wsdlcache 0770 root   apache -
+d /var/log/php-fpm       0770 apache root   -
diff --git a/sources b/sources
index ee0a358..484079a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (php-8.3.29.tar.xz) = d5739ff7f13638c60cd7e62bad9aec831282eca7c9e9487c12ca72f4ed4494e46eb45555a19fc5eccb43d36253d2bada12611c691e0edc6dbb8cc9908d449733
-SHA512 (php-8.3.29.tar.xz.asc) = 2358b7766d8acd0a6adb339db71de51934935fd67d5a87410e7f56c617ed7d68840d4dd16225b79928e1c10d38c8acef4d9cc57fe4df712582310510e5079bd9
+SHA512 (php-8.3.31.tar.xz) = 2341ce4061f5e654780c97145ea7bf92fa14f2d5c2ea83d38b8919ee5018c040a08c83c9b7cee97e4bba39267d412f5bf18c515f2001db1659a49449299cbeef
+SHA512 (php-8.3.31.tar.xz.asc) = d3daeb906a32fe165387705b1b0199c528772152606d1622a6c73db024e0bc7efbe13908fbe13b245db3d837a9d70fa5224032cc827b424afbbb69671f4b5c79