summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-10-09 08:23:41 +0200
committerRemi Collet <remi@php.net>2024-10-09 08:23:41 +0200
commit70271b833aad36bbdb8f8fb06a70d88eb77cf9f5 (patch)
treeade34f2e8c55b06ffddd2da651217b88f0ebb1e7
parentbba43d1ae33aebb257767389b828340607057335 (diff)
update to 8.2.25RC1
-rw-r--r--failed.txt2
-rw-r--r--php-8.2.25-phpinfo.patch (renamed from php-8.1.0-phpinfo.patch)6
-rw-r--r--php.spec9
3 files changed, 10 insertions, 7 deletions
diff --git a/failed.txt b/failed.txt
index f94742a..51070ed 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.2.24 (2024-09-26)
+===== 8.2.25RC1 (2024-10-10)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
diff --git a/php-8.1.0-phpinfo.patch b/php-8.2.25-phpinfo.patch
index d19b2f4..580daa1 100644
--- a/php-8.1.0-phpinfo.patch
+++ b/php-8.2.25-phpinfo.patch
@@ -9,7 +9,7 @@ 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
+@@ -834,9 +834,6 @@ PHPAPI ZEND_COLD void php_print_info(int
#ifdef PHP_BUILD_ARCH
php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
#endif
@@ -25,7 +25,7 @@ diff -up ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/stand
@@ -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
@@ -33,7 +33,7 @@ diff -up ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/stand
diff -up ./sapi/cli/php_cli.c.phpinfo ./sapi/cli/php_cli.c
--- ./sapi/cli/php_cli.c.phpinfo 2020-07-21 11:43:38.812475300 +0200
+++ ./sapi/cli/php_cli.c 2020-07-21 11:43:45.783464540 +0200
-@@ -645,7 +645,7 @@ static int do_cli(int argc, char **argv)
+@@ -644,7 +644,7 @@ static int do_cli(int argc, char **argv)
"NTS"
#endif
#ifdef PHP_BUILD_COMPILER
diff --git a/php.spec b/php.spec
index 4738b0c..3654684 100644
--- a/php.spec
+++ b/php.spec
@@ -131,8 +131,8 @@
#global gh_date 20220530
%global gh_owner php
%global gh_project php-src
-%global upver 8.2.24
-#global rcver RC1
+%global upver 8.2.25
+%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
@@ -194,7 +194,7 @@ Patch45: php-7.4.0-ldap_r.patch
Patch46: php-8.0.7-argon2.patch
# drop "Configure command" from phpinfo output
# and only use gcc (instead of full version)
-Patch47: php-8.1.0-phpinfo.patch
+Patch47: php-8.2.25-phpinfo.patch
# RC Patch
Patch91: php-7.2.0-oci8conf.patch
@@ -1867,6 +1867,9 @@ fi
%changelog
+* Wed Oct 9 2024 Remi Collet <remi@remirepo.net> - 8.2.25~RC1-1
+- update to 8.2.25RC1
+
* Wed Sep 25 2024 Remi Collet <remi@remirepo.net> - 8.2.24-1
- Update to 8.2.24 - http://www.php.net/releases/8_2_24.php