php: upgrade 8.2.20 -> 8.2.26

Solves dozens of vulnerabilities. See
https://php.watch/versions/8.2/releases/8.2.21
https://php.watch/versions/8.2/releases/8.2.22
https://php.watch/versions/8.2/releases/8.2.23
https://php.watch/versions/8.2/releases/8.2.24
https://php.watch/versions/8.2/releases/8.2.25
https://php.watch/versions/8.2/releases/8.2.26

Removes CVE-2024-11233, CVE-2024-11234 and CVE-2024-11236 from
current cve metrics.

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Peter Marko
2024-12-20 16:36:23 +01:00
committed by Khem Raj
parent fdbec64d99
commit eea7188a24
8 changed files with 12 additions and 11 deletions
@@ -247,8 +247,8 @@ index 6bf07ad3..5d645b86 100644
+ have_shm_mmap_posix=yes + have_shm_mmap_posix=yes
+ PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) + PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
PHP_NEW_EXTENSION(opcache, AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
ZendAccelerator.c \ [PHP_OPCACHE_CFLAGS="$PHP_OPCACHE_CFLAGS -Wno-implicit-fallthrough"],,
-- --
2.40.0 2.40.0
@@ -31,7 +31,7 @@ index 9746ba28f3..93551d9ca7 100644
unset found unset found
AC_CHECK_LIB($2, $1, [found=yes], [ AC_CHECK_LIB($2, $1, [found=yes], [
AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) 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 HAVE_library if found and adds the library to LIBS.
dnl dnl
AC_DEFUN([PHP_CHECK_FUNC],[ AC_DEFUN([PHP_CHECK_FUNC],[
@@ -22,7 +22,7 @@ diff --git a/configure.ac b/configure.ac
index 1eafd62a44..90c94323aa 100644 index 1eafd62a44..90c94323aa 100644
--- a/configure.ac --- a/configure.ac
+++ b/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="$EXTRA_LDFLAGS $PHP_LDFLAGS"
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
@@ -18,9 +18,11 @@ Signed-off-by: Claude Bing <cbing@cybernetics.com>
ext/phar/Makefile.frag | 17 +++-------------- ext/phar/Makefile.frag | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-) 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 --- a/ext/phar/Makefile.frag
+++ b/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_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
PHP_PHARCMD_EXECUTABLE = ` \ PHP_PHARCMD_EXECUTABLE = ` \
@@ -16,7 +16,7 @@ diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index 5086a312d0..0e938bd544 100644 index 5086a312d0..0e938bd544 100644
--- a/ext/imap/config.m4 --- a/ext/imap/config.m4
+++ b/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) PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
AC_DEFINE(HAVE_IMAP,1,[ ]) AC_DEFINE(HAVE_IMAP,1,[ ])
@@ -25,7 +25,7 @@ index 5086a312d0..0e938bd544 100644
IMAP_INC_CHK() IMAP_INC_CHK()
el[]IMAP_INC_CHK(/include/c-client) el[]IMAP_INC_CHK(/include/c-client)
el[]IMAP_INC_CHK(/include/imap) 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.) AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
fi fi
@@ -10,9 +10,8 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
update patch to version 8.0.12 update patch to version 8.0.12
Signed-off-by: Claude Bing <cbing@cybernetics.com> Signed-off-by: Claude Bing <cbing@cybernetics.com>
---
Upstream-Status: Pending Upstream-Status: Pending
---
build/Makefile.global | 2 +- build/Makefile.global | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -20,7 +20,7 @@ diff --git a/build/php.m4 b/build/php.m4
index 93551d9ca7..dba50825fb 100644 index 93551d9ca7..dba50825fb 100644
--- a/build/php.m4 --- a/build/php.m4
+++ b/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 unset ICONV_DIR
dnl Check libc first if no path is provided in --with-iconv. dnl Check libc first if no path is provided in --with-iconv.
@@ -34,7 +34,7 @@ SRC_URI:append:class-target = " \
" "
S = "${WORKDIR}/php-${PV}" S = "${WORKDIR}/php-${PV}"
SRC_URI[sha256sum] = "5dec6fa61c7b9c47aa1d76666be651f2642ed2bcf6cd8638c57e3571ce2aac61" SRC_URI[sha256sum] = "be57c347d451c905bcb4336832a864d9928dd0e20989b872705fea0ba6476c6b"
CVE_STATUS_GROUPS += "CVE_STATUS_PHP" 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." 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."