import nodejs-10.22.1-1.module+el8.3.0+8216+814449dc

.gitignore

@@ -1,2 +1,2 @@
 SOURCES/icu4c-64_2-src.tgz
-SOURCES/node-v10.21.0-stripped.tar.gz
+SOURCES/node-v10.22.1-stripped.tar.gz

.nodejs.metadata

@@ -1,2 +1,2 @@
 3127155ecf2b75ab4835f501b7478e39c07bb852 SOURCES/icu4c-64_2-src.tgz
-50f10207f2286ca63abd4f351808dc606891d90b SOURCES/node-v10.21.0-stripped.tar.gz
+a01d2d98c34466fa8fe50658fbddae1bcc11b486 SOURCES/node-v10.22.1-stripped.tar.gz

SOURCES/0001-Disable-running-gyp-on-shared-deps.patch

@@ -1,19 +1,18 @@
-From def28d29f907050d8bcd94ed2e341d128ffa3fa6 Mon Sep 17 00:00:00 2001
+From 2cd4c12776af3da588231d3eb498e6451c30eae5 Mon Sep 17 00:00:00 2001
 From: Zuzana Svetlikova <zsvetlik@redhat.com>
 Date: Thu, 27 Apr 2017 14:25:42 +0200
-Subject: [PATCH 1/2] Disable running gyp on shared deps
+Subject: [PATCH] Disable running gyp on shared deps
 
+Signed-off-by: rpm-build <rpm-build>
 ---
  Makefile | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 5fc2bb0c58f5532044a14e9f9595b2316f562726..f1c1545caa220d7442d6d92c49412ec7554de123 100644
+index 73feb4c..45bbceb 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -121,14 +121,13 @@ with-code-cache:
- 
- .PHONY: test-code-cache
+@@ -123,10 +123,9 @@ with-code-cache:
  test-code-cache: with-code-cache
  	$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
  
@@ -27,8 +26,6 @@ index 5fc2bb0c58f5532044a14e9f9595b2316f562726..f1c1545caa220d7442d6d92c49412ec7
  	$(PYTHON) tools/gyp_node.py -f make
  
  config.gypi: configure configure.py
- 	@if [ -x config.status ]; then \
- 		./config.status; \
 -- 
-2.19.0
+2.26.2
 

SOURCES/0002-Suppress-NPM-message-to-run-global-update.patch

@@ -1,20 +1,19 @@
-From ab6c18fd9aba942bee3f2f8030273c846b6025a6 Mon Sep 17 00:00:00 2001
+From e7afb2d6e2a6c8f9c9c32e12a10c3c5c4902a251 Mon Sep 17 00:00:00 2001
 From: Stephen Gallagher <sgallagh@redhat.com>
 Date: Tue, 1 May 2018 08:05:30 -0400
-Subject: [PATCH 2/2] Suppress NPM message to run global update
+Subject: [PATCH] Suppress NPM message to run global update
 
 Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
+Signed-off-by: rpm-build <rpm-build>
 ---
  deps/npm/bin/npm-cli.js | 54 -----------------------------------------
  1 file changed, 54 deletions(-)
 
 diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js
-index 6f76b23828531e7af98a7e3cd7d5abfaac09b40c..98edb6f45fe073e03794a2ae6e7aa7f5500723ee 100755
+index c0d9be0..0f0892e 100755
 --- a/deps/npm/bin/npm-cli.js
 +++ b/deps/npm/bin/npm-cli.js
-@@ -67,69 +67,15 @@
-   if (conf.usage && npm.command !== 'help') {
-     npm.argv.unshift(npm.command)
+@@ -71,65 +71,11 @@
      npm.command = 'help'
    }
  
