diff options
| author |   Soumya Sambu <soumya.sambu@windriver.com> | 2024-05-08 11:23:29 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2024-05-12 08:43:17 -0700 |
| commit | 34ee1ff3547cf7d01a2bcd960720cd8bd8515d56 (patch) | |
| tree | bd181b70c70ca3ea272a7b7a2a1a6aa7116fc079 | |
| parent | a69bde04bef65ca2603d456a2181013643af40cd (diff) | |
| download | meta-openembedded-contrib-34ee1ff3547cf7d01a2bcd960720cd8bd8515d56.tar.gz | |
php: Upgrade to 8.2.18
Includes fixes for CVE-2024-3096, CVE-2024-2756 and other bugs.
Changelog:
https://www.php.net/ChangeLog-8.php#8.2.18
Rebase 0001-ext-opcache-config.m4-enable-opcache.patch to new version
Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch | 21 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_8.2.18.bb (renamed from meta-oe/recipes-devtools/php/php_8.2.16.bb) | 2 |
2 files changed, 13 insertions, 10 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 a967d64120..c743697469 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 @@ -From ca9b419f2c146061f73ee045cb0a069c18b40cd0 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Wed, 15 Dec 2021 14:00:08 +0800 +From 889583912ddd7abc628f2703892ec4884db6419a Mon Sep 17 00:00:00 2001 +From: Soumya Sambu <soumya.sambu@windriver.com> +Date: Tue, 7 May 2024 08:39:16 +0000 Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache We can't use AC_TRY_RUN to run programs in a cross compile @@ -20,15 +20,18 @@ Signed-off-by: Claude Bing <cbing@cybernetics.com> update patch to version 8.1.0 Signed-off-by: Mingli Yu <mingli.yu@windriver.com> + +update patch to version 8.2.18 +Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> --- ext/opcache/config.m4 | 204 ++---------------------------------------- 1 file changed, 8 insertions(+), 196 deletions(-) diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index 2a83fa2..9471b5d 100644 +index 6bf07ad3..5d645b86 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 -@@ -108,209 +108,21 @@ if test "$PHP_OPCACHE" != "no"; then +@@ -113,209 +113,21 @@ if test "$PHP_OPCACHE" != "no"; then AC_CHECK_FUNCS([mprotect]) AC_MSG_CHECKING(for sysvipc shared memory support) @@ -40,7 +43,7 @@ index 2a83fa2..9471b5d 100644 -#include <unistd.h> -#include <string.h> - --int main() { +-int main(void) { - pid_t pid; - int status; - int ipc_id; @@ -121,7 +124,7 @@ index 2a83fa2..9471b5d 100644 -# define MAP_FAILED ((void*)-1) -#endif - --int main() { +-int main(void) { - pid_t pid; - int status; - char *shm; @@ -185,7 +188,7 @@ index 2a83fa2..9471b5d 100644 -# define MAP_FAILED ((void*)-1) -#endif - --int main() { +-int main(void) { - pid_t pid; - int status; - int fd; @@ -247,5 +250,5 @@ index 2a83fa2..9471b5d 100644 PHP_NEW_EXTENSION(opcache, ZendAccelerator.c \ -- -2.17.1 +2.40.0 diff --git a/meta-oe/recipes-devtools/php/php_8.2.16.bb b/meta-oe/recipes-devtools/php/php_8.2.18.bb index 1cb378fb94..da04ffba62 100644 --- a/meta-oe/recipes-devtools/php/php_8.2.16.bb +++ b/meta-oe/recipes-devtools/php/php_8.2.18.bb @@ -34,7 +34,7 @@ SRC_URI:append:class-target = " \ " S = "${WORKDIR}/php-${PV}" -SRC_URI[sha256sum] = "2658c1b8935ab6b53a7f209354602761ab07066e66920bc472b8815fd1b43f71" +SRC_URI[sha256sum] = "ca0b07c254200320f518ac5b3df540a9cf14d866f3c93edc3013b52e06fac796" 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." |