From 3d8af661ad151c39ed6fefb311b3d4723433126c Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 17 May 2021 11:17:58 -0400 Subject: [PATCH] Update to 14.17.0 https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.17.0 Signed-off-by: Stephen Gallagher --- 0001-Disable-running-gyp-on-shared-deps.patch | 4 ++-- ...Install-both-binaries-and-use-libdir.patch | 6 ++--- 0003-src-add-.note.GNU-stack-section.patch | 16 ++++++------- nodejs.spec | 24 +++++++++++-------- sources | 4 ++-- 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/0001-Disable-running-gyp-on-shared-deps.patch b/0001-Disable-running-gyp-on-shared-deps.patch index 1b5cf73..962763f 100644 --- a/0001-Disable-running-gyp-on-shared-deps.patch +++ b/0001-Disable-running-gyp-on-shared-deps.patch @@ -1,4 +1,4 @@ -From 0a889af5ee18290d833f7f63742d5b714bdb1a40 Mon Sep 17 00:00:00 2001 +From 867d8911b63b9837d89cd6ba65ea6ebccd7f77e7 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Fri, 17 Apr 2020 12:59:44 +0200 Subject: [PATCH 1/3] Disable running gyp on shared deps @@ -8,7 +8,7 @@ Subject: [PATCH 1/3] Disable running gyp on shared deps 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 93d63110ae2e3928a95d24036b86d11885ab240f..79caaec2112cefa8f6a1c947375b517e9676f176 100644 +index 5bb5d7df5f87e2b1d640e027fd4d0c21975959f7..fc812607ac76fadbbc9f4670a479a040a5024780 100644 --- a/Makefile +++ b/Makefile @@ -136,11 +136,11 @@ endif diff --git a/0002-Install-both-binaries-and-use-libdir.patch b/0002-Install-both-binaries-and-use-libdir.patch index 9679f8b..94943d1 100644 --- a/0002-Install-both-binaries-and-use-libdir.patch +++ b/0002-Install-both-binaries-and-use-libdir.patch @@ -1,4 +1,4 @@ -From 4012d5b9ae521f36c8b0155f591a38383e84407b Mon Sep 17 00:00:00 2001 +From ea59ced68789dc24c95572b84091afcebe9acb98 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 19 Mar 2019 23:22:40 -0400 Subject: [PATCH 2/3] Install both binaries and use libdir. @@ -13,7 +13,7 @@ Signed-off-by: Elliott Sales de Andrade 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/configure.py b/configure.py -index e6f7e4db0040dda00e432352afa7576535d9b672..6cf5c45dde79ce355b532c2f11b5b7ed80fde88a 100755 +index a477bd1c9578d03cd81456c513486620435749ee..3067eb9fc3e5c3eb22eb4ff3d20f87415b115bb8 100755 --- a/configure.py +++ b/configure.py @@ -624,10 +624,16 @@ parser.add_option('--shared', @@ -46,7 +46,7 @@ index e6f7e4db0040dda00e432352afa7576535d9b672..6cf5c45dde79ce355b532c2f11b5b7ed shlib_suffix = 'so' elif sys.platform == 'darwin': diff --git a/tools/install.py b/tools/install.py -index 729b416fc47d3ff3317ae3671dee977c719a8841..9bfc6234edb7732f9b90f063c2ee4a276e840636 100755 +index 693faff4c37ac4d83a47e818f4412900497a2b62..7c0b1ba999cdeacd3431b5334d650677754a9752 100755 --- a/tools/install.py +++ b/tools/install.py @@ -119,26 +119,23 @@ def subdir_files(path, dest, action): diff --git a/0003-src-add-.note.GNU-stack-section.patch b/0003-src-add-.note.GNU-stack-section.patch index 74fd28f..f943f9c 100644 --- a/0003-src-add-.note.GNU-stack-section.patch +++ b/0003-src-add-.note.GNU-stack-section.patch @@ -1,4 +1,4 @@ -From 6aa11a8cf48463432c0b5c6bfca5c2a5b18b1cc7 Mon Sep 17 00:00:00 2001 +From 7388d30b111414507b1353da12529f23daec4ee3 Mon Sep 17 00:00:00 2001 From: James Addison Date: Tue, 9 Mar 2021 13:08:47 +0000 Subject: [PATCH 3/3] src: add .note.GNU-stack section @@ -24,22 +24,22 @@ Related: https://github.com/nodejs/node/pull/37688 Signed-off-by: Stephen Gallagher --- - src/large_pages/node_text_start.S | 3 +++ - 1 file changed, 3 insertions(+) + src/large_pages/node_text_start.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/large_pages/node_text_start.S b/src/large_pages/node_text_start.S -index 1609b254f0495a32f8896ba96d96bad03f6f2321..d27dd39cc236f0e6be4e68113bfff7b531a37455 100644 +index 3227b62464932ced6d42916a4300ddbd9b4a4fbb..d27dd39cc236f0e6be4e68113bfff7b531a37455 100644 --- a/src/large_pages/node_text_start.S +++ b/src/large_pages/node_text_start.S -@@ -1,5 +1,8 @@ -+#if defined(__ELF__) +@@ -1,7 +1,7 @@ + #if defined(__ELF__) +-.section .note.GNU-stack,"",@progbits +.section .note.GNU-stack,"",%progbits -+#endif + #endif .text .align 0x2000 .global __node_text_start .hidden __node_text_start - __node_text_start: -- 2.31.1 diff --git a/nodejs.spec b/nodejs.spec index 4993651..e55b7e4 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -8,7 +8,7 @@ # This is used by both the nodejs package and the npm subpackage thar # has a separate version - the name is special so that rpmdev-bumpspec # will bump this rather than adding .1 to the end. -%global baserelease 2 +%global baserelease 1 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -19,8 +19,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 14 -%global nodejs_minor 16 -%global nodejs_patch 1 +%global nodejs_minor 17 +%global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 83 @@ -36,7 +36,7 @@ %global v8_major 8 %global v8_minor 4 %global v8_build 371 -%global v8_patch 19 +%global v8_patch 23 # V8 presently breaks ABI at least every x.y release while never bumping SONAME %global v8_abi %{v8_major}.%{v8_minor} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} @@ -45,7 +45,7 @@ # c-ares - from deps/cares/include/ares_version.h # https://github.com/nodejs/node/pull/9332 %global c_ares_major 1 -%global c_ares_minor 16 +%global c_ares_minor 17 %global c_ares_patch 1 %global c_ares_version %{c_ares_major}.%{c_ares_minor}.%{c_ares_patch} @@ -57,19 +57,19 @@ # libuv - from deps/uv/include/uv/version.h %global libuv_major 1 -%global libuv_minor 40 +%global libuv_minor 41 %global libuv_patch 0 %global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch} # nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h %global nghttp2_major 1 -%global nghttp2_minor 41 +%global nghttp2_minor 42 %global nghttp2_patch 0 %global nghttp2_version %{nghttp2_major}.%{nghttp2_minor}.%{nghttp2_patch} # ICU - from tools/icu/current_ver.dep -%global icu_major 67 -%global icu_minor 1 +%global icu_major 68 +%global icu_minor 2 %global icu_version %{icu_major}.%{icu_minor} %global icudatadir %{nodejs_datadir}/icudata @@ -92,7 +92,7 @@ %global npm_epoch 1 %global npm_major 6 %global npm_minor 14 -%global npm_patch 12 +%global npm_patch 13 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch} # uvwasi - from deps/uvwasi/include/uvwasi.h @@ -669,6 +669,10 @@ end %changelog +* Mon May 17 2021 Stephen Gallagher - 1:14.17.0-2 +- Update to 14.17.0 +- https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.17.0 + * Tue Apr 20 2021 Stephen Gallagher - 1:14.16.1-2 - Disable stack execution (bz#1950528) diff --git a/sources b/sources index 96692c4..db3ba87 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (node-v14.16.1-stripped.tar.gz) = 1ec3f503ecd6f8ffa24c3abc04e4e33758e1d577f645dc9c3a22282e3f4755e44169ca54a178fb90e8edb8ef6490d65edc4fd7fcf6ec9b5445d38630b9861a29 -SHA512 (icu4c-67_1-src.tgz) = 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8 +SHA512 (node-v14.17.0-stripped.tar.gz) = eb1109d13da376df49f3d0b25c21573585c9aec589e9175e182491211bc5b3fd54980f8002ae85544fa9127b95584c030c8f121b6e2520d5f0feb84ef6dab104 +SHA512 (icu4c-68_2-src.tgz) = 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b