diff options
| -rw-r--r-- | 19301.patch | 36 | ||||
| -rw-r--r-- | failed.txt | 2 | ||||
| -rw-r--r-- | php.spec | 12 |
3 files changed, 9 insertions, 41 deletions
diff --git a/19301.patch b/19301.patch deleted file mode 100644 index d440311..0000000 --- a/19301.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 60f5e26274ca8f3afdc2ed50b402b006f2f33a38 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 30 Jul 2025 09:42:02 +0200 -Subject: [PATCH] Fix GH-19298 missing libraries for opcache - ---- - ext/opcache/config.m4 | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index 75a5a219cb53..e9ce51bbd227 100644 ---- a/ext/opcache/config.m4 -+++ b/ext/opcache/config.m4 -@@ -85,7 +85,7 @@ AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [ - AS_VAR_IF([PHP_CAPSTONE], [yes], - [PKG_CHECK_MODULES([CAPSTONE], [capstone >= 3.0.0], [ - AC_DEFINE([HAVE_CAPSTONE], [1], [Define to 1 if Capstone is available.]) -- PHP_EVAL_LIBLINE([$CAPSTONE_LIBS], [OPCACHE_SHARED_LIBADD]) -+ PHP_EVAL_LIBLINE([$CAPSTONE_LIBS]) - PHP_EVAL_INCLINE([$CAPSTONE_CFLAGS]) - ZEND_JIT_SRC="$ZEND_JIT_SRC jit/ir/ir_disasm.c" - ])]) -@@ -318,7 +318,7 @@ AS_VAR_IF([php_cv_shm_mmap_posix], [yes], [ - AC_DEFINE([HAVE_SHM_MMAP_POSIX], [1], - [Define to 1 if you have the POSIX mmap() SHM support.]) - AS_CASE([$ac_cv_search_shm_open], ["none required"|no], [], -- [PHP_EVAL_LIBLINE([$ac_cv_search_shm_open], [OPCACHE_SHARED_LIBADD])]) -+ [PHP_EVAL_LIBLINE([$ac_cv_search_shm_open])]) - ]) - - PHP_NEW_EXTENSION([opcache], m4_normalize([ -@@ -361,4 +361,3 @@ AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [ - ]) - PHP_ADD_MAKEFILE_FRAGMENT([$ext_srcdir/jit/Makefile.frag]) - ]) --PHP_SUBST([OPCACHE_SHARED_LIBADD]) @@ -1,4 +1,4 @@ -===== 8.5.0alpha3 (2025-07-31) +===== 8.5.0alpha4 (2025-07-31) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log @@ -94,8 +94,8 @@ %global gh_owner php %global gh_project php-src %global upver 8.5.0 -%global rcver alpha3 -%global lowrc alpha3 +%global rcver alpha4 +%global lowrc alpha4 # TODO set PHP_EXTRA_VERSION for EOL version Summary: PHP scripting language for creating dynamic web sites @@ -170,7 +170,6 @@ Patch48: php-8.5.0-openssl-ec-param.patch Patch300: php-7.4.0-datetests.patch # WIP -Patch400: 19301.patch BuildRequires: gnupg2 BuildRequires: bzip2-devel @@ -861,7 +860,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch -P300 -p1 -b .datetests # WIP patch -%patch -P400 -p1 -b .pr19301 # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE ZEND_LICENSE @@ -901,6 +899,8 @@ rm sapi/cli/tests/upload_2G.phpt # Both Fedora and RHEL do not support arbitrary EC parameters # https://bugzilla.redhat.com/2223953 rm ext/openssl/tests/ecc_custom_params.phpt +# Failing when build with PHP installed +rm ext/opcache/tests/zzz_basic_logging.phpt # Safety check for API version change. pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h) @@ -1638,6 +1638,10 @@ fi %changelog +* Thu Jul 31 2025 Remi Collet <remi@remirepo.net> - 8.5.0~alpha4-1 +- update to 8.5.0alpha4 +- drop patch merged upstream + * Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 8.5.0~alpha3-1 - update to 8.5.0alpha3 - bump dependency on php-nikic-php-parser5 5.6 |