From 4d967ebf264541b2dfa6f69c574cbe4f7b015fd4 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 24 2020 11:34:32 +0000
Subject: import nodejs-10.19.0-1.module+el8.1.0+5726+6ed65f8c


---

diff --git a/.gitignore b/.gitignore
index 4fff4ab..f08f858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/node-v10.16.3-stripped.tar.gz
+SOURCES/node-v10.19.0-stripped.tar.gz
diff --git a/.nodejs.metadata b/.nodejs.metadata
index cc922a4..8db0b6a 100644
--- a/.nodejs.metadata
+++ b/.nodejs.metadata
@@ -1 +1 @@
-ff532bed1adf4182d3a4c0cec160a357bd08d3fa SOURCES/node-v10.16.3-stripped.tar.gz
+fa379a5d3a54b946256358babaeadfb0bd8eb6b5 SOURCES/node-v10.19.0-stripped.tar.gz
diff --git a/SOURCES/nodejs-tarball.sh b/SOURCES/nodejs-tarball.sh
index 237ae13..c863283 100755
--- a/SOURCES/nodejs-tarball.sh
+++ b/SOURCES/nodejs-tarball.sh
@@ -7,4 +7,4 @@ tar -zxf node-v${version}.tar.gz
 rm -rf node-v${version}/deps/openssl
 tar -zcf node-v${version}-stripped.tar.gz node-v${version}
 
-fedpkg new-sources node-v${version}-stripped.tar.gz
+rhpkg new-sources node-v${version}-stripped.tar.gz
diff --git a/SPECS/nodejs.spec b/SPECS/nodejs.spec
index afcec29..104a8db 100644
--- a/SPECS/nodejs.spec
+++ b/SPECS/nodejs.spec
@@ -20,11 +20,11 @@
 # than a Fedora release lifecycle.
 %global nodejs_epoch 1
 %global nodejs_major 10
-%global nodejs_minor 16
-%global nodejs_patch 3
+%global nodejs_minor 19
+%global nodejs_patch 0
 %global nodejs_abi %{nodejs_major}.%{nodejs_minor}
 %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
-%global nodejs_release 2
+%global nodejs_release 1
 
 # == Bundled Dependency Versions ==
 # v8 - from deps/v8/include/v8-version.h
@@ -45,8 +45,8 @@
 
 # http-parser - from deps/http_parser/http_parser.h
 %global http_parser_major 2
-%global http_parser_minor 8
-%global http_parser_patch 0
+%global http_parser_minor 9
+%global http_parser_patch 3
 %global http_parser_version %{http_parser_major}.%{http_parser_minor}.%{http_parser_patch}
 
 # libuv - from deps/uv/include/uv/version.h
@@ -84,8 +84,8 @@
 # npm - from deps/npm/package.json
 %global npm_epoch 1
 %global npm_major 6
-%global npm_minor 9
-%global npm_patch 0
+%global npm_minor 13
+%global npm_patch 4
 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch}
 
 # In order to avoid needing to keep incrementing the release version for the
@@ -380,9 +380,6 @@ rm -f %{buildroot}%{_pkgdocdir}/html/nodejs.1
 mkdir -p %{buildroot}%{_datadir}/node
 cp -p common.gypi %{buildroot}%{_datadir}/node
 
-# Install the GDB init tool into the documentation directory
-mv %{buildroot}/%{_datadir}/doc/node/gdbinit %{buildroot}/%{_pkgdocdir}/gdbinit
-
 # install NPM docs to mandir
 mkdir -p %{buildroot}%{_mandir} \
          %{buildroot}%{_pkgdocdir}/npm
@@ -391,14 +388,14 @@ cp -pr deps/npm/man/* %{buildroot}%{_mandir}/
 rm -rf %{buildroot}%{_prefix}/lib/node_modules/npm/man
 ln -sf %{_mandir}  %{buildroot}%{_prefix}/lib/node_modules/npm/man
 
-# Install Markdown and HTML documentation to %{_pkgdocdir}
-cp -pr deps/npm/html deps/npm/doc %{buildroot}%{_pkgdocdir}/npm/
-rm -rf %{buildroot}%{_prefix}/lib/node_modules/npm/html \
-       %{buildroot}%{_prefix}/lib/node_modules/npm/doc
+# Install Gatsby HTML documentation to %{_pkgdocdir}
+cp -pr deps/npm/docs %{buildroot}%{_pkgdocdir}/npm/
+rm -rf %{buildroot}%{_prefix}/lib/node_modules/npm/docs
 
-ln -sf %{_pkgdocdir} %{buildroot}%{_prefix}/lib/node_modules/npm/html
-ln -sf %{_pkgdocdir}/npm/html %{buildroot}%{_prefix}/lib/node_modules/npm/doc
+ln -sf %{_pkgdocdir}/npm %{buildroot}%{_prefix}/lib/node_modules/npm/docs
 
+# Install the GDB init tool into the documentation directory
+mv %{buildroot}/%{_datadir}/doc/node/gdbinit %{buildroot}/%{_pkgdocdir}/gdbinit
 
 # Node tries to install some python files into a documentation directory
 # (and not the proper one). Remove them for now until we figure out what to
@@ -485,27 +482,39 @@ end
 %{_prefix}/lib/node_modules/npm
 %ghost %{_sysconfdir}/npmrc
 %ghost %{_sysconfdir}/npmignore
-%doc %{_mandir}/man*/npm*
-%doc %{_mandir}/man*/npx*
-%doc %{_mandir}/man5/package.json.5*
-%doc %{_mandir}/man5/package-lock.json.5*
-%doc %{_mandir}/man7/removing-npm.7*
+%doc %{_mandir}/man1/npm*.1*
+%doc %{_mandir}/man1/npx.1*
+%doc %{_mandir}/man5/folders.5*
+%doc %{_mandir}/man5/install.5*
+%doc %{_mandir}/man5/npmrc.5*
+%doc %{_mandir}/man5/package-json.5*
+%doc %{_mandir}/man5/package-lock-json.5*
+%doc %{_mandir}/man5/package-locks.5*
+%doc %{_mandir}/man5/shrinkwrap-json.5*
+%doc %{_mandir}/man7/config.7*
+%doc %{_mandir}/man7/developers.7*
+%doc %{_mandir}/man7/disputes.7*
+%doc %{_mandir}/man7/orgs.7*
+%doc %{_mandir}/man7/registry.7*
+%doc %{_mandir}/man7/removal.7*
+%doc %{_mandir}/man7/scope.7*
+%doc %{_mandir}/man7/scripts.7*
 %doc %{_mandir}/man7/semver.7*
 
 
 %files docs
 %dir %{_pkgdocdir}
 %{_pkgdocdir}/html
-%{_pkgdocdir}/npm/html
-%{_pkgdocdir}/npm/doc
+%{_pkgdocdir}/npm/docs
+
 
 %changelog
+* Mon Feb 10 2020 Jan Staněk <jstanek@redhat.com> - 1:10.19.0-1
+- Rebase to 10.19.0 to fix CVE-2019-15604 to CVE-2019-15606
+
 * Tue Sep 10 2019 Jan Staněk <jstanek@redhat.com> - 1:10.16.3-1
 - Rebase to 10.16.3 to fix CVE-2019-9511 to CVE-2019-9518
 
-* Thu Mar 14 2019 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.14.1-2
-- move nodejs-packaging BR out of conditional
-
 * Tue Dec 11 2018 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:10.14.1-1
 - Resolves: RHBZ#1644207
 - fixes node-gyp permissions