summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-03-26 08:05:33 +0100
committerRemi Collet <remi@php.net>2025-03-26 08:05:33 +0100
commitf36bfdcc86dcca9e01c935a55ca5bfdde97ed64c (patch)
tree25f3c8c0fc1fa35c2ed65309f515f5152dbca05c
parent8cf63647ad85c77f74143759b1090af11059b84c (diff)
Update to 8.4.6RC1HEADmaster
-rw-r--r--failed.txt8
-rw-r--r--php-8.4.6-embed.patch (renamed from php-8.4.0-embed.patch)16
-rw-r--r--php.spec9
3 files changed, 17 insertions, 16 deletions
diff --git a/failed.txt b/failed.txt
index 8712539..7ceb3d2 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.4.5 (2025-03-13)
+===== 8.4.6RC1 (2025-03-27)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
@@ -12,12 +12,10 @@ $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
/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
-/var/lib/mock/scl83fc42a/build.log:Tests failed : 1
-/var/lib/mock/scl83fc42x/build.log:Tests failed : 1
+/var/lib/mock/scl83fc42a/build.log:Tests failed : 0
+/var/lib/mock/scl83fc42x/build.log:Tests failed : 0
-fc42:
- 2 Bug #75457 (heap-use-after-free in php7.0.25) [ext/pcre/tests/bug75457.phpt]
(1) proc_open give erratic test results :(
diff --git a/php-8.4.0-embed.patch b/php-8.4.6-embed.patch
index ca4b403..72b5e4c 100644
--- a/php-8.4.0-embed.patch
+++ b/php-8.4.6-embed.patch
@@ -1,10 +1,10 @@
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], [
- LIBPHP_CFLAGS="-shared"
- PHP_EMBED_TYPE=shared
+--- ./sapi/embed/config.m4.embed 2025-03-26 07:14:03.223791152 +0100
++++ ./sapi/embed/config.m4 2025-03-26 07:16:43.185955159 +0100
+@@ -15,7 +15,8 @@ if test "$PHP_EMBED" != "no"; then
+ SAPI_SHARED="libs/libphp.dylib"
+ PHP_EMBED_TYPE=shared-dylib
+ ], [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)"
@@ -12,8 +12,8 @@ diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4
[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
-+++ ./scripts/php-config.in 2024-07-03 16:20:00.439654444 +0200
+--- ./scripts/php-config.in.embed 2025-03-25 19:59:01.000000000 +0100
++++ ./scripts/php-config.in 2025-03-26 07:14:03.223870699 +0100
@@ -19,7 +19,7 @@ exe_extension="@EXEEXT@"
php_cli_binary=NONE
php_cgi_binary=NONE
diff --git a/php.spec b/php.spec
index 609b661..2b1b5be 100644
--- a/php.spec
+++ b/php.spec
@@ -93,8 +93,8 @@
#global gh_date 20230605
%global gh_owner php
%global gh_project php-src
-%global upver 8.4.5
-#global rcver RC1
+%global upver 8.4.6
+%global rcver RC1
# TODO set PHP_EXTRA_VERSION for EOL version
Summary: PHP scripting language for creating dynamic web sites
@@ -136,7 +136,7 @@ Source53: 20-ffi.ini
# Build fixes
Patch1: php-8.4.0-httpd.patch
Patch5: php-8.4.0-includedir.patch
-Patch6: php-8.4.0-embed.patch
+Patch6: php-8.4.6-embed.patch
Patch8: php-8.4.0-libdb.patch
# Functional changes
@@ -1666,6 +1666,9 @@ fi
%changelog
+* Wed Mar 26 2025 Remi Collet <remi@remirepo.net> - 8.4.6~RC1-1
+- Update to 8.4.6RC1
+
* Wed Mar 12 2025 Remi Collet <remi@remirepo.net> - 8.4.5-1
- Update to 8.4.5 - http://www.php.net/releases/8_4_5.php