diff mbox series

[meta-oe,kirkstone,1/1] nodejs: upgrade 16.19.1 -> 16.20.1

Message ID 20230711133905.1168340-1-archana.polampalli@windriver.com
State New
Headers show
Series [meta-oe,kirkstone,1/1] nodejs: upgrade 16.19.1 -> 16.20.1 | expand

Commit Message

Polampalli, Archana July 11, 2023, 1:39 p.m. UTC
Drop the gcc13.patch as it has been merged in 16.20.1
    56cbc7fdda deps: V8: cherry-pick c2792e58035f

The list of the CVEs are fixed in this relase:

    CVE-2023-30581
    CVE-2023-30585
    CVE-2023-30588
    CVE-2023-30589
    CVE-2023-30590

https://nodejs.org/en/blog/release/v16.20.0
https://nodejs.org/en/blog/release/v16.20.1

Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
---
 .../oe-npm-cache                              |  0
 ....19.bb => nodejs-oe-cache-native_16.20.bb} |  0
 .../nodejs/nodejs/gcc13.patch                 | 75 -------------------
 .../{nodejs_16.19.1.bb => nodejs_16.20.1.bb}  |  3 +-
 4 files changed, 1 insertion(+), 77 deletions(-)
 rename meta-oe/recipes-devtools/nodejs/{nodejs-oe-cache-16.19 => nodejs-oe-cache-16.20}/oe-npm-cache (100%)
 rename meta-oe/recipes-devtools/nodejs/{nodejs-oe-cache-native_16.19.bb => nodejs-oe-cache-native_16.20.bb} (100%)
 delete mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch
 rename meta-oe/recipes-devtools/nodejs/{nodejs_16.19.1.bb => nodejs_16.20.1.bb} (98%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-16.19/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-16.20/oe-npm-cache
similarity index 100%
rename from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-16.19/oe-npm-cache
rename to meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-16.20/oe-npm-cache
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_16.19.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_16.20.bb
similarity index 100%
rename from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_16.19.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_16.20.bb
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch b/meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch
deleted file mode 100644
index bff349739..000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch
+++ /dev/null
@@ -1,75 +0,0 @@ 
-From 576aed71db7b40c90b44c623580629792a606928 Mon Sep 17 00:00:00 2001
-From: Jiawen Geng <technicalcute@gmail.com>
-Date: Fri, 14 Oct 2022 09:54:33 +0800
-Subject: [PATCH] deps: V8: cherry-pick c2792e58035f
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Original commit message:
-
-    [base] Fix build with gcc-13
-
-    See https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes.
-
-    Also see Gentoo Linux bug report: https://bugs.gentoo.org/865981
-
-    Change-Id: I421f396b02ba37e12ee70048ee33e034f8113566
-    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3934140
-    Reviewed-by: Clemens Backes <clemensb@chromium.org>
-    Reviewed-by: Simon Zünd <szuend@chromium.org>
-    Commit-Queue: Clemens Backes <clemensb@chromium.org>
-    Cr-Commit-Position: refs/heads/main@{#83587}
-
-Refs: https://github.com/v8/v8/commit/c2792e58035fcbaa16d0cb70998852fbeb5df4cc
-PR-URL: https://github.com/nodejs/node/pull/44961
-Fixes: https://github.com/nodejs/node/issues/43642
-Reviewed-By: Michaël Zasso <targos@protonmail.com>
-Reviewed-By: Richard Lau <rlau@redhat.com>
-Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
-Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
-
-Upstream-Status: Backport [https://github.com/nodejs/node/commit/0be1c5728173ea9ac42843058e26b6268568acf0]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- deps/v8/AUTHORS                               | 1 +
- deps/v8/src/base/logging.h                    | 1 +
- deps/v8/src/inspector/v8-string-conversions.h | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/deps/v8/AUTHORS b/deps/v8/AUTHORS
-index 35c49a01..736d3df9 100644
---- a/deps/v8/AUTHORS
-+++ b/deps/v8/AUTHORS
-@@ -236,6 +236,7 @@ Vlad Burlik <vladbph@gmail.com>
- Vladimir Krivosheev <develar@gmail.com>
- Vladimir Shutoff <vovan@shutoff.ru>
- Wael Almattar <waelsy123@gmail.com>
-+WANG Xuerui <git@xen0n.name>
- Wei Wu <lazyparser@gmail.com>
- Wenlu Wang <kingwenlu@gmail.com>
- Wenyu Zhao <wenyu.zhao@anu.edu.au>
-diff --git a/deps/v8/src/base/logging.h b/deps/v8/src/base/logging.h
-index 08db24a9..38be165f 100644
---- a/deps/v8/src/base/logging.h
-+++ b/deps/v8/src/base/logging.h
-@@ -5,6 +5,7 @@
- #ifndef V8_BASE_LOGGING_H_
- #define V8_BASE_LOGGING_H_
- 
-+#include <cstdint>
- #include <cstring>
- #include <sstream>
- #include <string>
-diff --git a/deps/v8/src/inspector/v8-string-conversions.h b/deps/v8/src/inspector/v8-string-conversions.h
-index c1d69c18..eb33c681 100644
---- a/deps/v8/src/inspector/v8-string-conversions.h
-+++ b/deps/v8/src/inspector/v8-string-conversions.h
-@@ -5,6 +5,7 @@
- #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
- #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
- 
-+#include <cstdint>
- #include <string>
- 
- // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_16.19.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_16.20.1.bb
similarity index 98%
rename from meta-oe/recipes-devtools/nodejs/nodejs_16.19.1.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs_16.20.1.bb
index dfc4af3df..fe59854d5 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_16.19.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_16.20.1.bb
@@ -26,7 +26,6 @@  SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
            file://0001-liftoff-Correct-function-signatures.patch \
            file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \
            file://0001-Nodejs-Fixed-pipes-DeprecationWarning.patch \
-           file://gcc13.patch \
            "
 SRC_URI:append:class-target = " \
            file://0001-Using-native-binaries.patch \
@@ -37,7 +36,7 @@  SRC_URI:append:toolchain-clang:x86 = " \
 SRC_URI:append:toolchain-clang:powerpc64le = " \
            file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \
            "
-SRC_URI[sha256sum] = "17fb716406198125b30c94dd3d1756207b297705626afe16d8dc479a65a1d8b5"
+SRC_URI[sha256sum] = "83e03381e271f1a5619188e7aea9d85d9b7e12f5be2a28ceb78d7249ed22b7f1"
 
 S = "${WORKDIR}/node-v${PV}"