From 45f0dbcb5a0f6bd5585b769a895cb907a2421403 Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Sun, 31 May 2026 22:50:35 -0400
Subject: [PATCH] import UBI php-8.3.31-2.module+el9.8.0+24329+a775fb4e

---
 .gitignore                    |  2 +-
 .php.metadata                 |  2 +-
 SOURCES/php-8.3.29.tar.xz.asc | 16 ----------------
 SOURCES/php-8.3.31.tar.xz.asc | 16 ++++++++++++++++
 SPECS/php.spec                | 14 ++++++++++++--
 5 files changed, 30 insertions(+), 20 deletions(-)
 delete mode 100644 SOURCES/php-8.3.29.tar.xz.asc
 create mode 100644 SOURCES/php-8.3.31.tar.xz.asc

diff --git a/.gitignore b/.gitignore
index f08281c..4cf6fa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/php-8.3.29.tar.xz
+SOURCES/php-8.3.31.tar.xz
diff --git a/.php.metadata b/.php.metadata
index 29558ed..aa493c1 100644
--- a/.php.metadata
+++ b/.php.metadata
@@ -1 +1 @@
-fb7b0b6ee271b5f28624f37e6d6294276a05fac4 SOURCES/php-8.3.29.tar.xz
+53d4f0205ff3fac220ec87b2b788ab9786e9234c SOURCES/php-8.3.31.tar.xz
diff --git a/SOURCES/php-8.3.29.tar.xz.asc b/SOURCES/php-8.3.29.tar.xz.asc
deleted file mode 100644
index 15609f9..0000000
--- a/SOURCES/php-8.3.29.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEESx/A2d+SMhztn2FdvsVV4ioUNVMFAmlBblAACgkQvsVV4ioU
-NVMW3Q//a1ZoDlYlubE2NLopNIq0xwzxYw96oVYcrBkaPaB9IofLXB0zR04LepG/
-GOlQsm5iDKfx136NgQq348wH6YeBiJBuRySVj+tD0HZCqGJnT1jh7NwDyQexeTZr
-N+4Ka+LxQDcuWNkAEqpbdUIB4p4GB+dOW4TLyRA34W0AuBTlsN4BpRSEi8NdC7lH
-Gt/r943QOSvezYgAeUvNtxu6z+SGmXEviBf2uRWIaorn9n2vgEW84y55L2vSePWB
-RElbxFDnwWAU7HrB3NjULX9BQ6xj5y1rqD/i1JhJWwg+Myono1/V9spVWG7tzWZw
-1v0+BjHa6lNA/Uofl/ZakmQ10ZN0z/PCGDH4Qk6e+JrcbGLZN0H9xDAcfeWKUMpN
-zITE8oqiFSEu6XbY1PQNBWc8nHuP265WoPhawdxakWQ7B70gceMvu18OOHeIRKxx
-DVM/NekC7ZFLh1W8sBcVcnu2G+snrl0OzdZPmrvW+39iK3srkaWPnClBx38Pz4nq
-UVz/Ab7UeffiB0u/pp2kHNR1C9rtoA6D2ZEdoxoFcb6n3AE1zpEMhPaO/0MX1sOv
-Iqw6g1YdvXohTuxd/wyf5FYCD5hfGUM1HT8GmFTOw+H/mCzishdao9g8rMsklaA3
-LICHsEe+9gouGAQg4obUXSF/mqh8qI7qDFtI/Kzbd3sm/4LaCH4=
-=qBqT
------END PGP SIGNATURE-----
diff --git a/SOURCES/php-8.3.31.tar.xz.asc b/SOURCES/php-8.3.31.tar.xz.asc
new file mode 100644
index 0000000..ca1aa5a
--- /dev/null
+++ b/SOURCES/php-8.3.31.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEESx/A2d+SMhztn2FdvsVV4ioUNVMFAmn580IACgkQvsVV4ioU
+NVO71Q//WnYUbO2xrzjnjXZDVuCVFXcoIhk46xEFRRQ9tcDd75lR9LCjLHy8AzYZ
+kDJLKReZcAOE4iIsjomxjktwXONmBVHnL7z4VXe6Ricy8KjL4qzx3AHXaN9Dv+Au
+cJq2symnnCi7VeCiKktx6wkUli1hozRAVoiC/xPgu/GQl6uP3Z/DN6qZw12zctKK
+IMyLy9levgbV2C6L0MscRdjxegHFZDmdPFbDxUXEUCFQeLuAZK/BHgd6QsE+GILf
+1zKxfeFpEyZlufhiegDUuSMvfKLJMw3dn9OPcitV2ybgt8hd33zOjZUVVus9mB9H
+vdqPkkAD8/sQj4l/I8cCygnbLmlB2UOfXbkhJi1j6IxGl34G/FB9xeEnjIIwFztS
+8T9nvN/ewGdsDjMQ+RdGn3Oss+Kb3U9Om+3tdqD6smJ3fiwU7WpwIThwf7fvKfml
+/CkBb+jH52IFt2S6tjnvvHwKqZtcNtoyLniunblKoNgmc37txlaRAn3iyRiqQY95
+2w5/zAgkEk6A93Jrra1I+KDSNPshXBB6YoHWzQyaAJVrw1J7+j2zKQ/g65JWBVgt
+kgk0CZCCI8xNmbuBVYIt0cVPok9Ow6IVUdQimCerkU8b2r1bFfQ4EsK0yXEJ1ETe
+3IFXkxjr2tSGWLDLNCBzgiUlxgSp6VUMNDLMS0+H06z5ORahaAI=
+=sSuz
+-----END PGP SIGNATURE-----
diff --git a/SPECS/php.spec b/SPECS/php.spec
index bca66de..21d2733 100644
--- a/SPECS/php.spec
+++ b/SPECS/php.spec
@@ -63,12 +63,12 @@
 %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
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -336,7 +336,9 @@ need to install this package.
 %package opcache
 Summary:   The Zend OPcache
 License:   PHP-3.01
+%ifnarch %{ix86}
 BuildRequires: pkgconfig(capstone) >= 3.0
+%endif
 Requires:  php-common%{?_isa} = %{version}-%{release}
 Provides:  php-pecl-zendopcache = %{version}
 Provides:  php-pecl-zendopcache%{?_isa} = %{version}
@@ -917,7 +919,9 @@ pushd build-cgi
 build --libdir=%{_libdir}/php \
       --enable-pcntl \
       --enable-opcache \
+%ifnarch %{ix86}
       --with-capstone \
+%endif
       --enable-phpdbg --enable-phpdbg-readline \
 %if %{with imap}
       --with-imap=shared --with-imap-ssl \
@@ -1553,6 +1557,12 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
+* Thu May 21 2026 Remi Collet <rcollet@redhat.com> - 8.3.31-2
+- drop capstone dependency on i686
+
+* Thu May 21 2026 Remi Collet <rcollet@redhat.com> - 8.3.31-1
+- rebase to 8.3.31
+
 * Thu Jan  8 2026 Remi Collet <rcollet@redhat.com> - 8.3.29-1
 - rebase to 8.3.29