diff options
author | Yogita Urade <yogita.urade@windriver.com> | 2024-11-26 04:40:52 +0000 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2024-12-15 13:53:05 -0500 |
commit | 96d9f031ba22958e416b31278d5cd043863c8b3b (patch) | |
tree | 4e65f6ef68b77f2989b01739eedd456e6ecc9ca6 | |
parent | 0f98d98e82882a06adf24fbc1a628cfaf2268ba1 (diff) | |
download | meta-openembedded-96d9f031ba22958e416b31278d5cd043863c8b3b.tar.gz |
php: upgrade 8.2.20 -> 8.2.24
Includes fix for CVE-2024-8925, CVE-2024-8926, CVE-2024-8927
and CVE-2024-9026
Changelog:
https://www.php.net/ChangeLog-8.php#8.2.24
Rebase 0001-ext-opcache-config.m4-enable-opcache.patch to new version
Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch | 15 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php_8.2.24.bb (renamed from meta-oe/recipes-devtools/php/php_8.2.20.bb) | 2 |
2 files changed, 10 insertions, 7 deletions
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..496213540b 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 | |||
@@ -1,6 +1,6 @@ | |||
1 | From 889583912ddd7abc628f2703892ec4884db6419a Mon Sep 17 00:00:00 2001 | 1 | From aa99f9db92817358d6b91040cc555f5ca31b727c Mon Sep 17 00:00:00 2001 |
2 | From: Soumya Sambu <soumya.sambu@windriver.com> | 2 | From: Yogita Urade <yogita.urade@windriver.com> |
3 | Date: Tue, 7 May 2024 08:39:16 +0000 | 3 | Date: Mon, 25 Nov 2024 07:07:38 +0000 |
4 | Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache | 4 | Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache |
5 | 5 | ||
6 | We can't use AC_TRY_RUN to run programs in a cross compile | 6 | We can't use AC_TRY_RUN to run programs in a cross compile |
@@ -23,12 +23,15 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
23 | 23 | ||
24 | update patch to version 8.2.18 | 24 | update patch to version 8.2.18 |
25 | Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> | 25 | Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> |
26 | |||
27 | update patch to version 8.2.24 | ||
28 | Signed-off-by: Yogita Urade <yogita.urade@windriver.com> | ||
26 | --- | 29 | --- |
27 | ext/opcache/config.m4 | 204 ++---------------------------------------- | 30 | ext/opcache/config.m4 | 204 ++---------------------------------------- |
28 | 1 file changed, 8 insertions(+), 196 deletions(-) | 31 | 1 file changed, 8 insertions(+), 196 deletions(-) |
29 | 32 | ||
30 | diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 | 33 | diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 |
31 | index 6bf07ad3..5d645b86 100644 | 34 | index b3929382..ba1a9aff 100644 |
32 | --- a/ext/opcache/config.m4 | 35 | --- a/ext/opcache/config.m4 |
33 | +++ b/ext/opcache/config.m4 | 36 | +++ b/ext/opcache/config.m4 |
34 | @@ -113,209 +113,21 @@ if test "$PHP_OPCACHE" != "no"; then | 37 | @@ -113,209 +113,21 @@ if test "$PHP_OPCACHE" != "no"; then |
@@ -247,8 +250,8 @@ index 6bf07ad3..5d645b86 100644 | |||
247 | + have_shm_mmap_posix=yes | 250 | + have_shm_mmap_posix=yes |
248 | + PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) | 251 | + PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) |
249 | 252 | ||
250 | PHP_NEW_EXTENSION(opcache, | 253 | AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], |
251 | ZendAccelerator.c \ | 254 | [PHP_OPCACHE_CFLAGS="$PHP_OPCACHE_CFLAGS -Wno-implicit-fallthrough"],, |
252 | -- | 255 | -- |
253 | 2.40.0 | 256 | 2.40.0 |
254 | 257 | ||
diff --git a/meta-oe/recipes-devtools/php/php_8.2.20.bb b/meta-oe/recipes-devtools/php/php_8.2.24.bb index f807f67a23..034f3bef17 100644 --- a/meta-oe/recipes-devtools/php/php_8.2.20.bb +++ b/meta-oe/recipes-devtools/php/php_8.2.24.bb | |||
@@ -34,7 +34,7 @@ SRC_URI:append:class-target = " \ | |||
34 | " | 34 | " |
35 | 35 | ||
36 | S = "${WORKDIR}/php-${PV}" | 36 | S = "${WORKDIR}/php-${PV}" |
37 | SRC_URI[sha256sum] = "5dec6fa61c7b9c47aa1d76666be651f2642ed2bcf6cd8638c57e3571ce2aac61" | 37 | SRC_URI[sha256sum] = "4cc76ec644eee97d17c92bfe8d0e84714fedf299a538b7dfadc0639dd0dc432f" |
38 | 38 | ||
39 | CVE_STATUS_GROUPS += "CVE_STATUS_PHP" | 39 | CVE_STATUS_GROUPS += "CVE_STATUS_PHP" |
40 | 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." | 40 | 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." |