diff mbox series

[meta-oe,14/31] php: upgrade 8.4.5 -> 8.4.6

Message ID 1744794136-908-14-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-oe,01/31] adw-gtk3: upgrade 5.7 -> 5.8 | expand

Commit Message

Mingyu Wang (Fujitsu) April 16, 2025, 9:01 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0003-iconv-fix-detection.patch
refreshed for 8.4.6

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../php/php/0003-iconv-fix-detection.patch            | 11 ++++-------
 .../php/{php_8.4.5.bb => php_8.4.6.bb}                |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)
 rename meta-oe/recipes-devtools/php/{php_8.4.5.bb => php_8.4.6.bb} (99%)
diff mbox series

Patch

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 @@ 
-From 35ac74fce1a60025f8d126783b8aa7014eefdf53 Mon Sep 17 00:00:00 2001
+From d9fc6b314cefe010a0deb6e591719cfb0ff226a5 Mon Sep 17 00:00:00 2001
 From: Claude Bing <cbing@cybernetics.com>
 Date: Tue, 9 Nov 2021 13:10:33 -0500
-Subject: [PATCH 3/5] iconv: fix detection
+Subject: [PATCH] iconv: fix detection
 
 Upstream-Status: Pending
 
@@ -20,10 +20,10 @@  Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/build/php.m4 b/build/php.m4
-index e45b22b76..1bd3ccceb 100644
+index d8a5cbf0..aee21924 100644
 --- a/build/php.m4
 +++ b/build/php.m4
-@@ -1820,7 +1820,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
+@@ -1829,7 +1829,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
      [Define to 1 if you have the 'libiconv' function.])
  
    dnl Check libc first if no path is provided in --with-iconv.
@@ -33,6 +33,3 @@  index e45b22b76..1bd3ccceb 100644
      dnl Reset LIBS temporarily as it may have already been included -liconv in.
      LIBS_save=$LIBS
      LIBS=
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-devtools/php/php_8.4.5.bb b/meta-oe/recipes-devtools/php/php_8.4.6.bb
similarity index 99%
rename from meta-oe/recipes-devtools/php/php_8.4.5.bb
rename to meta-oe/recipes-devtools/php/php_8.4.6.bb
index 7c7c425d3d..1b8c019a5d 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 = " \
 
 S = "${WORKDIR}/php-${PV}"
 
-SRC_URI[sha256sum] = "9378c78887d0cd7462fc5c17f2de30c852f20f79d28795e2573fe3250d39436e"
+SRC_URI[sha256sum] = "9cf2734509b603f6589617ab52a9712a03e0fe059951cddd2d4623df4bf7c6c6"
 
 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."