From 050b46ebf5b4936b6fb41c9efa2fdd2ea0e1daa0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 26 Mar 2025 08:53:27 +0100 Subject: update to 8.3.20RC1 --- failed.txt | 8 +++----- php-8.0.0-embed.patch | 25 ------------------------- php-8.3.20-embed.patch | 25 +++++++++++++++++++++++++ php83.spec | 9 ++++++--- 4 files changed, 34 insertions(+), 33 deletions(-) delete mode 100644 php-8.0.0-embed.patch create mode 100644 php-8.3.20-embed.patch diff --git a/failed.txt b/failed.txt index f647d1f..0ef42ee 100644 --- a/failed.txt +++ b/failed.txt @@ -1,4 +1,4 @@ -===== 8.3.19 (2025-03-13) +===== 8.3.20RC1 (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/fc40x83/build.log:Tests failed : 0 /var/lib/mock/fc41a83/build.log:Tests failed : 0 /var/lib/mock/fc41x83/build.log:Tests failed : 0 -/var/lib/mock/fc42a83/build.log:Tests failed : 1 -/var/lib/mock/fc42x83/build.log:Tests failed : 1 +/var/lib/mock/fc42a83/build.log:Tests failed : 0 +/var/lib/mock/fc42x83/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.0.0-embed.patch b/php-8.0.0-embed.patch deleted file mode 100644 index 27533ea..0000000 --- a/php-8.0.0-embed.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4 ---- ./sapi/embed/config.m4.embed 2020-07-07 13:51:05.879764972 +0200 -+++ ./sapi/embed/config.m4 2020-07-07 13:52:50.128412148 +0200 -@@ -12,7 +12,8 @@ if test "$PHP_EMBED" != "no"; then - yes|shared) - LIBPHP_CFLAGS="-shared" - PHP_EMBED_TYPE=shared -- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" -+ 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)" - ;; - static) - LIBPHP_CFLAGS="-static" -diff -up ./scripts/php-config.in.embed ./scripts/php-config.in ---- ./scripts/php-config.in.embed 2020-07-07 12:54:42.000000000 +0200 -+++ ./scripts/php-config.in 2020-07-07 13:51:05.880764968 +0200 -@@ -18,7 +18,7 @@ exe_extension="@EXEEXT@" - php_cli_binary=NONE - php_cgi_binary=NONE - configure_options="@CONFIGURE_OPTIONS@" --php_sapis="@PHP_INSTALLED_SAPIS@" -+php_sapis="apache2handler litespeed fpm phpdbg @PHP_INSTALLED_SAPIS@" - ini_dir="@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@" - ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@" - diff --git a/php-8.3.20-embed.patch b/php-8.3.20-embed.patch new file mode 100644 index 0000000..1140d33 --- /dev/null +++ b/php-8.3.20-embed.patch @@ -0,0 +1,25 @@ +diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4 +--- ./sapi/embed/config.m4.embed 2025-03-26 08:07:06.692333414 +0100 ++++ ./sapi/embed/config.m4 2025-03-26 08:07:42.872879994 +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)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" ++ 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)" + ;; + static) + LIBPHP_CFLAGS="-static" +diff -up ./scripts/php-config.in.embed ./scripts/php-config.in +--- ./scripts/php-config.in.embed 2025-03-25 22:00:06.000000000 +0100 ++++ ./scripts/php-config.in 2025-03-26 08:07:06.692518461 +0100 +@@ -18,7 +18,7 @@ exe_extension="@EXEEXT@" + php_cli_binary=NONE + php_cgi_binary=NONE + configure_options="@CONFIGURE_OPTIONS@" +-php_sapis="@PHP_INSTALLED_SAPIS@" ++php_sapis="apache2handler litespeed fpm phpdbg @PHP_INSTALLED_SAPIS@" + ini_dir="@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@" + ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@" + diff --git a/php83.spec b/php83.spec index 821e5f6..3fc97d8 100644 --- a/php83.spec +++ b/php83.spec @@ -122,8 +122,8 @@ %bcond_without libgd %bcond_with zip -%global upver 8.3.19 -#global rcver RC1 +%global upver 8.3.20 +%global rcver RC1 # TODO set PHP_EXTRA_VERSION for EOL version Summary: PHP scripting language for creating dynamic web sites @@ -166,7 +166,7 @@ Source53: 20-ffi.ini # Build fixes Patch1: php-7.4.0-httpd.patch Patch5: php-7.2.0-includedir.patch -Patch6: php-8.0.0-embed.patch +Patch6: php-8.3.20-embed.patch Patch8: php-8.1.0-libdb.patch # RHEL backports Patch10: php-8.2.0-curl.patch @@ -2229,6 +2229,9 @@ fi %changelog +* Wed Mar 26 2025 Remi Collet - 8.3.20~RC1-1 +- update to 8.3.20RC1 + * Wed Mar 12 2025 Remi Collet - 8.3.19-1 - Update to 8.3.19 - http://www.php.net/releases/8_3_19.php -- cgit