From: Jan Palus <atler@pld-linux.org>
Date: Sat, 16 Jan 2021 16:47:48 +0000 (+0100)
Subject: up to 14.15.4 (fixes CVE-2020-8265 CVE-2020-8287)
X-Git-Tag: auto/th/nodejs-14.15.4-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fnodejs.git;a=commitdiff_plain;h=ec0ca27

up to 14.15.4 (fixes CVE-2020-8265 CVE-2020-8287)
---

diff --git a/0002-Install-both-binaries-and-use-libdir.patch b/0002-Install-both-binaries-and-use-libdir.patch
index cabec6e..d5d690a 100644
--- a/0002-Install-both-binaries-and-use-libdir.patch
+++ b/0002-Install-both-binaries-and-use-libdir.patch
@@ -41,7 +41,7 @@ diff --git a/tools/install.py b/tools/install.py
 index 655802980a6ea94d1d4ca1dc63c8c8e905fbb83a..fe4723bf15012c8aacacb0393dc8294c049b0503 100755
 --- a/tools/install.py
 +++ b/tools/install.py
-@@ -121,26 +121,23 @@ def subdir_files(path, dest, action):
+@@ -121,22 +121,19 @@ def subdir_files(path, dest, action):
  
  def files(action):
    is_windows = sys.platform == 'win32'
@@ -60,16 +60,8 @@ index 655802980a6ea94d1d4ca1dc63c8c8e905fbb83a..fe4723bf15012c8aacacb0393dc8294c
 -      output_file += '.dll'
 -    else:
 -      output_file = 'lib' + output_file + '.' + variables.get('shlib_suffix')
--      # GYP will output to lib.target except on OS X, this is hardcoded
--      # in its source - see the _InstallableTargetInstallPath function.
--      if sys.platform != 'darwin':
--        output_prefix += 'lib.target/'
 +    output_bin = 'node'
 +    output_lib = 'libnode.' + variables.get('shlib_suffix')
-+    # GYP will output to lib.target except on OS X, this is hardcoded
-+    # in its source - see the _InstallableTargetInstallPath function.
-+    if sys.platform != 'darwin':
-+      output_libprefix += 'lib.target/'
  
 -  if 'false' == variables.get('node_shared'):
 -    action([output_prefix + output_file], 'bin/' + output_file)
diff --git a/nodejs.spec b/nodejs.spec
index 9f33647..ab0a7e7 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -25,12 +25,12 @@ Name:		nodejs
 # Active start: 2020-10-27
 # Maintenance start: October 2020
 # Maintenance end: April 2023
-Version:	14.15.0
+Version:	14.15.4
 Release:	1
 License:	BSD and MIT and Apache v2.0 and GPL v3
 Group:		Development/Languages
 Source0:	https://nodejs.org/dist/v%{version}/node-v%{version}.tar.gz
-# Source0-md5:	a5cf57a18833bd122eca200a7d5e22d9
+# Source0-md5:	7dbe444e794f9ab8180575889496a1b2
 
 # force node to use /usr/lib/node as the systemwide module directory
 Patch2:		%{name}-libpath.patch