From 1c2ca9944f14ad443b4f22d25c20f666bab1ea7b Mon Sep 17 00:00:00 2001 From: isaacs Date: Wed, 26 Jun 2019 16:15:16 -0700 Subject: [PATCH] update fstream in node-gyp Addresses https://www.npmjs.com/advisories/886 --- node_modules/fstream/.npmignore | 5 ----- node_modules/fstream/lib/writer.js | 2 +- node_modules/fstream/package.json | 12 ++++++------ .../node-gyp/node_modules/tar/.npmignore | 5 ----- .../node-gyp/node_modules/tar/lib/parse.js | 6 ++++++ .../node-gyp/node_modules/tar/package.json | 14 +++++++------- node_modules/node-gyp/package.json | 16 ++++++++-------- package-lock.json | 14 +++++++------- 8 files changed, 35 insertions(+), 39 deletions(-) delete mode 100644 node_modules/fstream/.npmignore delete mode 100644 node_modules/node-gyp/node_modules/tar/.npmignore diff --git a/node_modules/fstream/.npmignore b/node_modules/fstream/.npmignore deleted file mode 100644 index 494272a81afb6..0000000000000 --- a/node_modules/fstream/.npmignore +++ /dev/null @@ -1,5 +0,0 @@ -.*.swp -node_modules/ -examples/deep-copy/ -examples/path/ -examples/filter-copy/ diff --git a/node_modules/fstream/lib/writer.js b/node_modules/fstream/lib/writer.js index 140e449e06dd5..3f10547820fad 100644 --- a/node_modules/fstream/lib/writer.js +++ b/node_modules/fstream/lib/writer.js @@ -147,7 +147,7 @@ Writer.prototype._stat = function (current) { // if it's a type change, then we need to clobber or error. // if it's not a type change, then let the impl take care of it. - if (currentType !== self.type) { + if (currentType !== self.type || self.type === 'File' && current.nlink > 1) { return rimraf(self._path, function (er) { if (er) return self.error(er) self._old = null diff --git a/node_modules/fstream/package.json b/node_modules/fstream/package.json index 25418b6709e64..f90ce2c450ee8 100644 --- a/node_modules/fstream/package.json +++ b/node_modules/fstream/package.json @@ -1,8 +1,8 @@ { "_from": "fstream@^1.0.0", - "_id": "fstream@1.0.11", + "_id": "fstream@1.0.12", "_inBundle": false, - "_integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "_integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", "_location": "/fstream", "_phantomChildren": {}, "_requested": { @@ -19,10 +19,10 @@ "/node-gyp", "/node-gyp/tar" ], - "_resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "_shasum": "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171", + "_resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "_shasum": "4e8ba8ee2d48be4f7d0de505455548eae5932045", "_spec": "fstream@^1.0.0", - "_where": "/Users/rebecca/code/npm/node_modules/node-gyp", + "_where": "/Users/isaacs/dev/npm/cli/node_modules/node-gyp", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", @@ -58,5 +58,5 @@ "scripts": { "test": "standard && tap examples/*.js" }, - "version": "1.0.11" + "version": "1.0.12" } diff --git a/node_modules/node-gyp/node_modules/tar/.npmignore b/node_modules/node-gyp/node_modules/tar/.npmignore deleted file mode 100644 index c167ad5b1c12f..0000000000000 --- a/node_modules/node-gyp/node_modules/tar/.npmignore +++ /dev/null @@ -1,5 +0,0 @@ -.*.swp -node_modules -examples/extract/ -test/tmp/ -test/fixtures/ diff --git a/node_modules/node-gyp/node_modules/tar/lib/parse.js b/node_modules/node-gyp/node_modules/tar/lib/parse.js index 600ad782f0f61..1c66ebdaf0c15 100644 --- a/node_modules/node-gyp/node_modules/tar/lib/parse.js +++ b/node_modules/node-gyp/node_modules/tar/lib/parse.js @@ -38,6 +38,7 @@ function Parse () { me._stream = new BlockStream(512) me.position = 0 me._ended = false + me._hardLinks = {} me._stream.on("error", function (e) { me.emit("error", e) @@ -251,6 +252,11 @@ Parse.prototype._startEntry = function (c) { if (onend) entry.on("end", onend) this._entry = entry + + if (entry.type === "Link") { + this._hardLinks[entry.path] = entry + } + var me = this entry.on("pause", function () { diff --git a/node_modules/node-gyp/node_modules/tar/package.json b/node_modules/node-gyp/node_modules/tar/package.json index 2ab77e47f328d..6e7fb2ed71093 100644 --- a/node_modules/node-gyp/node_modules/tar/package.json +++ b/node_modules/node-gyp/node_modules/tar/package.json @@ -1,8 +1,8 @@ { "_from": "tar@^2.0.0", - "_id": "tar@2.2.1", + "_id": "tar@2.2.2", "_inBundle": false, - "_integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "_integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", "_location": "/node-gyp/tar", "_phantomChildren": {}, "_requested": { @@ -18,10 +18,10 @@ "_requiredBy": [ "/node-gyp" ], - "_resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "_shasum": "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1", + "_resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "_shasum": "0ca8848562c7299b8b446ff6a4d60cdbb23edc40", "_spec": "tar@^2.0.0", - "_where": "/Users/rebecca/code/npm/node_modules/node-gyp", + "_where": "/Users/isaacs/dev/npm/cli/node_modules/node-gyp", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", @@ -33,7 +33,7 @@ "bundleDependencies": false, "dependencies": { "block-stream": "*", - "fstream": "^1.0.2", + "fstream": "^1.0.12", "inherits": "2" }, "deprecated": false, @@ -55,5 +55,5 @@ "scripts": { "test": "tap test/*.js" }, - "version": "2.2.1" + "version": "2.2.2" } diff --git a/node_modules/node-gyp/package.json b/node_modules/node-gyp/package.json index ba6913209c47d..df3a5dfb5e74e 100644 --- a/node_modules/node-gyp/package.json +++ b/node_modules/node-gyp/package.json @@ -1,5 +1,5 @@ { - "_from": "node-gyp@latest", + "_from": "node-gyp@3", "_id": "node-gyp@3.8.0", "_inBundle": false, "_integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", @@ -7,18 +7,18 @@ "_phantomChildren": { "abbrev": "1.1.1", "block-stream": "0.0.9", - "fstream": "1.0.11", + "fstream": "1.0.12", "inherits": "2.0.3" }, "_requested": { - "type": "tag", + "type": "range", "registry": true, - "raw": "node-gyp@latest", + "raw": "node-gyp@3", "name": "node-gyp", "escapedName": "node-gyp", - "rawSpec": "latest", + "rawSpec": "3", "saveSpec": null, - "fetchSpec": "latest" + "fetchSpec": "3" }, "_requiredBy": [ "#USER", @@ -27,8 +27,8 @@ ], "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", "_shasum": "540304261c330e80d0d5edce253a68cb3964218c", - "_spec": "node-gyp@latest", - "_where": "/Users/zkat/Documents/code/work/npm", + "_spec": "node-gyp@3", + "_where": "/Users/isaacs/dev/npm/cli", "author": { "name": "Nathan Rajlich", "email": "nathan@tootallnate.net", diff --git a/package-lock.json b/package-lock.json index 5b5edddc8013e..914b0652f6069 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2180,9 +2180,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", "requires": { "graceful-fs": "^4.1.2", "inherits": "~2.0.0", @@ -3764,12 +3764,12 @@ "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" }, "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", "requires": { "block-stream": "*", - "fstream": "^1.0.2", + "fstream": "^1.0.12", "inherits": "2" } }