summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt2
-rw-r--r--php-8.4.0-phpinfo.patch18
-rw-r--r--php84.spec9
3 files changed, 16 insertions, 13 deletions
diff --git a/failed.txt b/failed.txt
index ac47bb4..3e0cf4f 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.4.0RC1 (2024-09-26)
+===== 8.4.0RC2 (2024-10-10)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
diff --git a/php-8.4.0-phpinfo.patch b/php-8.4.0-phpinfo.patch
index 2536f9e..47bdbde 100644
--- a/php-8.4.0-phpinfo.patch
+++ b/php-8.4.0-phpinfo.patch
@@ -7,9 +7,9 @@ Replace full GCC name by gcc in php -v output
diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c
---- ./ext/standard/info.c.phpinfo 2020-07-21 10:49:31.000000000 +0200
-+++ ./ext/standard/info.c 2020-07-21 11:41:56.295633523 +0200
-@@ -805,9 +805,6 @@ PHPAPI ZEND_COLD void php_print_info(int
+--- ./ext/standard/info.c.phpinfo 2024-10-08 15:57:40.000000000 +0200
++++ ./ext/standard/info.c 2024-10-08 16:10:11.330510009 +0200
+@@ -814,9 +814,6 @@ PHPAPI ZEND_COLD void php_print_info(int
#ifdef PHP_BUILD_ARCH
php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
#endif
@@ -20,20 +20,20 @@ diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c
if (sapi_module.pretty_name) {
php_info_print_table_row(2, "Server API", sapi_module.pretty_name );
diff -up ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/standard/tests/general_functions/phpinfo.phpt
---- ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo 2020-07-21 10:49:31.000000000 +0200
-+++ ./ext/standard/tests/general_functions/phpinfo.phpt 2020-07-21 11:41:56.296633522 +0200
+--- ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo 2024-10-08 16:12:47.009579597 +0200
++++ ./ext/standard/tests/general_functions/phpinfo.phpt 2024-10-08 16:12:52.273784836 +0200
@@ -17,7 +17,6 @@ PHP Version => %s
System => %s
- Build Date => %s%a
+ Build Date => %r(.+?)%r
-Configure Command => %s
Server API => Command Line Interface
Virtual Directory Support => %s
Configuration File (php.ini) Path => %s
diff -up ./main/main.c.phpinfo ./main/main.c
---- ./main/main.c.phpinfo 2024-08-13 16:14:03.242363191 +0200
-+++ ./main/main.c 2024-08-13 16:14:06.588499946 +0200
-@@ -119,7 +119,7 @@ PHPAPI char *php_get_version(sapi_module
+--- ./main/main.c.phpinfo 2024-10-08 15:57:40.000000000 +0200
++++ ./main/main.c 2024-10-08 16:10:11.331510049 +0200
+@@ -118,7 +118,7 @@ PHPAPI char *php_get_version(sapi_module
"NTS"
#endif
#ifdef PHP_BUILD_COMPILER
diff --git a/php84.spec b/php84.spec
index 36b8b30..562ebba 100644
--- a/php84.spec
+++ b/php84.spec
@@ -13,7 +13,7 @@
%global pdover 20240423
# Extension version
%global fileinfover 1.0.5
-%global zipver 1.22.3
+%global zipver 1.22.4
# Adds -z now to the linker flags
%global _hardened_build 1
@@ -82,8 +82,8 @@
%bcond_with zip
%global upver 8.4.0
-%global rcver RC1
-%global rclow rc1
+%global rcver RC2
+%global rclow rc2
# TODO set PHP_EXTRA_VERSION for EOL version
Summary: PHP scripting language for creating dynamic web sites
@@ -1702,6 +1702,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%changelog
+* Tue Oct 8 2024 Remi Collet <remi@remirepo.net> - 8.4.0~rc2-1
+- Update to 8.4.0RC2
+
* Tue Sep 24 2024 Remi Collet <remi@remirepo.net> - 8.4.0~rc1-1
- Update to 8.4.0RC1
- bump ABI/API numbers