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 /meta-oe/recipes-devtools | |
parent | a69bde04bef65ca2603d456a2181013643af40cd (diff) | |
download | meta-openembedded-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>
Diffstat (limited to 'meta-oe/recipes-devtools')
-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 a967d6412..c74369746 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 ca9b419f2c146061f73ee045cb0a069c18b40cd0 Mon Sep 17 00:00:00 2001 | 1 | From 889583912ddd7abc628f2703892ec4884db6419a Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Soumya Sambu <soumya.sambu@windriver.com> |
3 | Date: Wed, 15 Dec 2021 14:00:08 +0800 | 3 | Date: Tue, 7 May 2024 08:39:16 +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 |
@@ -20,15 +20,18 @@ Signed-off-by: Claude Bing <cbing@cybernetics.com> | |||
20 | 20 | ||
21 | update patch to version 8.1.0 | 21 | update patch to version 8.1.0 |
22 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 22 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
23 | |||
24 | update patch to version 8.2.18 | ||
25 | Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> | ||
23 | --- | 26 | --- |
24 | ext/opcache/config.m4 | 204 ++---------------------------------------- | 27 | ext/opcache/config.m4 | 204 ++---------------------------------------- |
25 | 1 file changed, 8 insertions(+), 196 deletions(-) | 28 | 1 file changed, 8 insertions(+), 196 deletions(-) |
26 | 29 | ||
27 | diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 | 30 | diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 |
28 | index 2a83fa2..9471b5d 100644 | 31 | index 6bf07ad3..5d645b86 100644 |
29 | --- a/ext/opcache/config.m4 | 32 | --- a/ext/opcache/config.m4 |
30 | +++ b/ext/opcache/config.m4 | 33 | +++ b/ext/opcache/config.m4 |
31 | @@ -108,209 +108,21 @@ if test "$PHP_OPCACHE" != "no"; then | 34 | @@ -113,209 +113,21 @@ if test "$PHP_OPCACHE" != "no"; then |
32 | AC_CHECK_FUNCS([mprotect]) | 35 | AC_CHECK_FUNCS([mprotect]) |
33 | 36 | ||
34 | AC_MSG_CHECKING(for sysvipc shared memory support) | 37 | AC_MSG_CHECKING(for sysvipc shared memory support) |
@@ -40,7 +43,7 @@ index 2a83fa2..9471b5d 100644 | |||
40 | -#include <unistd.h> | 43 | -#include <unistd.h> |
41 | -#include <string.h> | 44 | -#include <string.h> |
42 | - | 45 | - |
43 | -int main() { | 46 | -int main(void) { |
44 | - pid_t pid; | 47 | - pid_t pid; |
45 | - int status; | 48 | - int status; |
46 | - int ipc_id; | 49 | - int ipc_id; |
@@ -121,7 +124,7 @@ index 2a83fa2..9471b5d 100644 | |||
121 | -# define MAP_FAILED ((void*)-1) | 124 | -# define MAP_FAILED ((void*)-1) |
122 | -#endif | 125 | -#endif |
123 | - | 126 | - |
124 | -int main() { | 127 | -int main(void) { |
125 | - pid_t pid; | 128 | - pid_t pid; |
126 | - int status; | 129 | - int status; |
127 | - char *shm; | 130 | - char *shm; |
@@ -185,7 +188,7 @@ index 2a83fa2..9471b5d 100644 | |||
185 | -# define MAP_FAILED ((void*)-1) | 188 | -# define MAP_FAILED ((void*)-1) |
186 | -#endif | 189 | -#endif |
187 | - | 190 | - |
188 | -int main() { | 191 | -int main(void) { |
189 | - pid_t pid; | 192 | - pid_t pid; |
190 | - int status; | 193 | - int status; |
191 | - int fd; | 194 | - int fd; |
@@ -247,5 +250,5 @@ index 2a83fa2..9471b5d 100644 | |||
247 | PHP_NEW_EXTENSION(opcache, | 250 | PHP_NEW_EXTENSION(opcache, |
248 | ZendAccelerator.c \ | 251 | ZendAccelerator.c \ |
249 | -- | 252 | -- |
250 | 2.17.1 | 253 | 2.40.0 |
251 | 254 | ||
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 1cb378fb9..da04ffba6 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 = " \ | |||
34 | " | 34 | " |
35 | 35 | ||
36 | S = "${WORKDIR}/php-${PV}" | 36 | S = "${WORKDIR}/php-${PV}" |
37 | SRC_URI[sha256sum] = "2658c1b8935ab6b53a7f209354602761ab07066e66920bc472b8815fd1b43f71" | 37 | SRC_URI[sha256sum] = "ca0b07c254200320f518ac5b3df540a9cf14d866f3c93edc3013b52e06fac796" |
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." |