summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec46
1 files changed, 25 insertions, 21 deletions
diff --git a/php.spec b/php.spec
index 7edc381..8be66fb 100644
--- a/php.spec
+++ b/php.spec
@@ -23,15 +23,15 @@
%endif
# API/ABI check
-%global apiver 20240924
-%global zendver 20240924
+%global apiver 20240925
+%global zendver 20240925
%global pdover 20240423
# Adds -z now to the linker flags
%global _hardened_build 1
# version used for php embedded library soname
-%global embed_version 8.4
+%global embed_version 8.5
# Ugly hack. Harcoded values to avoid relocation.
%global _httpd_mmn %(cat %{_root_includedir}/httpd/.mmn 2>/dev/null || echo 0)
@@ -88,18 +88,19 @@
%bcond_with openssl32
%endif
-%global gh_commit 9ce6980b4d93d539341807087abef9217cb81351
+%global gh_commit c9249e2d3aa401bda5d9a3071e86e0594807ed00
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-#global gh_date 20230605
+%global gh_date 20250630
%global gh_owner php
%global gh_project php-src
-%global upver 8.4.9
-%global rcver RC1
+%global upver 8.5.0
+%global rcver -dev
+%global lowrc DEV
# TODO set PHP_EXTRA_VERSION for EOL version
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
-Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
+Version: %{upver}%{?lowrc:~%{lowrc}}%{?gh_date:.%{gh_date}}
Release: 1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -136,19 +137,19 @@ Source53: 20-ffi.ini
# Build fixes
Patch1: php-8.4.0-httpd.patch
Patch5: php-8.4.0-includedir.patch
-Patch6: php-8.4.6-embed.patch
+Patch6: php-8.5.0-embed.patch
Patch8: php-8.4.0-libdb.patch
# Functional changes
# Use system nikic/php-parser
-Patch41: php-8.3.3-parser.patch
+Patch41: php-8.5.0-parser.patch
# use system tzdata
-Patch43: php-8.4.0-systzdata-v24.patch
+Patch43: php-8.5.0-systzdata-v24.patch
# See http://bugs.php.net/53436
# + display PHP version backported from 8.4
Patch44: php-8.4.0-phpize.patch
# Use -lldap_r for OpenLDAP
-Patch45: php-8.4.0-ldap_r.patch
+Patch45: php-8.5.0-ldap_r.patch
# Ignore unsupported "threads" option on password_hash
Patch46: php-8.0.7-argon2.patch
# drop "Configure command" from phpinfo output
@@ -156,7 +157,7 @@ Patch46: php-8.0.7-argon2.patch
Patch47: php-8.4.0-phpinfo.patch
# Always warn about missing curve_name
# Both Fedora and RHEL do not support arbitrary EC parameters
-Patch48: php-8.3.0-openssl-ec-param.patch
+Patch48: php-8.5.0-openssl-ec-param.patch
# RC Patch
@@ -359,6 +360,7 @@ Provides: %{?scl_prefix}php-filter, %{?scl_prefix}php-filter%{?_isa}
Provides: %{?scl_prefix}php-ftp, %{?scl_prefix}php-ftp%{?_isa}
Provides: %{?scl_prefix}php-gettext, %{?scl_prefix}php-gettext%{?_isa}
Provides: %{?scl_prefix}php-hash, %{?scl_prefix}php-hash%{?_isa}
+Provides: %{?scl_prefix}php-lexbor, %{?scl_prefix}php-lexbor%{?_isa}
Provides: %{?scl_prefix}php-mhash = %{version}, %{?scl_prefix}php-mhash%{?_isa} = %{version}
Provides: %{?scl_prefix}php-iconv, %{?scl_prefix}php-iconv%{?_isa}
Obsoletes: %{?scl_prefix}php-json < 8.0.0
@@ -374,6 +376,7 @@ Provides: %{?scl_prefix}php-sockets, %{?scl_prefix}php-sockets%{?_isa}
Provides: %{?scl_prefix}php-spl, %{?scl_prefix}php-spl%{?_isa}
Provides: %{?scl_prefix}php-standard = %{version}, %{?scl_prefix}php-standard%{?_isa} = %{version}
Provides: %{?scl_prefix}php-tokenizer, %{?scl_prefix}php-tokenizer%{?_isa}
+Provides: %{?scl_prefix}php-uri, %{?scl_prefix}php-uri%{?_isa}
Provides: %{?scl_prefix}php-zlib, %{?scl_prefix}php-zlib%{?_isa}
%{?scl:Requires: %{scl}-runtime}
@@ -399,7 +402,7 @@ Requires: openssl-devel%{?_isa} >= 1.0.2
Requires: pcre2-devel%{?_isa} >= 10.30
%endif
Requires: zlib-devel%{?_isa}
-Recommends: php-nikic-php-parser5 >= 5.0.0
+Recommends: php-nikic-php-parser5 >= 5.5.0
%description devel
The %{?scl_prefix}php-devel package contains the files needed for building PHP
@@ -905,13 +908,8 @@ rm ext/date/tests/bug73837.phpt
rm ext/sockets/tests/mcast_ipv?_recv.phpt
# Should be skipped but fails sometime
rm ext/standard/tests/file/file_get_contents_error001.phpt
-# cause stack exhausion
-rm Zend/tests/bug54268.phpt
-rm Zend/tests/bug68412.phpt
# slow and erratic result
rm sapi/cli/tests/upload_2G.phpt
-# tar issue
-rm ext/zlib/tests/004-mb.phpt
# Both Fedora and RHEL do not support arbitrary EC parameters
# https://bugzilla.redhat.com/2223953
rm ext/openssl/tests/ecc_custom_params.phpt
@@ -1592,8 +1590,8 @@ fi
%attr(770,apache,root) %dir %{_localstatedir}/log/php-fpm
%dir %{_localstatedir}/run/php-fpm
%{_mandir}/man8/php-fpm.8*
-%dir %{_datadir}/fpm
-%{_datadir}/fpm/status.html
+%dir %{_datadir}/php/fpm
+%{_datadir}/php/fpm/status.html
%if %{with lsws}
%files litespeed
@@ -1654,6 +1652,12 @@ fi
%changelog
+* Mon Jun 30 2025 Remi Collet <remi@remirepo.net> - 8.5.0~DEV.20240630-1
+- update to 8.5.0-dev
+- dump ABI/API to 20240925
+- add lexbor and uri extension (always static)
+- move /usr/share/fpm/status.html to /usr/share/php/fpm/status.html
+
* Wed Jun 18 2025 Remi Collet <remi@remirepo.net> - 8.4.9~RC1-1
- Update to 8.4.9RC1