diff options
| -rw-r--r-- | failed.txt | 2 | ||||
| -rw-r--r-- | php-7.2.0-includedir.patch | 11 | ||||
| -rw-r--r-- | php-8.4.0-httpd.patch | 8 | ||||
| -rw-r--r-- | php-8.4.0-includedir.patch | 11 | ||||
| -rw-r--r-- | php-8.4.0-libdb.patch (renamed from php-8.1.0-libdb.patch) | 38 | ||||
| -rw-r--r-- | php.spec | 14 |
6 files changed, 52 insertions, 32 deletions
@@ -1,4 +1,4 @@ -===== 8.4.0beta4 (2024-08-29) +===== 8.4.0beta5 (2024-09-12) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log diff --git a/php-7.2.0-includedir.patch b/php-7.2.0-includedir.patch deleted file mode 100644 index 7a42cd6..0000000 --- a/php-7.2.0-includedir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-7.2.0/configure.ac.includedir -+++ php-7.2.0/configure.ac -@@ -1230,7 +1230,7 @@ - EXPANDED_DATADIR=$datadir - EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` - EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` --INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR -+INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php:/usr/share/pear:/usr/share/php - - exec_prefix=$old_exec_prefix - libdir=$old_libdir diff --git a/php-8.4.0-httpd.patch b/php-8.4.0-httpd.patch index d40b453..227468c 100644 --- a/php-8.4.0-httpd.patch +++ b/php-8.4.0-httpd.patch @@ -7,13 +7,13 @@ mod_php is build twice diff -up ./sapi/apache2handler/config.m4.mpmcheck ./sapi/apache2handler/config.m4 --- ./sapi/apache2handler/config.m4.mpmcheck 2024-07-03 15:56:56.882370597 +0200 +++ ./sapi/apache2handler/config.m4 2024-07-03 15:59:15.967824949 +0200 -@@ -106,11 +106,6 @@ if test "$PHP_APXS2" != "no"; then - [mod_php.c sapi_apache2.c apache_config.c php_functions.c], - [$APACHE_CFLAGS]) +@@ -120,11 +120,6 @@ if test "$PHP_APXS2" != "no"; then + -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 + ]) - AS_IF([$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1], [ - APACHE_THREADED_MPM=yes -- PHP_BUILD_THREAD_SAFE +- enable_zts=yes - ], [APACHE_THREADED_MPM=no]) - AC_CONFIG_COMMANDS([apache2handler], [AS_VAR_IF([enable_zts], [yes],, diff --git a/php-8.4.0-includedir.patch b/php-8.4.0-includedir.patch new file mode 100644 index 0000000..8d3fcff --- /dev/null +++ b/php-8.4.0-includedir.patch @@ -0,0 +1,11 @@ +--- ./configure.ac.includedir ++++ ./configure.ac +@@ -1368,7 +1368,7 @@ + EXPANDED_DATADIR=$datadir + EXPANDED_PHP_CONFIG_FILE_PATH=$(eval echo "$PHP_CONFIG_FILE_PATH") + EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=$(eval echo "$PHP_CONFIG_FILE_SCAN_DIR") +-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR ++INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php:/usr/share/pear:/usr/share/php + + exec_prefix=$old_exec_prefix + libdir=$old_libdir diff --git a/php-8.1.0-libdb.patch b/php-8.4.0-libdb.patch index 7a2a097..af7add0 100644 --- a/php-8.1.0-libdb.patch +++ b/php-8.4.0-libdb.patch @@ -1,10 +1,10 @@ diff -up ./ext/dba/config.m4.libdb ./ext/dba/config.m4 --- ./ext/dba/config.m4.libdb 2020-04-09 14:06:11.000000000 +0200 +++ ./ext/dba/config.m4 2020-04-09 14:35:08.208605065 +0200 -@@ -375,61 +375,13 @@ if test "$PHP_DB4" != "no"; then - dbdp4="/usr/local/BerkeleyDB.4." - dbdp5="/usr/local/BerkeleyDB.5." - for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do +@@ -421,55 +421,7 @@ if test "$PHP_DB4" != "no"; then + /usr/local \ + /usr \ + ; do - if test -f "$i/db5/db.h"; then - THIS_PREFIX=$i - THIS_INCLUDE=$i/db5/db.h @@ -58,17 +58,31 @@ diff -up ./ext/dba/config.m4.libdb ./ext/dba/config.m4 THIS_PREFIX=$i THIS_INCLUDE=$i/include/db.h break - fi +@@ -477,20 +429,6 @@ if test "$PHP_DB4" != "no"; then done -- PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) -+ PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) - fi - PHP_DBA_STD_RESULT(db4,Berkeley DB4) - + PHP_DBA_DB_CHECK([4], + [ +- db-5.3 +- db-5.1 +- db-5.0 +- db-4.8 +- db-4.7 +- db-4.6 +- db-4.5 +- db-4.4 +- db-4.3 +- db-4.2 +- db-4.1 +- db-4.0 +- db-4 +- db4 + db + ], + [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) diff -up ./ext/dba/dba.c.libdb ./ext/dba/dba.c --- ./ext/dba/dba.c.libdb 2020-04-09 14:06:11.000000000 +0200 +++ ./ext/dba/dba.c 2020-04-09 14:36:30.593275190 +0200 -@@ -50,6 +50,10 @@ +@@ -49,6 +49,10 @@ #include "php_lmdb.h" #include "dba_arginfo.h" @@ -79,7 +93,7 @@ diff -up ./ext/dba/dba.c.libdb ./ext/dba/dba.c PHP_MINIT_FUNCTION(dba); PHP_MSHUTDOWN_FUNCTION(dba); PHP_MINFO_FUNCTION(dba); -@@ -452,6 +456,10 @@ PHP_MINFO_FUNCTION(dba) +@@ -444,6 +448,10 @@ PHP_MINFO_FUNCTION(dba) php_info_print_table_start(); php_info_print_table_row(2, "DBA support", "enabled"); @@ -84,13 +84,13 @@ %global gh_owner php %global gh_project php-src %global upver 8.4.0 -%global rcver beta4 +%global rcver beta5 # 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}} -Release: 2%{?dist} +Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -125,9 +125,9 @@ Source53: 20-ffi.ini # Build fixes Patch1: php-8.4.0-httpd.patch -Patch5: php-7.2.0-includedir.patch +Patch5: php-8.4.0-includedir.patch Patch6: php-8.4.0-embed.patch -Patch8: php-8.1.0-libdb.patch +Patch8: php-8.4.0-libdb.patch # Functional changes # Use system nikic/php-parser @@ -1047,6 +1047,9 @@ ln -sf ../configure --with-exec-dir=%{_bindir} \ --without-gdbm \ --with-openssl \ +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 + --with-openssl-argon2 \ +%endif --with-system-ciphers \ %if %{with libpcre} --with-external-pcre \ @@ -1649,6 +1652,9 @@ fi %changelog +* Wed Sep 11 2024 Remi Collet <remi@remirepo.net> - 8.4.0~beta5-1 +- Update to 8.4.0beta5 + * Fri Aug 30 2024 Remi Collet <remi@remirepo.net> - 8.4.0~beta4-2 - use ICU 74.2 |