diff options
| -rw-r--r-- | 15420.patch | 22 | ||||
| -rw-r--r-- | failed.txt | 5 | ||||
| -rw-r--r-- | php-8.4.0-httpd.patch | 6 | ||||
| -rw-r--r-- | php.spec | 9 |
4 files changed, 11 insertions, 31 deletions
diff --git a/15420.patch b/15420.patch deleted file mode 100644 index 9d2315b..0000000 --- a/15420.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 2bb7a54fcecb49f34301fbe016d5bedb54d23963 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 15 Aug 2024 07:31:32 +0200 -Subject: [PATCH] ensure default settings used in test - ---- - Zend/tests/exit/exit_values.phpt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Zend/tests/exit/exit_values.phpt b/Zend/tests/exit/exit_values.phpt -index e081193b94cd..7b774a961c7e 100644 ---- a/Zend/tests/exit/exit_values.phpt -+++ b/Zend/tests/exit/exit_values.phpt -@@ -49,7 +49,7 @@ try { - TEMPLATE; - - $php = getenv('TEST_PHP_EXECUTABLE_ESCAPED'); --$command = $php . ' ' . escapeshellarg(FILE_PATH); -+$command = $php . ' --no-php-ini ' . escapeshellarg(FILE_PATH); - - foreach ([FILE_CONTENT, str_replace('exit', 'die', FILE_CONTENT)] as $code) { - foreach ($values as $value) { @@ -1,4 +1,4 @@ -===== 8.4.0beta3 (2024-08-15) +===== 8.4.0beta4 (2024-08-29) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log @@ -6,11 +6,12 @@ $ grep -ar 'Tests failed' /var/lib/mock/*/build.log /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/scl83fc41a/build.log:Tests failed : 0 +/var/lib/mock/scl83fc41x/build.log:Tests failed : 0 diff --git a/php-8.4.0-httpd.patch b/php-8.4.0-httpd.patch index 06e71df..d40b453 100644 --- a/php-8.4.0-httpd.patch +++ b/php-8.4.0-httpd.patch @@ -7,9 +7,9 @@ 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 -@@ -110,11 +110,6 @@ if test "$PHP_APXS2" != "no"; then - ;; - esac +@@ -106,11 +106,6 @@ if test "$PHP_APXS2" != "no"; then + [mod_php.c sapi_apache2.c apache_config.c php_functions.c], + [$APACHE_CFLAGS]) - AS_IF([$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1], [ - APACHE_THREADED_MPM=yes @@ -84,13 +84,13 @@ %global gh_owner php %global gh_project php-src %global upver 8.4.0 -%global rcver beta3 +%global rcver beta4 # 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: 2%{?dist} +Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -159,7 +159,6 @@ Patch48: php-8.3.0-openssl-ec-param.patch Patch300: php-7.4.0-datetests.patch # WIP -Patch400: 15420.patch BuildRequires: gnupg2 BuildRequires: bzip2-devel @@ -858,7 +857,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch -P300 -p1 -b .datetests # WIP patch -%patch -P400 -p1 # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE ZEND_LICENSE @@ -1651,6 +1649,9 @@ fi %changelog +* Wed Aug 28 2024 Remi Collet <remi@remirepo.net> - 8.4.0~beta4-1 +- Update to 8.4.0beta4 + * Thu Aug 15 2024 Remi Collet <remi@remirepo.net> - 8.4.0~beta3-2 - test build for PR - open https://github.com/php/php-src/pull/15420 fix test settings |