update to 8.5.0alpha2HEADmaster

4 files changed, 12 insertions, 46 deletions

diff --git a/0001-fix-ldap.h-detection-without-pkgconfig.patch b/0001-fix-ldap.h-detection-without-pkgconfig.patch
deleted file mode 100644
index abe5c3d..0000000
--- a/0001-fix-ldap.h-detection-without-pkgconfig.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 85ed35c3561285ab6e1ea7f937e060a2352ef9d8 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 2 Jul 2025 09:17:21 +0200
-Subject: [PATCH] fix ldap.h detection without pkgconfig
-
----
- ext/ldap/config.m4 | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
-index 7d0229f6868..ae0ae7fba95 100644
---- a/ext/ldap/config.m4
-+++ b/ext/ldap/config.m4
-@@ -60,15 +60,20 @@ if test "$PHP_LDAP" != "no"; then
-     [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
- 
-   AS_VAR_IF([PHP_LDAP], [yes], [
--    PKG_CHECK_MODULES([LDAP], [lber ldap])
--    PHP_LDAP_PKGCONFIG=true
--  ], [PHP_LDAP_CHECKS([$PHP_LDAP])])
-+    PKG_CHECK_MODULES([LDAP], [lber ldap],
-+      PHP_LDAP_PKGCONFIG=true, PHP_LDAP_PKGCONFIG=false)])
- 
-   AS_IF([test "$PHP_LDAP_PKGCONFIG" = true], [
-     PHP_EVAL_INCLINE([$LDAP_CFLAGS])
-     PHP_EVAL_LIBLINE([$LDAP_LIBS], [LDAP_SHARED_LIBADD])
-   ], [
--    AS_VAR_IF([LDAP_DIR],, [AC_MSG_ERROR([Cannot find ldap.h])])
-+    AS_VAR_IF([PHP_LDAP], [yes], [
-+      for i in /usr/local /usr; do
-+        PHP_LDAP_CHECKS([$i])
-+      done
-+    ], [PHP_LDAP_CHECKS([$PHP_LDAP])])
-+    AC_MSG_CHECKING([for ldap.h])
-+    AS_VAR_IF([LDAP_DIR],, [AC_MSG_ERROR([Cannot find ldap.h])], AC_MSG_RESULT([$LDAP_DIR]))
- 
-     dnl -pc removal is a hack for clang
-     MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//')
--- 
-2.50.0
-
diff --git a/failed.txt b/failed.txt
index e96bf7c..caee591 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.5.0alpha1 (2025-07-03)
+===== 8.5.0alpha2 (2025-07-17)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/php.ini b/php.ini
index 12aa598..e2eb43e 100644
--- a/php.ini
+++ b/php.ini
@@ -622,6 +622,12 @@ report_memleaks = On
 ; Development value: 0
 ; Production value: 0
 
+; This directive controls whether PHP will output the backtrace of fatal errors.
+; Default Value: On
+; Development Value: On
+; Production Value: On
+;fatal_error_backtraces = On
+
 ;;;;;;;;;;;;;;;;;
 ; Data Handling ;
 ;;;;;;;;;;;;;;;;;
diff --git a/php.spec b/php.spec
index 753eb78..8c19025 100644
--- a/php.spec
+++ b/php.spec
@@ -94,8 +94,8 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.5.0
-%global rcver        alpha1
-%global lowrc        alpha1
+%global rcver        alpha2
+%global lowrc        alpha2
 # TODO set PHP_EXTRA_VERSION for EOL version
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -170,7 +170,6 @@ Patch48: php-8.5.0-openssl-ec-param.patch
 Patch300: php-7.4.0-datetests.patch
 
 # WIP
-Patch400: 0001-fix-ldap.h-detection-without-pkgconfig.patch
 
 BuildRequires: gnupg2
 BuildRequires: bzip2-devel
@@ -875,7 +874,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch -P300 -p1 -b .datetests
 
 # WIP patch
-%patch -P400 -p1 -b .pr19005
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE ZEND_LICENSE
@@ -1654,6 +1652,9 @@ fi
 
 
 %changelog
+* Tue Jul 15 2025 Remi Collet <remi@remirepo.net> - 8.5.0~alpha2-1
+- update to 8.5.0alpha2
+
 * Wed Jul  2 2025 Remi Collet <remi@remirepo.net> - 8.5.0~alpha1-1
 - update to 8.5.0alpha1
 - fix FPM test failure  https://github.com/php/php-src/pull/18992