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>
This commit is contained in:
Soumya Sambu
2024-05-08 11:23:29 +00:00
committed by Khem Raj
parent a69bde04be
commit 34ee1ff354
2 changed files with 13 additions and 10 deletions
@@ -1,6 +1,6 @@
From ca9b419f2c146061f73ee045cb0a069c18b40cd0 Mon Sep 17 00:00:00 2001 From 889583912ddd7abc628f2703892ec4884db6419a Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com> From: Soumya Sambu <soumya.sambu@windriver.com>
Date: Wed, 15 Dec 2021 14:00:08 +0800 Date: Tue, 7 May 2024 08:39:16 +0000
Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache
We can't use AC_TRY_RUN to run programs in a cross compile 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 update patch to version 8.1.0
Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 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 ++---------------------------------------- ext/opcache/config.m4 | 204 ++----------------------------------------
1 file changed, 8 insertions(+), 196 deletions(-) 1 file changed, 8 insertions(+), 196 deletions(-)
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 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 --- a/ext/opcache/config.m4
+++ b/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_CHECK_FUNCS([mprotect])
AC_MSG_CHECKING(for sysvipc shared memory support) AC_MSG_CHECKING(for sysvipc shared memory support)
@@ -40,7 +43,7 @@ index 2a83fa2..9471b5d 100644
-#include <unistd.h> -#include <unistd.h>
-#include <string.h> -#include <string.h>
- -
-int main() { -int main(void) {
- pid_t pid; - pid_t pid;
- int status; - int status;
- int ipc_id; - int ipc_id;
@@ -121,7 +124,7 @@ index 2a83fa2..9471b5d 100644
-# define MAP_FAILED ((void*)-1) -# define MAP_FAILED ((void*)-1)
-#endif -#endif
- -
-int main() { -int main(void) {
- pid_t pid; - pid_t pid;
- int status; - int status;
- char *shm; - char *shm;
@@ -185,7 +188,7 @@ index 2a83fa2..9471b5d 100644
-# define MAP_FAILED ((void*)-1) -# define MAP_FAILED ((void*)-1)
-#endif -#endif
- -
-int main() { -int main(void) {
- pid_t pid; - pid_t pid;
- int status; - int status;
- int fd; - int fd;
@@ -247,5 +250,5 @@ index 2a83fa2..9471b5d 100644
PHP_NEW_EXTENSION(opcache, PHP_NEW_EXTENSION(opcache,
ZendAccelerator.c \ ZendAccelerator.c \
-- --
2.17.1 2.40.0
@@ -34,7 +34,7 @@ SRC_URI:append:class-target = " \
" "
S = "${WORKDIR}/php-${PV}" S = "${WORKDIR}/php-${PV}"
SRC_URI[sha256sum] = "2658c1b8935ab6b53a7f209354602761ab07066e66920bc472b8815fd1b43f71" SRC_URI[sha256sum] = "ca0b07c254200320f518ac5b3df540a9cf14d866f3c93edc3013b52e06fac796"
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."