From 1da35a464ccd1ea197efd6c3c3d93123c59afa6e Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 14 Oct 2021 08:18:42 -0400 Subject: [PATCH] Update to security release 14.18.1 https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.18.1 Signed-off-by: Stephen Gallagher --- 0001-Disable-running-gyp-on-shared-deps.patch | 6 +++--- 0002-Install-both-binaries-and-use-libdir.patch | 10 +++++----- nodejs.spec | 8 ++++++-- sources | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/0001-Disable-running-gyp-on-shared-deps.patch b/0001-Disable-running-gyp-on-shared-deps.patch index ba73abb..eaa7ee5 100644 --- a/0001-Disable-running-gyp-on-shared-deps.patch +++ b/0001-Disable-running-gyp-on-shared-deps.patch @@ -1,4 +1,4 @@ -From 74d6313dc91e3cc100be232f29589e34cbfadbd7 Mon Sep 17 00:00:00 2001 +From 755aa753aa2ae98d037d0e88a61a4078909744b3 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Fri, 17 Apr 2020 12:59:44 +0200 Subject: [PATCH 1/2] Disable running gyp on shared deps @@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Disable running gyp on shared deps 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 25dd8b3eb13e2aafc6a014bfd5f2a00df8d56a48..36dd400d45e91e9e680524556f4184f1022cf0c6 100644 +index c25a97750faccf228c4f6b4e8905d5471699e2d7..80d9fed5c95c2f80aa7c05554a865ebf2e7a1361 100644 --- a/Makefile +++ b/Makefile @@ -141,11 +141,11 @@ endif @@ -25,5 +25,5 @@ index 25dd8b3eb13e2aafc6a014bfd5f2a00df8d56a48..36dd400d45e91e9e680524556f4184f1 # node_version.h is listed because the N-API version is taken from there -- -2.31.1 +2.33.0 diff --git a/0002-Install-both-binaries-and-use-libdir.patch b/0002-Install-both-binaries-and-use-libdir.patch index 19171ad..5d46c5d 100644 --- a/0002-Install-both-binaries-and-use-libdir.patch +++ b/0002-Install-both-binaries-and-use-libdir.patch @@ -1,4 +1,4 @@ -From 061049e943da0488082e961de8e5ff14027c1cc6 Mon Sep 17 00:00:00 2001 +From f518bfc482d95ab50ec2f23642f3a6506039238c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 19 Mar 2019 23:22:40 -0400 Subject: [PATCH 2/2] Install both binaries and use libdir. @@ -13,10 +13,10 @@ Signed-off-by: Elliott Sales de Andrade 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/configure.py b/configure.py -index 9dc5d12cbdbd7c9ae31673f1b8efa3aeb3b0681a..2ade6ce4f23df4d0ec05d53344160a2300864a23 100755 +index 30cf6726ae891604da65e990409c22209d632b22..10a8896dc7ff22312ea7b0b70a0596b9a09fbb8e 100755 --- a/configure.py +++ b/configure.py -@@ -629,10 +629,16 @@ parser.add_option('--shared', +@@ -630,10 +630,16 @@ parser.add_option('--shared', action='store_true', dest='shared', help='compile shared library for embedding node in another project. ' + @@ -33,7 +33,7 @@ index 9dc5d12cbdbd7c9ae31673f1b8efa3aeb3b0681a..2ade6ce4f23df4d0ec05d53344160a23 dest='without_v8_platform', default=False, help='do not initialize v8 platform during node.js startup. ' + -@@ -1214,10 +1220,11 @@ def configure_node(o): +@@ -1212,10 +1218,11 @@ def configure_node(o): o['variables']['debug_nghttp2'] = 'false' o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) @@ -86,5 +86,5 @@ index 693faff4c37ac4d83a47e818f4412900497a2b62..7c0b1ba999cdeacd3431b5334d650677 # behave similarly for systemtap -- -2.31.1 +2.33.0 diff --git a/nodejs.spec b/nodejs.spec index cb2a185..0113ea2 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -20,7 +20,7 @@ %global nodejs_epoch 1 %global nodejs_major 14 %global nodejs_minor 18 -%global nodejs_patch 0 +%global nodejs_patch 1 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 83 @@ -52,7 +52,7 @@ # llhttp - from deps/llhttp/include/llhttp.h %global llhttp_major 2 %global llhttp_minor 1 -%global llhttp_patch 3 +%global llhttp_patch 4 %global llhttp_version %{llhttp_major}.%{llhttp_minor}.%{llhttp_patch} # libuv - from deps/uv/include/uv/version.h @@ -668,6 +668,10 @@ end %changelog +* Thu Oct 14 2021 Stephen Gallagher - 1:14.18.1-1 +- Update to security release 14.18.1 +- https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.18.1 + * Tue Sep 28 2021 Stephen Gallagher - 1:14.18.0-2 - Guarantee the use of OpenSSL 1.1 - Fixes module build on Fedora 36 diff --git a/sources b/sources index f196716..b26ca66 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (node-v14.18.0-stripped.tar.gz) = c05458af01d6632baee7417c5b0c13eb3215c3cb5a62b1101342f05d7bc923a6762fa557f4f414242066d523d1cad68b2f053d071fdd02d6801ca0afbb9ecc7d +SHA512 (node-v14.18.1-stripped.tar.gz) = 6b7d9d21bbbed5503d3d17ec4172d3cbb61e722bad4d5755f36a4696ab483734c033a52b26ec5a4f80d45ed33822891758bc544578063bb977de4ae4af75f85e SHA512 (icu4c-69_1-src.tgz) = d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7