From 1e68570079ca7b3d34e781a3fd5daa0a04e0fc3b Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Sat, 6 May 2017 09:04:42 -0500 Subject: [PATCH 1/3] npm-base: Move cache dir to persistent location --- classes/npm-base.bbclass | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/classes/npm-base.bbclass b/classes/npm-base.bbclass index c24645f4..24ba1374 100644 --- a/classes/npm-base.bbclass +++ b/classes/npm-base.bbclass @@ -11,7 +11,6 @@ NPM_REGISTRY ?= "https://registry.npmjs.org/" NPM_IGNORE = "${WORKDIR}/.npmignore" NPM ?= "npm" -NPM_CACHE_DIR = "${TMPDIR}/npm_cache/${PF}" NPM_HOME_DIR = "${TMPDIR}/npm_home/${PF}" NPM_ARCH ?= "${@nodejs_map_dest_cpu(d.getVar('TARGET_ARCH', True), d)}" NPM_LD ?= "${CXX}" @@ -40,7 +39,13 @@ oe_runnpm() { mkdir -p "${NPM_HOME_DIR}" - export NPM_CONFIG_CACHE="${NPM_CACHE_DIR}" + if [ "${NPM_CACHE_DIR}" == "" ]; then + NPM_VERSION=`${NPM} -v` + export NPM_CONFIG_CACHE="${DL_DIR}/npm_v${NPM_VERSION}_${TARGET_ARCH}_cache/${PF}" + else + export NPM_CONFIG_CACHE=${NPM_CACHE_DIR} + fi + export NPM_CONFIG_DEV="false" bbnote NPM target architecture: ${NPM_ARCH} @@ -68,7 +73,6 @@ oe_runnpm() { # Native npm NPM_NATIVE ?= "npm" -NPM_CACHE_DIR_NATIVE = "${TMPDIR}/npm_cache_native/${PF}" NPM_HOME_DIR_NATIVE = "${TMPDIR}/npm_home_native/${PF}" NPM_ARCH_NATIVE ?= "${@nodejs_map_dest_cpu(d.getVar('BUILD_ARCH', True), d)}" NPM_LD_NATIVE ?= "${BUILD_CXX}" @@ -95,7 +99,13 @@ oe_runnpm_native() { mkdir -p "${NPM_HOME_DIR_NATIVE}" - export NPM_CONFIG_CACHE="${NPM_CACHE_DIR_NATIVE}" + if [ "${NPM_CACHE_DIR_NATIVE}" == "" ]; then + NPM_VERSION=`${NPM} -v` + export NPM_CONFIG_CACHE="${DL_DIR}/npm_v${NPM_VERSION}_${TARGET_ARCH}_native/${PF}" + else + export NPM_CONFIG_CACHE=${NPM_CACHE_DIR_NATIVE} + fi + export NPM_CONFIG_DEV="false" bbnote NPM native architecture: ${NPM_ARCH_NATIVE} From 5b8592ab792a6e6c641ae2c68104de1089d250df Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Thu, 31 Aug 2017 10:52:19 -0500 Subject: [PATCH 2/3] 2017-08-01, Version 6.11.2 'Boron' (LTS) Notable Changes * configure: - add mips64el to valid_arch (Aditya Anand) #13620 * crypto: - Updated root certificates based on NSS 3.30 (Ben Noordhuis) - #13279 - #12402 * deps: - upgrade OpenSSL to version 1.0.2.l (Shigeki Ohtsu) #12913 * http: - parse errors are now reported when NODE_DEBUG=http (SamRoberts) #13206 - Agent construction can now be envoked without new (cjihrig) -#12927 * zlib: - node will now throw an Error when zlib rejects the value of windowBits, instead of crashing (Alexey Orlenko) #13098 --- README.md | 16 ++++++++-------- recipes-devtools/nodejs/nodejs_6.10.3.bb | 9 --------- recipes-devtools/nodejs/nodejs_6.11.2.bb | 9 +++++++++ 3 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 recipes-devtools/nodejs/nodejs_6.10.3.bb create mode 100644 recipes-devtools/nodejs/nodejs_6.11.2.bb diff --git a/README.md b/README.md index 8d3e84e8..6d6b6dd6 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ meta-nodejs Date: Thu, 31 Aug 2017 13:04:20 -0500 Subject: [PATCH 3/3] 2017-07-11, Version 7.10.1 (Current) Notable changes * build: - Disable V8 snapshots - The hashseed embedded in the snapshot is currently the same for all runs of the binary. This opens node up to collision attacks which could result in a Denial of Service. We have temporarily disabled snapshots until a more robust solution is found (Ali Ijaz Sheikh) * deps: - CVE-2017-1000381 - The c-ares function ares_parse_naptr_reply(), which is used for parsing NAPTR responses, could be triggered to read memory outside of the given input buffer if the passed in DNS response packet was crafted in a particular way. This patch checks that there is enough data for the required elements of an NAPTR record (2 int16, 3 bytes for string lengths) before processing a record. (David Drysdale) --- README.md | 2 +- recipes-devtools/nodejs/nodejs_7.10.0.bb | 9 --------- recipes-devtools/nodejs/nodejs_7.10.1.bb | 8 ++++++++ 3 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 recipes-devtools/nodejs/nodejs_7.10.0.bb create mode 100644 recipes-devtools/nodejs/nodejs_7.10.1.bb diff --git a/README.md b/README.md index 6d6b6dd6..5fe90428 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ OpenEmbedded layer for latest [Node.js](https://nodejs.org/ "Node.js") releases. ## Node.js releases - * ![Current 7](https://img.shields.io/badge/Node.js%20Current-7.10.0-green.svg) + * ![Current 7](https://img.shields.io/badge/Node.js%20Current-7.10.1-green.svg) * ![LTS 6](https://img.shields.io/badge/Node.js%20LTS-6.11.2-blue.svg) * ![Maintenance 4](https://img.shields.io/badge/Node.js%20Maintenance-4.8.3-B0C4DE.svg) * ![End of life 0.12](https://img.shields.io/badge/Node.js%20End%20of%20Life-0.12.18-lightgray.svg) diff --git a/recipes-devtools/nodejs/nodejs_7.10.0.bb b/recipes-devtools/nodejs/nodejs_7.10.0.bb deleted file mode 100644 index af21c541..00000000 --- a/recipes-devtools/nodejs/nodejs_7.10.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -require nodejs_7.inc - -INC_PR = "r1" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=d29463feca32ea5977af7b6c7d62c14a" - -SRC_URI[src.md5sum] = "3c8c8f61a898c3c7292ff58a4e27fa33" -SRC_URI[src.sha256sum] = "c4843fe8bffb59c2327063a5e67a89af60d7927f7ace7548695a2cf4c1aa6d03" - diff --git a/recipes-devtools/nodejs/nodejs_7.10.1.bb b/recipes-devtools/nodejs/nodejs_7.10.1.bb new file mode 100644 index 00000000..610ec965 --- /dev/null +++ b/recipes-devtools/nodejs/nodejs_7.10.1.bb @@ -0,0 +1,8 @@ +require nodejs_7.inc + +INC_PR = "r1" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=d29463feca32ea5977af7b6c7d62c14a" + +SRC_URI[src.md5sum] = "652fc03608e00dc9e5688331328ef62f" +SRC_URI[src.sha256sum] = "baf060e5d3abb8fdebb8c2b28c4d8cde05d43acfd9fc687f21f4b7a3ff69745e"