diff options
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_8.4.6.bb (renamed from meta-oe/recipes-devtools/php/php_8.4.5.bb) | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch b/meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch index 46505cd329..745bc2140d 100644 --- a/meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch +++ b/meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | From 35ac74fce1a60025f8d126783b8aa7014eefdf53 Mon Sep 17 00:00:00 2001 | 1 | From d9fc6b314cefe010a0deb6e591719cfb0ff226a5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Claude Bing <cbing@cybernetics.com> | 2 | From: Claude Bing <cbing@cybernetics.com> |
| 3 | Date: Tue, 9 Nov 2021 13:10:33 -0500 | 3 | Date: Tue, 9 Nov 2021 13:10:33 -0500 |
| 4 | Subject: [PATCH 3/5] iconv: fix detection | 4 | Subject: [PATCH] iconv: fix detection |
| 5 | 5 | ||
| 6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
| 7 | 7 | ||
| @@ -20,10 +20,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
| 20 | 1 file changed, 2 insertions(+), 1 deletion(-) | 20 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 21 | 21 | ||
| 22 | diff --git a/build/php.m4 b/build/php.m4 | 22 | diff --git a/build/php.m4 b/build/php.m4 |
| 23 | index e45b22b76..1bd3ccceb 100644 | 23 | index d8a5cbf0..aee21924 100644 |
| 24 | --- a/build/php.m4 | 24 | --- a/build/php.m4 |
| 25 | +++ b/build/php.m4 | 25 | +++ b/build/php.m4 |
| 26 | @@ -1820,7 +1820,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ | 26 | @@ -1829,7 +1829,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ |
| 27 | [Define to 1 if you have the 'libiconv' function.]) | 27 | [Define to 1 if you have the 'libiconv' function.]) |
| 28 | 28 | ||
| 29 | dnl Check libc first if no path is provided in --with-iconv. | 29 | dnl Check libc first if no path is provided in --with-iconv. |
| @@ -33,6 +33,3 @@ index e45b22b76..1bd3ccceb 100644 | |||
| 33 | dnl Reset LIBS temporarily as it may have already been included -liconv in. | 33 | dnl Reset LIBS temporarily as it may have already been included -liconv in. |
| 34 | LIBS_save=$LIBS | 34 | LIBS_save=$LIBS |
| 35 | LIBS= | 35 | LIBS= |
| 36 | -- | ||
| 37 | 2.25.1 | ||
| 38 | |||
diff --git a/meta-oe/recipes-devtools/php/php_8.4.5.bb b/meta-oe/recipes-devtools/php/php_8.4.6.bb index cf4b756b85..5629a3dd3d 100644 --- a/meta-oe/recipes-devtools/php/php_8.4.5.bb +++ b/meta-oe/recipes-devtools/php/php_8.4.6.bb | |||
| @@ -29,7 +29,7 @@ SRC_URI:append:class-target = " \ | |||
| 29 | 29 | ||
| 30 | S = "${WORKDIR}/php-${PV}" | 30 | S = "${WORKDIR}/php-${PV}" |
| 31 | 31 | ||
| 32 | SRC_URI[sha256sum] = "9378c78887d0cd7462fc5c17f2de30c852f20f79d28795e2573fe3250d39436e" | 32 | SRC_URI[sha256sum] = "9cf2734509b603f6589617ab52a9712a03e0fe059951cddd2d4623df4bf7c6c6" |
| 33 | 33 | ||
| 34 | CVE_STATUS_GROUPS += "CVE_STATUS_PHP" | 34 | CVE_STATUS_GROUPS += "CVE_STATUS_PHP" |
| 35 | 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." | 35 | 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." |
