import nodejs-18.12.1-1.module+el9.1.0.z+17326+318294bb

.gitignore

@@ -1,6 +1,6 @@
 SOURCES/cjs-module-lexer-1.2.2.tar.gz
 SOURCES/icu4c-71_1-src.tgz
-SOURCES/node-v18.10.0-stripped.tar.gz
+SOURCES/node-v18.12.1-stripped.tar.gz
-SOURCES/undici-5.10.0.tar.gz
+SOURCES/undici-5.11.0.tar.gz
 SOURCES/wasi-sdk-11.0-linux.tar.gz
 SOURCES/wasi-sdk-14.0-linux.tar.gz

.nodejs.metadata

@@ -1,6 +1,6 @@
 b0a91341ecf6c68a9d59a1c57d000fbbcc771679 SOURCES/cjs-module-lexer-1.2.2.tar.gz
 406b0c8635288b772913b6ff646451e69748878a SOURCES/icu4c-71_1-src.tgz
-f5e69bcddffee8e0c03b1b2355e31f3d35a8b46c SOURCES/node-v18.10.0-stripped.tar.gz
+20d62c96ab85808e1043376f0d889f74eb2551df SOURCES/node-v18.12.1-stripped.tar.gz
-95ca0d63bbbbc19292423c76756515d52b2aa992 SOURCES/undici-5.10.0.tar.gz
+0ea4e5cfe13969896bf41c0d2d029a621917b944 SOURCES/undici-5.11.0.tar.gz
 ff114dd45b4efeeae7afe4621bfc6f886a475b4b SOURCES/wasi-sdk-11.0-linux.tar.gz
 c29e21be754c26cac4bf99848c5b1f4e8564e248 SOURCES/wasi-sdk-14.0-linux.tar.gz

SPECS/nodejs.spec

@@ -29,7 +29,7 @@
 # This is used by both the nodejs package and the npm subpackage that
 # has a separate version - the name is special so that rpmdev-bumpspec
 # will bump this rather than adding .1 to the end.
-%global baserelease 3
+%global baserelease 1
 
 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
@@ -40,8 +40,8 @@
 # than a Fedora release lifecycle.
 %global nodejs_epoch 1
 %global nodejs_major 18
-%global nodejs_minor 10
+%global nodejs_minor 12
-%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 108
@@ -129,7 +129,7 @@
 %global uvwasi_version 0.0.13
 
 # histogram_c - assumed from timestamps
-%global histogram_version 0.9.7
+%global histogram_version 0.11.2
 
 Name: nodejs
 Epoch: %{nodejs_epoch}
@@ -156,23 +156,24 @@ Source100: %{name}-tarball.sh
 # nodejs-packaging SRPM.
 Source7: nodejs_native.attr
 
-# These are full sources for dependencies included as WASM blobs int he source of Node itself.
+# These are full sources for dependencies included as WASM blobs in the source of Node itself.
+# Note: These sources would also include pre-compiled WASM blobs… so they are adjusted not to.
 # Recipes for creating these blobs are included in the sources.
 
 # Version: jq '.version' deps/cjs-module-lexer/package.json
 # Original: https://github.com/nodejs/cjs-module-lexer/archive/refs/tags/1.2.2.tar.gz
 # Adjustments: rm -f cjs-module-lexer-1.2.2/lib/lexer.wasm
 # wasi-sdk version can be found in Makefile
-# https://github.com/nodejs/undici/blob/v5.8.2/build/Dockerfile
+# https://github.com/nodejs/cjs-module-lexer/blob/1.2.2/Makefile
 Source101: cjs-module-lexer-1.2.2.tar.gz
 Source111: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-11/wasi-sdk-11.0-linux.tar.gz
 
 # Version: jq '.version' deps/undici/src/package.json
-# Original: https://github.com/nodejs/undici/archive/refs/tags/v5.7.0.tar.gz
+# Original: https://github.com/nodejs/undici/archive/refs/tags/v5.11.0.tar.gz
-# Adjustments: rm -f undici-5.7.0/lib/llhttp/llhttp*.wasm
+# Adjustments: rm -f undici-5.11.0/lib/llhttp/llhttp*.wasm
 # wasi-sdk version can be found in Dockerfile
-# https://github.com/nodejs/cjs-module-lexer/blob/1.2.2/Makefile
+# https://github.com/nodejs/undici/blob/v5.8.2/build/Dockerfile
-Source102: undici-5.10.0.tar.gz
+Source102: undici-5.11.0.tar.gz
 Source112: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-14/wasi-sdk-14.0-linux.tar.gz
 
 # Disable running gyp on bundled deps we don't use
@@ -598,6 +599,11 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod
 
 
 %changelog
+* Wed Nov 16 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:18.12.1-1
+- Rebase + CVEs
+- Resolves: #2142809
+- Resolves: #2142830, #2142856
+
 * Sun Oct 09 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:18.10.0-3
 - Resolves: #2111861
 - Add proper sources for undici