@@ -80,8 +79,6 @@ index 6f76b23828531e7af98a7e3cd7d5abfaac09b40c..98edb6f45fe073e03794a2ae6e7aa7f5
      npm.commands[npm.command](npm.argv, function (err) {
        // https://genius.com/Lin-manuel-miranda-your-obedient-servant-lyrics
        if (
-         !err &&
-         npm.config.get('ham-it-up') &&
 -- 
-2.19.0
+2.26.2
 

SOURCES/0003-build-auto-load-ICU-data-from-with-icu-default-data-.patch

@@ -1,8 +1,7 @@
-From 9ca4d4aeccf50e6c036e5536ef070a09c1776817 Mon Sep 17 00:00:00 2001
+From 0028cc74dac4dd24b8599ade85cb49fdafa9f559 Mon Sep 17 00:00:00 2001
 From: Stephen Gallagher <sgallagh@redhat.com>
 Date: Fri, 6 Dec 2019 16:40:25 -0500
-Subject: [PATCH 3/3] build: auto-load ICU data from
- --with-icu-default-data-dir
+Subject: [PATCH] build: auto-load ICU data from --with-icu-default-data-dir
 
 When compiled with `--with-intl=small` and
 `--with-icu-default-data-dir=PATH`, Node.js will use PATH as a
@@ -28,6 +27,7 @@ the associated storage costs).
 Refs: https://github.com/nodejs/node/issues/3460
 
 Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
+Signed-off-by: rpm-build <rpm-build>
 ---
  configure.py |  9 +++++++++
  node.gypi    |  7 +++++++
@@ -35,13 +35,13 @@ Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
  3 files changed, 36 insertions(+)
 
 diff --git a/configure.py b/configure.py
-index 48389fbdcb57cbf8d9c11d4921c65f34a1937cc7..063e8748b954a7fed4fe084399e61371c061edab 100755
+index 89f7bf5..d611a88 100755
 --- a/configure.py
 +++ b/configure.py
 @@ -433,6 +433,14 @@ intl_optgroup.add_option('--with-icu-source',
          'the icu4c source archive. '
          'v%d.x or later recommended.' % icu_versions['minimum_icu'])
-
+ 
 +intl_optgroup.add_option('--with-icu-default-data-dir',
 +    action='store',
 +    dest='with_icu_default_data_dir',
@@ -53,7 +53,7 @@ index 48389fbdcb57cbf8d9c11d4921c65f34a1937cc7..063e8748b954a7fed4fe084399e61371
  parser.add_option('--with-ltcg',
      action='store_true',
      dest='with_ltcg',
-@@ -1360,6 +1368,7 @@ def configure_intl(o):
+@@ -1359,6 +1367,7 @@ def configure_intl(o):
      locs.add('root')  # must have root
      o['variables']['icu_locales'] = string.join(locs,',')
      # We will check a bit later if we can use the canned deps/icu-small
@@ -62,7 +62,7 @@ index 48389fbdcb57cbf8d9c11d4921c65f34a1937cc7..063e8748b954a7fed4fe084399e61371
      # full ICU
      o['variables']['v8_enable_i18n_support'] = 1
 diff --git a/node.gypi b/node.gypi
-index 466a1746811cfac1a8ce4ef604ef1152c6229ff1..65b97d6466a14f4343a948a5fc36f8a2580badfb 100644
+index 466a174..65b97d6 100644
 --- a/node.gypi
 +++ b/node.gypi
 @@ -113,6 +113,13 @@
@@ -80,16 +80,16 @@ index 466a1746811cfac1a8ce4ef604ef1152c6229ff1..65b97d6466a14f4343a948a5fc36f8a2
      }],
      [ 'node_use_bundled_v8=="true" and \
 diff --git a/src/node.cc b/src/node.cc
-index 7c0118758dfd9449283b900209b2ba8df7ddd129..c9840e3e367ca47176a17a7940a1e08eb1f56f78 100644
+index 7c01187..c9840e3 100644
 --- a/src/node.cc
 +++ b/src/node.cc
 @@ -92,6 +92,7 @@
-
+ 
  #if defined(NODE_HAVE_I18N_SUPPORT)
  #include <unicode/uvernum.h>
 +#include <unicode/utypes.h>
  #endif
-
+ 
  #if defined(LEAK_SANITIZER)
 @@ -2643,6 +2644,25 @@ void Init(std::vector<std::string>* argv,
    // If the parameter isn't given, use the env variable.
@@ -117,6 +117,6 @@ index 7c0118758dfd9449283b900209b2ba8df7ddd129..c9840e3e367ca47176a17a7940a1e08e
    // Initialize ICU.
    // If icu_data_dir is empty here, it will load the 'minimal' data.
    if (!i18n::InitializeICUDirectory(per_process_opts->icu_data_dir)) {
---
-2.24.1
+-- 
+2.26.2
 

SOURCES/0004-dot-prop-patch-4.2.0-with-fixes-for-CVE-2020-8116.patch

@@ -0,0 +1,103 @@
+From 6aaa4f232f872ffbb60b8a2e2282748e22a9891f Mon Sep 17 00:00:00 2001
+From: Marco Carini <cmdcarini@gmail.com>
+Date: Mon, 3 Aug 2020 17:16:07 -0500
+Subject: [PATCH] dot-prop: patch 4.2.0 with fixes for CVE-2020-8116
+
+Signed-off-by: rpm-build <rpm-build>
+---
+ deps/npm/node_modules/dot-prop/index.js     | 18 ++++++++++++++++++
+ deps/npm/node_modules/dot-prop/package.json |  6 +++---
+ deps/npm/node_modules/dot-prop/readme.md    |  2 ++
+ 3 files changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/deps/npm/node_modules/dot-prop/index.js b/deps/npm/node_modules/dot-prop/index.js
+index 15282bb..189831c 100644
+--- a/deps/npm/node_modules/dot-prop/index.js
++++ b/deps/npm/node_modules/dot-prop/index.js
+@@ -1,6 +1,14 @@
+ 'use strict';
+ const isObj = require('is-obj');
+ 
++const disallowedKeys = [
++	'__proto__',
++	'prototype',
++	'constructor'
++];
++
++const isValidPath = pathSegments => !pathSegments.some(segment => disallowedKeys.includes(segment));
++
+ function getPathSegments(path) {
+ 	const pathArr = path.split('.');
+ 	const parts = [];
+@@ -16,6 +24,10 @@ function getPathSegments(path) {
+ 		parts.push(p);
+ 	}
+ 
++	if (!isValidPath(parts)) {
++		return [];
++	}
++
+ 	return parts;
+ }
+ 
+@@ -26,6 +38,9 @@ module.exports = {
+ 		}
+ 
+ 		const pathArr = getPathSegments(path);
++		if (pathArr.length === 0) {
++			return;
++		}
+ 
+ 		for (let i = 0; i < pathArr.length; i++) {
+ 			if (!Object.prototype.propertyIsEnumerable.call(obj, pathArr[i])) {
+@@ -58,6 +73,9 @@ module.exports = {
+ 
+ 		const root = obj;
+ 		const pathArr = getPathSegments(path);
++		if (pathArr.length === 0) {
++			return;
++		}
+ 
+ 		for (let i = 0; i < pathArr.length; i++) {
+ 			const p = pathArr[i];
+diff --git a/deps/npm/node_modules/dot-prop/package.json b/deps/npm/node_modules/dot-prop/package.json
+index 40fefa3..93daf7d 100644
+--- a/deps/npm/node_modules/dot-prop/package.json
++++ b/deps/npm/node_modules/dot-prop/package.json
+@@ -37,9 +37,9 @@
+   "deprecated": false,
+   "description": "Get, set, or delete a property from a nested object using a dot path",
+   "devDependencies": {
+-    "ava": "*",
++    "ava": "1.4.1",
+     "matcha": "^0.7.0",
+-    "xo": "*"
++    "xo": "0.24.0"
+   },
+   "engines": {
+     "node": ">=4"
+@@ -73,7 +73,7 @@
+     "bench": "matcha bench.js",
+     "test": "xo && ava"
+   },
+-  "version": "4.2.0",
++  "version": "4.2.1",
+   "xo": {
+     "esnext": true
+   }
+diff --git a/deps/npm/node_modules/dot-prop/readme.md b/deps/npm/node_modules/dot-prop/readme.md
+index fab3b7a..0e18f78 100644
+--- a/deps/npm/node_modules/dot-prop/readme.md
++++ b/deps/npm/node_modules/dot-prop/readme.md
+@@ -85,6 +85,8 @@ Path of the property in the object, using `.` to separate each nested key.
+ 
+ Use `\\.` if you have a `.` in the key.
+ 
++The following path components are invalid and results in `undefined` being returned: `__proto__`, `prototype`, `constructor`.
++
+ #### value
+ 
+ Type: `any`
+-- 
+2.26.2
+

SPECS/nodejs.spec

@@ -13,7 +13,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}}
 
@@ -24,8 +24,8 @@
 # than a Fedora release lifecycle.
 %global nodejs_epoch 1
 %global nodejs_major 10
-%global nodejs_minor 21
-%global nodejs_patch 0
+%global nodejs_minor 22
+%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 64
@@ -94,7 +94,7 @@
 %global npm_epoch 1
 %global npm_major 6
 %global npm_minor 14
-%global npm_patch 4
+%global npm_patch 6
 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch}
 
 # In order to avoid needing to keep incrementing the release version for the
@@ -146,6 +146,9 @@ Patch2: 0002-Suppress-NPM-message-to-run-global-update.patch
 # https://github.com/nodejs/node/pull/30825
 Patch3: 0003-build-auto-load-ICU-data-from-with-icu-default-data-.patch
 
+# CVE-2020-8116
+Patch4: 0004-dot-prop-patch-4.2.0-with-fixes-for-CVE-2020-8116.patch
+
 BuildRequires: python2-devel
 BuildRequires: python3-devel
 BuildRequires: zlib-devel
@@ -619,6 +622,9 @@ end
 
 
 %changelog
+* Tue Sep 22 2020 Jan Staněk <jstanek@redhat.com> - 1:10.22.1-1
+- Security rebase to 10.22.1
+
 * Wed Jun 17 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.21.0-3
 - Resolves: RHBZ#1845307
 - Remove brotli-devel requires from nodejs-devel