[meta-oe,05/11] php: upgrade 8.2.20 -> 8.2.26

Message ID	20241220153629.2499631-6-peter.marko@siemens.com
State	Under Review
Headers	show Return-Path: <peter.marko@siemens.com> ip: 185.136.64.227, mailfrom: fm-256628-20241220153739cefcdc19b7e1ee6bb8-c8zfha@rts-flowmailer.siemens.com) From: Peter Marko <peter.marko@siemens.com> To: openembedded-devel@lists.openembedded.org Cc: Peter Marko <peter.marko@siemens.com> Subject: [meta-oe][PATCH 05/11] php: upgrade 8.2.20 -> 8.2.26 Date: Fri, 20 Dec 2024 16:36:23 +0100 Message-Id: <20241220153629.2499631-6-peter.marko@siemens.com> In-Reply-To: <20241220153629.2499631-1-peter.marko@siemens.com> References: <20241220153629.2499631-1-peter.marko@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Feedback-ID: 519:519-256628:519-21489:flowmailer
Series	upgrade recipes to solve CVEs \| expand [meta-oe,00/11] upgrade recipes to solve CVEs [meta-oe,01/11] opensc: upgrade 0.25.1 -> 0.26.0 [meta-oe,02/11] opensc: mark CVE-2024-8443 as fixed [meta-oe,03/11] memcached: add UPSTREAM_CHECK_URI [meta-oe,04/11] memcached: upgrade 1.6.17 -> 1.6.33 [meta-oe,05/11] php: upgrade 8.2.20 -> 8.2.26 [meta-oe,06/11] libmemcached: remove recipe for version 1.0.7 [meta-oe,07/11] libmemcached: merge inc into bb [meta-oe,08/11] libmemcached: ignore CVE-2023-27478 [meta-oe,09/11] sassc: ignore CVE-2022-43357 [meta-oe,10/11] wireshark: upgrade 4.2.8 -> 4.2.9 [meta-oe,11/11] weechat: upgrade 4.0.4 -> 4.5.0

diff --git a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch index c743697469..009d4d650f 100644 --- a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch +++ b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch @@ -247,8 +247,8 @@ index 6bf07ad3..5d645b86 100644 + have_shm_mmap_posix=yes + PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) - PHP_NEW_EXTENSION(opcache, - ZendAccelerator.c \ + AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], + [PHP_OPCACHE_CFLAGS="$PHP_OPCACHE_CFLAGS -Wno-implicit-fallthrough"],, -- 2.40.0 diff --git a/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch b/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch index 6183f49c28..2e1e752d61 100644 --- a/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch +++ b/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch @@ -31,7 +31,7 @@ index 9746ba28f3..93551d9ca7 100644 unset found AC_CHECK_LIB($2, $1, [found=yes], [ AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) -@@ -1601,8 +1599,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and +@@ -1604,8 +1602,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and dnl HAVE_library if found and adds the library to LIBS. dnl AC_DEFUN([PHP_CHECK_FUNC],[ diff --git a/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch b/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch index 9637ed9516..1aa28e2add 100644 --- a/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch +++ b/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch @@ -22,7 +22,7 @@ diff --git a/configure.ac b/configure.ac index 1eafd62a44..90c94323aa 100644 --- a/configure.ac +++ b/configure.ac -@@ -1289,7 +1289,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) +@@ -1462,7 +1462,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" diff --git a/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch b/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch index acf2940839..04bd40f4ff 100644 --- a/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch +++ b/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch @@ -18,9 +18,11 @@ Signed-off-by: Claude Bing <cbing@cybernetics.com> ext/phar/Makefile.frag | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) +diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag +index 7a867dd7..4dbcafd4 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag -@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir +@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 PHP_PHARCMD_EXECUTABLE = ` \ diff --git a/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch b/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch index 78bae58e00..a1b93a2369 100644 --- a/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch +++ b/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch @@ -16,7 +16,7 @@ diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 index 5086a312d0..0e938bd544 100644 --- a/ext/imap/config.m4 +++ b/ext/imap/config.m4 -@@ -110,7 +110,7 @@ if test "$PHP_IMAP" != "no"; then +@@ -122,7 +122,7 @@ if test "$PHP_IMAP" != "no"; then PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) AC_DEFINE(HAVE_IMAP,1,[ ]) @@ -25,7 +25,7 @@ index 5086a312d0..0e938bd544 100644 IMAP_INC_CHK() el[]IMAP_INC_CHK(/include/c-client) el[]IMAP_INC_CHK(/include/imap) -@@ -199,13 +199,7 @@ if test "$PHP_IMAP" != "no"; then +@@ -211,13 +211,7 @@ if test "$PHP_IMAP" != "no"; then AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) fi diff --git a/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch b/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch index b5a33cca7f..d329387e6c 100644 --- a/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch +++ b/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch @@ -10,9 +10,8 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> update patch to version 8.0.12 Signed-off-by: Claude Bing <cbing@cybernetics.com> ---- Upstream-Status: Pending - +--- build/Makefile.global | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch b/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch index e3b8cd4707..49fb3a5886 100644 --- a/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch +++ b/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch @@ -20,7 +20,7 @@ diff --git a/build/php.m4 b/build/php.m4 index 93551d9ca7..dba50825fb 100644 --- a/build/php.m4 +++ b/build/php.m4 -@@ -1919,7 +1919,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ +@@ -1945,7 +1945,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ unset ICONV_DIR dnl Check libc first if no path is provided in --with-iconv. diff --git a/meta-oe/recipes-devtools/php/php_8.2.20.bb b/meta-oe/recipes-devtools/php/php_8.2.26.bb similarity index 99% rename from meta-oe/recipes-devtools/php/php_8.2.20.bb rename to meta-oe/recipes-devtools/php/php_8.2.26.bb index f306b16931..f5e57ab36a 100644 --- a/meta-oe/recipes-devtools/php/php_8.2.20.bb +++ b/meta-oe/recipes-devtools/php/php_8.2.26.bb @@ -34,7 +34,7 @@ SRC_URI:append:class-target = " \ " S = "${WORKDIR}/php-${PV}" -SRC_URI[sha256sum] = "5dec6fa61c7b9c47aa1d76666be651f2642ed2bcf6cd8638c57e3571ce2aac61" +SRC_URI[sha256sum] = "be57c347d451c905bcb4336832a864d9928dd0e20989b872705fea0ba6476c6b" CVE_STATUS_GROUPS += "CVE_STATUS_PHP" CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored."

[meta-oe,05/11] php: upgrade 8.2.20 -> 8.2.26

Commit Message

Patch