Update to 8.4.0beta3

4 files changed, 20 insertions, 38 deletions

diff --git a/failed.txt b/failed.txt
index 90cbc5b..3a96a30 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,18 +1,20 @@
-===== 8.4.0beta1 (2024-08-15)
+===== 8.4.0beta3 (2024-08-15)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
-/var/lib/mock/scl83el8a/build.log:Tests failed     :    0
-/var/lib/mock/scl83el8x/build.log:Tests failed     :    0
-/var/lib/mock/scl83el9a/build.log:Tests failed     :    0
-/var/lib/mock/scl83el9x/build.log:Tests failed     :    0
-/var/lib/mock/scl83fc38x/build.log:Tests failed    :    0
-/var/lib/mock/scl83fc39a/build.log:Tests failed    :    0
-/var/lib/mock/scl83fc39x/build.log:Tests failed    :    0
-/var/lib/mock/scl83fc40a/build.log:Tests failed    :    0
-/var/lib/mock/scl83fc40x/build.log:Tests failed    :    0
+/var/lib/mock/scl83el8a/build.log:Tests failed     :    1
+/var/lib/mock/scl83el8x/build.log:Tests failed     :    1
+/var/lib/mock/scl83el9a/build.log:Tests failed     :    1
+/var/lib/mock/scl83el9x/build.log:Tests failed     :    1
+/var/lib/mock/scl83fc38x/build.log:Tests failed    :    1
+/var/lib/mock/scl83fc39a/build.log:Tests failed    :    1
+/var/lib/mock/scl83fc39x/build.log:Tests failed    :    1
+/var/lib/mock/scl83fc40a/build.log:Tests failed    :    1
+/var/lib/mock/scl83fc40x/build.log:Tests failed    :    1
 
 
+all:
+	3	exit(false); [Zend/tests/exit/exit_values.phpt]
 
 
 (1)	proc_open give erratic test results :(
diff --git a/php-8.4.0-embed.patch b/php-8.4.0-embed.patch
index fdb0477..ca4b403 100644
--- a/php-8.4.0-embed.patch
+++ b/php-8.4.0-embed.patch
@@ -2,14 +2,14 @@ diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4
 --- ./sapi/embed/config.m4.embed	2024-07-03 16:17:17.973277200 +0200
 +++ ./sapi/embed/config.m4	2024-07-03 16:19:32.224546927 +0200
 @@ -12,7 +12,8 @@ if test "$PHP_EMBED" != "no"; then
-     yes|shared)
+     [yes|shared], [
        LIBPHP_CFLAGS="-shared"
        PHP_EMBED_TYPE=shared
 -      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(orig_libdir); \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(orig_libdir)"
 +      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)"
-       ;;
-     static)
+     ],
+     [static], [
        LIBPHP_CFLAGS="-static"
 diff -up ./scripts/php-config.in.embed ./scripts/php-config.in
 --- ./scripts/php-config.in.embed	2024-07-03 16:17:17.973277200 +0200
diff --git a/php.spec b/php.spec
index f575ccf..8f2447c 100644
--- a/php.spec
+++ b/php.spec
@@ -84,13 +84,13 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.4.0
-%global rcver        beta1
+%global rcver        beta3
 # TODO set PHP_EXTRA_VERSION for EOL version
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-Release: 3%{?dist}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -151,7 +151,6 @@ Patch48: php-8.3.0-openssl-ec-param.patch
 # RC Patch
 
 # Upstream fixes (100+)
-Patch100: upstream.patch
 
 # Security fixes (200+)
 
@@ -851,7 +850,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch -P48 -p1 -b .ec-param
 
 # upstream patches
-%patch -P100 -p1 -b .up
 
 # security patches
 
@@ -1651,6 +1649,9 @@ fi
 
 
 %changelog
+* Thu Aug 15 2024 Remi Collet <remi@remirepo.net> - 8.4.0~beta3-1
+- Update to 8.4.0beta3
+
 * Wed Aug 14 2024 Remi Collet <remi@remirepo.net> - 8.4.0~beta1-3
 - allow to build using libiodbc instead of unixODBC (--with iodbc)
 
diff --git a/upstream.patch b/upstream.patch
deleted file mode 100644
index f4c2a18..0000000
--- a/upstream.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 40d88cacc1db11787aa2fde6d0ee4b6064746d94 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 13 Aug 2024 22:58:44 +0200
-Subject: [PATCH] Fix test expectation for "Built by..." (#15383)
-
----
- sapi/fpm/tests/main-version.phpt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sapi/fpm/tests/main-version.phpt b/sapi/fpm/tests/main-version.phpt
-index 40ea45ef01026..5ae83562d070b 100644
---- a/sapi/fpm/tests/main-version.phpt
-+++ b/sapi/fpm/tests/main-version.phpt
-@@ -16,6 +16,6 @@ echo "Done\n";
- --EXPECTF--
- string(%d) "PHP %s (fpm%s (built: %s
- Copyright (c) The PHP Group
--Zend Engine v%s, Copyright (c) Zend Technologies
-+%AZend Engine v%s, Copyright (c) Zend Technologies
- "
- Done