From 8d90ed931310ab4c098e6b591d12f0387decc750 Mon Sep 17 00:00:00 2001 From: cherry530 Date: Tue, 1 Mar 2022 15:35:01 +0800 Subject: [PATCH] Fix missing patches due to different arch Signed-off-by: cherry530 --- ...nEuler-aarch64-v8_os_page_size-to-64.patch | 25 --------------- nodejs.spec | 32 +++++++++---------- 2 files changed, 16 insertions(+), 41 deletions(-) delete mode 100644 0003-Modify-openEuler-aarch64-v8_os_page_size-to-64.patch diff --git a/0003-Modify-openEuler-aarch64-v8_os_page_size-to-64.patch b/0003-Modify-openEuler-aarch64-v8_os_page_size-to-64.patch deleted file mode 100644 index 5542230..0000000 --- a/0003-Modify-openEuler-aarch64-v8_os_page_size-to-64.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7fddd1453f365e54b46f6564d5c168ed13e758db Mon Sep 17 00:00:00 2001 -From: lingsheng -Date: Wed, 18 Nov 2020 14:58:37 +0800 -Subject: [PATCH] Modify openEuler aarch64 v8_os_page_size to 64 - ---- - deps/v8/src/flags/flag-definitions.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deps/v8/src/flags/flag-definitions.h b/deps/v8/src/flags/flag-definitions.h -index c7c07e6d..38a035e2 100644 ---- a/deps/v8/src/flags/flag-definitions.h -+++ b/deps/v8/src/flags/flag-definitions.h -@@ -917,7 +917,7 @@ DEFINE_BOOL(memory_reducer_for_small_heaps, true, - "use memory reducer for small heaps") - DEFINE_INT(heap_growing_percent, 0, - "specifies heap growing factor as (1 + heap_growing_percent/100)") --DEFINE_INT(v8_os_page_size, 0, "override OS page size (in KBytes)") -+DEFINE_INT(v8_os_page_size, 64, "override OS page size (in KBytes)") - DEFINE_BOOL(always_compact, false, "Perform compaction on every full GC") - DEFINE_BOOL(never_compact, false, - "Never perform compaction on full GC - testing only") --- -2.23.0 - diff --git a/nodejs.spec b/nodejs.spec index 5f870b7..ee429ce 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -1,5 +1,5 @@ -%bcond_with bootstrap -%global baserelease 7 +%bcond_with bootstrap/ +%global baserelease 8 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} %global nodejs_epoch 1 %global nodejs_major 12 @@ -81,20 +81,17 @@ Source7: nodejs_native.attr Patch0001: 0001-Disable-running-gyp-on-shared-deps.patch Patch0002: 0002-Install-both-binaries-and-use-libdir.patch -%ifarch aarch64 -Patch0003: 0003-Modify-openEuler-aarch64-v8_os_page_size-to-64.patch -%endif -Patch0004: 0004-Make-AARCH64-compile-on-64KB-physical-pages.patch -Patch0005: CVE-2020-8265.patch -Patch0006: CVE-2020-8287-1.patch -Patch0007: CVE-2020-8287-2.patch -Patch0008: CVE-2021-22883.patch -Patch0009: CVE-2021-22884.patch -Patch00010: CVE-2021-22918.patch -Patch00011: 0005-use-getauxval-in-node_main_cc.patch -Patch00012: CVE-2021-22930-1.patch -Patch00013: CVE-2021-22930-2.patch -Patch00014: CVE-2021-22930-3.patch +Patch0003: 0004-Make-AARCH64-compile-on-64KB-physical-pages.patch +Patch0004: CVE-2020-8265.patch +Patch0005: CVE-2020-8287-1.patch +Patch0006: CVE-2020-8287-2.patch +Patch0007: CVE-2021-22883.patch +Patch0008: CVE-2021-22884.patch +Patch0009: CVE-2021-22918.patch +Patch00010: 0005-use-getauxval-in-node_main_cc.patch +Patch00011: CVE-2021-22930-1.patch +Patch00012: CVE-2021-22930-2.patch +Patch00013: CVE-2021-22930-3.patch BuildRequires: python3-devel BuildRequires: zlib-devel @@ -497,6 +494,9 @@ end %{_pkgdocdir}/npm/docs %changelog +* Thu Mar 03 2022 xu_ping - 1:12.18.4-8 +- openEuler 22.03 changed the page table to 4k so remove the 0003-Modify-openEuler-aarch64-v8_os_page_size-to-64.patch + * Thu Oct 21 2021 yaoxin - 1:12.18.4-7 - fix CVE-2021-22930 -- Gitee