[packages/php] Started 8.5.0 alpha1
arekm
arekm at pld-linux.org
Sun Jul 13 01:34:21 CEST 2025
commit 10eabc08bc57ba8d4d28942dccffa2a1553765c0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Jul 13 01:34:03 2025 +0200
Started 8.5.0 alpha1
php-ini.patch | 32 ++++++++++++++++++++++++--------
php-pldlogo.patch | 2 +-
php-shared.patch | 16 ++++++++--------
php-stupidapache_version.patch | 29 -----------------------------
php-systzdata.patch | 6 +++---
php.spec | 25 +++++++++++++------------
6 files changed, 49 insertions(+), 61 deletions(-)
---
diff --git a/php.spec b/php.spec
index 2fdde9e..f7281f2 100644
--- a/php.spec
+++ b/php.spec
@@ -128,10 +128,10 @@
%endif
%define orgname php
-%define ver_suffix 84
+%define ver_suffix 85
%define php_suffix %{!?with_default_php:%{ver_suffix}}
-%define subver %{nil}
-%define rel 3
+%define subver alpha1
+%define rel 0.1
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -139,7 +139,7 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP
Summary(ru.UTF-8): PHP - язык препроцессирования HTML-файлов, выполняемый на сервере
Summary(uk.UTF-8): PHP - мова препроцесування HTML-файлів, виконувана на сервері
Name: %{orgname}%{php_suffix}
-Version: 8.4.10
+Version: 8.5.0
Release: %{rel}
Epoch: 4
# All files licensed under PHP version 3.01, except
@@ -147,9 +147,10 @@ Epoch: 4
# TSRM is licensed under BSD
License: PHP 3.01 and Zend and BSD
Group: Libraries
-Source0: https://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: b73a7c365a7e75905745528d218cf128
-#Source0: https://downloads.php.net/~pierrick/php-%{version}%{subver}.tar.xz
+#XSource0: https://www.php.net/distributions/%{orgname}-%{version}.tar.xz
+# XSource0-md5: b73a7c365a7e75905745528d218cf128
+Source0: https://downloads.php.net/~daniels/php-%{version}%{subver}.tar.xz
+# Source0-md5: 75498754fc2cf772d0377f24c76b4730
Source1: opcache.ini
Source2: %{orgname}-mod_php.conf
Source3: %{orgname}-cgi-fcgi.ini
@@ -177,7 +178,7 @@ Patch21: %{orgname}-dba-link.patch
Patch22: %{orgname}-both-apxs.patch
Patch23: %{orgname}-builddir.patch
Patch24: %{orgname}-zlib-for-getimagesize.patch
-Patch25: %{orgname}-stupidapache_version.patch
+
Patch27: %{orgname}-config-dir.patch
Patch29: %{orgname}-fcgi-graceful.patch
Patch31: %{orgname}-fcgi-error_log-no-newlines.patch
@@ -271,7 +272,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir %{php_sysconfdir}
# must be in sync with source. extra check ensuring that it is so is done in %%build
-%define php_api_version 20240924
+%define php_api_version 20240925
%define zend_module_api %{php_api_version}
%define zend_extension_api 4%{zend_module_api}
%define php_pdo_api_version 20240423
@@ -1789,7 +1790,7 @@ cp -p php.ini-production php.ini
%patch -P22 -p1
%patch -P23 -p1
%patch -P24 -p1 -b .zlib-for-getimagesize
-%patch -P25 -p1
+
%patch -P27 -p1
%patch -P29 -p1
%patch -P31 -p1
@@ -1876,8 +1877,8 @@ sed -i -e 's#-fvisibility=hidden##g' configure*
# fails sometimes
%{__rm} ext/sockets/tests/mcast_ipv?_recv.phpt
# causes stack exhausion
-%{__rm} Zend/tests/bug54268.phpt
-%{__rm} Zend/tests/bug68412.phpt
+%{__rm} Zend/tests/class_alias/bug54268.phpt
+%{__rm} Zend/tests/magic_methods/bug68412.phpt
# avoid issues when two builds run simultaneously
%ifarch %{x8664}
diff --git a/php-ini.patch b/php-ini.patch
index 70ef04f..b3ba62e 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -63,7 +63,7 @@
; Directory where the temporary files should be placed.
; Defaults to the system default (see sys_get_temp_dir)
-@@ -758,64 +768,6 @@
+@@ -787,70 +787,6 @@ user_dir =
; https://php.net/enable-dl
enable_dl = Off
@@ -106,6 +106,12 @@
-; https://php.net/fastcgi.impersonate
-;fastcgi.impersonate = 1
-
+-; Prevent decoding of SCRIPT_FILENAME when using Apache ProxyPass or
+-; ProxyPassMatch. This should only be used if script file paths are already
+-; stored in an encoded format on the file system.
+-; Default is 0.
+-;fastcgi.script_path_encoded = 1
+-
-; Disable logging through FastCGI connection. PHP's default behavior is to enable
-; this feature.
-;fastcgi.logging = 0
@@ -128,18 +134,20 @@
;;;;;;;;;;;;;;;;
; File Uploads ;
;;;;;;;;;;;;;;;;
-@@ -858,48 +858,7 @@ default_socket_timeout = 60
+@@ -863,49 +863,8 @@ default_socket_timeout = 60
; deprecated in a future PHP major version. So, when it is possible, please
; move to the new ('extension=<ext>) syntax.
;
-; Notes for Windows environments :
--;
++; In PLD Linux you can install appropriate php84-<extension> or php84-pecl-<extension> package.
+ ;
-; - Many DLL files are located in the ext/
-; extension folders as well as the separate PECL DLL download.
-; Be sure to appropriately set the extension_dir directive.
-;
-;extension=bz2
-;extension=curl
+-;extension=exif
-;extension=ffi
-;extension=ftp
-;extension=fileinfo
@@ -149,7 +157,6 @@
-;extension=intl
-;extension=ldap
-;extension=mbstring
--;extension=exif ; Must be after mbstring as it depends on it
-;extension=mysqli
-;extension=odbc
-;extension=openssl
@@ -174,10 +181,10 @@
-;extension=zip
-
-;zend_extension=opcache
-+; In PLD Linux you can install appropriate php84-<extension> or php84-pecl-<extension> package.
-
+-
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
+ ;;;;;;;;;;;;;;;;;;;
@@ -954,8 +867,9 @@
[Date]
@@ -231,7 +238,8 @@
; (time to live) Sets the number of second while cached file will be used
; instead of original one.
-@@ -1673,161 +1673,6 @@ ldap.max_links = -1
+
+@@ -1575,170 +1575,6 @@ ldap.max_links = -1
[dba]
;dba.default_handler=
@@ -342,6 +350,15 @@
-; SHM reset. The default "" disables file based caching.
-;opcache.file_cache=
-
+-; Enables or disables read-only mode for the second level cache directory.
+-; It should improve performance for read-only containers,
+-; when the cache is pre-warmed and packaged alongside the application.
+-; Best used with `opcache.validate_timestamps=0`, `opcache.enable_file_override=1`
+-; and `opcache.file_cache_consistency_checks=0`.
+-; Note: A cache generated with a different build of PHP, a different file path,
+-; or different settings (including which extensions are loaded), may be ignored.
+-;opcache.file_cache_read_only=0
+-
-; Enables or disables opcode caching in shared memory.
-;opcache.file_cache_only=0
-
@@ -393,4 +410,3 @@
[curl]
; A default value for the CURLOPT_CAINFO option. This is required to be an
; absolute path.
-
diff --git a/php-pldlogo.patch b/php-pldlogo.patch
index c2dfc4d..d231426 100644
--- a/php-pldlogo.patch
+++ b/php-pldlogo.patch
@@ -20,7 +20,7 @@
+
php_info_print_table_start();
php_info_print_table_row(2, "System", ZSTR_VAL(php_uname));
- php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__);
+ php_info_print_table_row(2, "Build Date", php_build_date);
--- php-5.6.0beta1/ext/standard/info.h~ 2014-04-10 08:11:48.000000000 +0300
+++ php-5.6.0beta1/ext/standard/info.h 2014-04-21 21:37:12.184288611 +0300
@@ -54,6 +54,7 @@
diff --git a/php-shared.patch b/php-shared.patch
index aae6524..3039e88 100644
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -83,18 +83,18 @@
$(BUILD_CLI)
install-cli: $(SAPI_CLI_PATH)
---- php-7.0.0RC3/sapi/phpdbg/Makefile.frag~ 2015-09-16 15:49:38.000000000 +0300
-+++ php-7.0.0RC3/sapi/phpdbg/Makefile.frag 2015-09-27 21:24:44.370536565 +0300
-@@ -2,10 +2,10 @@
+--- php-8.5.0alpha1/sapi/phpdbg/Makefile.frag~ 2025-07-01 23:58:05.000000000 +0200
++++ php-8.5.0alpha1/sapi/phpdbg/Makefile.frag 2025-07-13 01:15:43.916508349 +0200
+@@ -2,10 +2,10 @@ phpdbg: $(SAPI_PHPDBG_PATH)
- phpdbg-shared: $(BUILD_SHARED)
+ phpdbg-shared: $(SAPI_PHPDBG_SHARED_PATH)
--$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
-+$(BUILD_SHARED): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
+-$(SAPI_PHPDBG_SHARED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
++$(SAPI_PHPDBG_SHARED_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
$(BUILD_PHPDBG_SHARED)
--$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
-+$(BUILD_BINARY): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
+-$(SAPI_PHPDBG_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
++$(SAPI_PHPDBG_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
$(BUILD_PHPDBG)
%.c: %.y
diff --git a/php-stupidapache_version.patch b/php-stupidapache_version.patch
deleted file mode 100644
index f8426e3..0000000
--- a/php-stupidapache_version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- php-8.4.1/build/php.m4~ 2024-11-22 15:00:06.000000000 +0100
-+++ php-8.4.1/build/php.m4 2024-11-22 15:03:55.783321362 +0100
-@@ -2036,6 +2036,18 @@ dnl This macro is used to get a comparab
- dnl
- AC_DEFUN([PHP_AP_EXTRACT_VERSION], [m4_warn([obsolete],
- [The macro 'PHP_AP_EXTRACT_VERSION' is obsolete. Use 'apxs -q HTTPD_VERSION'])
-+ PHP_ARG_WITH(apache-version, Set Apache version,
-+ [ --with-apache-version=VERSION Set Apache version instead of detecting from httpd binary])
-+ if test "$with_apache_version" != "no"; then
-+ ac_output="foo bar baz $with_apache_version"
-+ ac_IFS=$IFS
-+IFS="- /.
-+"
-+ set $ac_output
-+ IFS=$ac_IFS
-+
-+ APACHE_VERSION=$(expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6)
-+ else
- AS_IF([test -x "$1"], [
- ac_output=$($1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//')
- ac_IFS=$IFS
-@@ -2046,6 +2058,7 @@ IFS="- /.
-
- APACHE_VERSION=$(expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6)
- ])
-+ fi
- ])
-
- dnl
diff --git a/php-systzdata.patch b/php-systzdata.patch
index 6176a8b..961f2e0 100644
--- a/php-systzdata.patch
+++ b/php-systzdata.patch
@@ -55,9 +55,9 @@ diff -up ./ext/date/config0.m4.systzdata ./ext/date/config0.m4
+ fi
+fi
+
- PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I at ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
- timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
- lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
+ PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -DHAVE_TIMELIB_CONFIG_H=1"
+ PHP_TIMELIB_CFLAGS="$PHP_DATE_CFLAGS"
+ PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I at ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
--- ./ext/date/lib/parse_tz.c.systzdata 2024-07-02 15:43:13.000000000 +0200
+++ ./ext/date/lib/parse_tz.c 2024-07-03 16:21:20.240786848 +0200
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/10eabc08bc57ba8d4d28942dccffa2a1553765c0
More information about the pld-cvs-commit
mailing list