From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 15 Nov 2018 04:30:51 +0000 (-0800)
Subject: node: Update to 8.12.0
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4173bf47e2082b08825eb3b235c63fac51bb6f84;p=feed%2Fpackages.git

node: Update to 8.12.0

Fixes several CVEs.

Added PKG_CPE_ID for proper CVE tracking.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/lang/node/Makefile b/lang/node/Makefile
index 15d160c087..bf0f51f4e4 100644
--- a/lang/node/Makefile
+++ b/lang/node/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=node
-PKG_VERSION:=v8.11.3
+PKG_VERSION:=v8.12.0
 PKG_RELEASE:=1
 PKG_SOURCE:=node-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://nodejs.org/dist/${PKG_VERSION}
-PKG_HASH:=577c751fdca91c46c60ffd8352e5b465881373bfdde212c17c3a3c1bd2616ee0
+PKG_SOURCE_URL:=https://nodejs.org/dist/${PKG_VERSION}
+PKG_HASH:=5a9dff58016c18fb4bf902d963b124ff058a550ebcd9840c677757387bce419a
 
 HOST_BUILD_DEPENDS:=python/host
 PKG_BUILD_DEPENDS:=python/host
@@ -26,6 +26,7 @@ PKG_BUILD_PARALLEL:=1
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>, Adrian Panella <ianchi74@outlook.com>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:nodejs:node.js
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
@@ -35,7 +36,7 @@ define Package/node
   CATEGORY:=Languages
   SUBMENU:=Node.js
   TITLE:=Node.js is a platform built on Chrome's JavaScript runtime
-  URL:=http://nodejs.org/
+  URL:=https://nodejs.org/
   DEPENDS:=@(HAS_FPU||KERNEL_MIPS_FPU_EMULATOR) +libstdcpp +libopenssl +zlib +USE_UCLIBC:libpthread +USE_UCLIBC:librt +NODEJS_ICU:icu
 endef
 
@@ -50,7 +51,7 @@ define Package/node-npm
   CATEGORY:=Languages
   SUBMENU:=Node.js
   TITLE:=NPM stands for Node Package Manager
-  URL:=http://npmjs.com/
+  URL:=https://npmjs.com/
   DEPENDS:=+node
 endef
 
diff --git a/lang/node/patches/003-path.patch b/lang/node/patches/003-path.patch
index d9f0eb7a56..113f60ee60 100644
--- a/lang/node/patches/003-path.patch
+++ b/lang/node/patches/003-path.patch
@@ -1,6 +1,6 @@
 --- a/lib/module.js
 +++ b/lib/module.js
-@@ -714,7 +714,8 @@
+@@ -715,7 +715,8 @@
    } else {
      prefixDir = path.resolve(process.execPath, '..', '..');
    }
diff --git a/lang/node/patches/004-node_crypto_include_cmath.patch b/lang/node/patches/004-node_crypto_include_cmath.patch
deleted file mode 100644
index 4144f9175c..0000000000
--- a/lang/node/patches/004-node_crypto_include_cmath.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 34825d50db18631a92902af3f51ddd27aa074c90 Mon Sep 17 00:00:00 2001
-From: Jeroen Roovers <jer-gentoo@users.noreply.github.com>
-Date: Fri, 13 Apr 2018 05:54:42 +0200
-Subject: [PATCH 2/2] Include cmath ...
-
-... instead of using the C implementations of isnan and isinf
----
- src/node_crypto.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/node_crypto.cc b/src/node_crypto.cc
-index 7c0f65a5735..0aa4adbd467 100644
---- a/src/node_crypto.cc
-+++ b/src/node_crypto.cc
-@@ -36,9 +36,9 @@
- #include "v8.h"
- 
- #include <algorithm>
-+#include <cmath>
- #include <errno.h>
- #include <limits.h>  // INT_MAX
--#include <math.h>
- #include <stdlib.h>
- #include <string.h>
- #include <vector>