From 3fadc52c1d1f1060b5b5075d0ccca52c90a6913b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 17 Jul 2024 08:56:11 +0200
Subject: Update to 8.4.0alpha2

---
 failed.txt            |  2 +-
 php-8.4.0-httpd.patch | 23 +++++++++--------------
 php.spec              |  5 ++++-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/failed.txt b/failed.txt
index aa7f430..9437e9d 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.4.0alpha1 (2024-07-04)
+===== 8.4.0alpha2 (2024-07-18)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/php-8.4.0-httpd.patch b/php-8.4.0-httpd.patch
index d219faf..06e71df 100644
--- a/php-8.4.0-httpd.patch
+++ b/php-8.4.0-httpd.patch
@@ -7,20 +7,15 @@ mod_php is build twice
 diff -up ./sapi/apache2handler/config.m4.mpmcheck ./sapi/apache2handler/config.m4
 --- ./sapi/apache2handler/config.m4.mpmcheck	2024-07-03 15:56:56.882370597 +0200
 +++ ./sapi/apache2handler/config.m4	2024-07-03 15:59:15.967824949 +0200
-@@ -105,16 +105,4 @@ if test "$PHP_APXS2" != "no"; then
-     INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
+@@ -110,11 +110,6 @@ if test "$PHP_APXS2" != "no"; then
      ;;
    esac
+ 
+-  AS_IF([$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1], [
+-    APACHE_THREADED_MPM=yes
+-    PHP_BUILD_THREAD_SAFE
+-  ], [APACHE_THREADED_MPM=no])
 -
--  if test "$APACHE_VERSION" -lt 2004001; then
--    APXS_MPM=`$APXS -q MPM_NAME`
--    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
--      PHP_BUILD_THREAD_SAFE
--    fi
--  else
--    APACHE_THREADED_MPM=`$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes'`
--    if test -n "$APACHE_THREADED_MPM"; then
--      PHP_BUILD_THREAD_SAFE
--    fi
--  fi
- fi
+ AC_CONFIG_COMMANDS([apache2handler], [AS_VAR_IF([enable_zts], [yes],,
+   [AS_VAR_IF([APACHE_THREADED_MPM], [no],
+     [AC_MSG_WARN([
diff --git a/php.spec b/php.spec
index 17b51a9..ef0210e 100644
--- a/php.spec
+++ b/php.spec
@@ -82,7 +82,7 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.4.0
-%global rcver        alpha1
+%global rcver        alpha2
 # TODO set PHP_EXTRA_VERSION for EOL version
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -1633,6 +1633,9 @@ fi
 
 
 %changelog
+* Wed Jul 17 2024 Remi Collet <remi@remirepo.net> - 8.4.0~alpha2-1
+- Update to 8.4.0alpha2
+
 * Wed Jul  3 2024 Remi Collet <remi@remirepo.net> - 8.4.0~alpha1-1
 - Update to 8.4.0alpha1
 - drop imap, pspell, oci8 and pdo_oci extensions
-- 
cgit