From c02751b3e9f7705bc65edd30ae0e6ea6a1f7a030 Mon Sep 17 00:00:00 2001
From: Remi Collet <rcollet@redhat.com>
Date: Tue, 30 Sep 2025 09:35:18 +0200
Subject: [PATCH] rebase to 8.3.26

Resolves: RHEL-116528
---
 .gitignore                                      |  2 ++
 php-8.0.0-embed.patch => php-8.3.20-embed.patch | 16 ++++++++--------
 php.spec                                        |  7 +++++--
 sources                                         |  4 ++--
 4 files changed, 17 insertions(+), 12 deletions(-)
 rename php-8.0.0-embed.patch => php-8.3.20-embed.patch (67%)

diff --git a/.gitignore b/.gitignore
index 5f2371e..e15a348 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ TODO
 /php-8.3.15.tar.xz.asc
 /php-8.3.19.tar.xz
 /php-8.3.19.tar.xz.asc
+/php-8.3.26.tar.xz
+/php-8.3.26.tar.xz.asc
diff --git a/php-8.0.0-embed.patch b/php-8.3.20-embed.patch
similarity index 67%
rename from php-8.0.0-embed.patch
rename to php-8.3.20-embed.patch
index 27533ea..1140d33 100644
--- a/php-8.0.0-embed.patch
+++ b/php-8.3.20-embed.patch
@@ -1,10 +1,10 @@
 diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4
---- ./sapi/embed/config.m4.embed	2020-07-07 13:51:05.879764972 +0200
-+++ ./sapi/embed/config.m4	2020-07-07 13:52:50.128412148 +0200
-@@ -12,7 +12,8 @@ if test "$PHP_EMBED" != "no"; then
-     yes|shared)
-       LIBPHP_CFLAGS="-shared"
-       PHP_EMBED_TYPE=shared
+--- ./sapi/embed/config.m4.embed	2025-03-26 08:07:06.692333414 +0100
++++ ./sapi/embed/config.m4	2025-03-26 08:07:42.872879994 +0100
+@@ -15,7 +15,8 @@ if test "$PHP_EMBED" != "no"; then
+         SAPI_SHARED="libs/libphp.dylib"
+         PHP_EMBED_TYPE=shared-dylib
+       ], [PHP_EMBED_TYPE=shared])
 -      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
 +      EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION).\$(PHP_MINOR_VERSION)"
 +      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)"
@@ -12,8 +12,8 @@ diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4
      static)
        LIBPHP_CFLAGS="-static"
 diff -up ./scripts/php-config.in.embed ./scripts/php-config.in
---- ./scripts/php-config.in.embed	2020-07-07 12:54:42.000000000 +0200
-+++ ./scripts/php-config.in	2020-07-07 13:51:05.880764968 +0200
+--- ./scripts/php-config.in.embed	2025-03-25 22:00:06.000000000 +0100
++++ ./scripts/php-config.in	2025-03-26 08:07:06.692518461 +0100
 @@ -18,7 +18,7 @@ exe_extension="@EXEEXT@"
  php_cli_binary=NONE
  php_cgi_binary=NONE
diff --git a/php.spec b/php.spec
index faa7591..16d273f 100644
--- a/php.spec
+++ b/php.spec
@@ -63,7 +63,7 @@
 %bcond_with      imap
 %bcond_without   lmdb
 
-%global upver        8.3.19
+%global upver        8.3.26
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -102,7 +102,7 @@ Source53: 20-ffi.ini
 # Build fixes
 Patch1: php-7.4.0-httpd.patch
 Patch5: php-7.2.0-includedir.patch
-Patch6: php-8.0.0-embed.patch
+Patch6: php-8.3.20-embed.patch
 Patch8: php-8.1.0-libdb.patch
 
 # Functional changes
@@ -1554,6 +1554,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
+* Tue Sep 30 2025 Remi Collet <rcollet@redhat.com> - 8.3.26-1
+- rebase to 8.3.26
+
 * Wed Apr  9 2025 Remi Collet <rcollet@redhat.com> - 8.3.19-1
 - rebase to 8.3.19
 
diff --git a/sources b/sources
index 1e3b5ac..5fea059 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (php-8.3.19.tar.xz) = 2872639f6a6de1680540da5a2df43db7ceeb7e25690b6f66d73373779ee3f9b0c2fe74aeeb7181749c9738b64f8d41b8a6f496751778c1df10b7f9aab43f21f7
-SHA512 (php-8.3.19.tar.xz.asc) = 5218e5abf251bc7180b32d60b6ce7639a65e023889bc25d776dc626a645ea0423244a9a8e1e517dfd7272e4963d736209e890ada3dd34833f38c5277aa789294
+SHA512 (php-8.3.26.tar.xz) = 252c0c95bb2c4d6bf03e686c205777b529aaebe52f143754b369069d7a8aa5b45e8c2addb968287d6473cee507df62729e2527607b796fb764d3f036ba89fafb
+SHA512 (php-8.3.26.tar.xz.asc) = 18e46d07c18a6d0abf3ede4a2c43e57a7b74fff4864da03dbf999ab9bbf4652e36febb3ed8f0a8351f73d5d29e67ffddda622263c00bfd9bb1cf0e6e87514491