deps: upgrade npm to 3.10.9

PR-URL: https://github.com/nodejs/node/pull/9286
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

6 files changed, 203 insertions, 41 deletions

diff --git a/deps/npm/node_modules/lockfile/.npmignore b/deps/npm/node_modules/lockfile/.npmignore
new file mode 100644
index 0000000000..0ac606ffcb
--- /dev/null
+++ b/deps/npm/node_modules/lockfile/.npmignore
@@ -0,0 +1,3 @@
+.nyc_output/
+coverage/
+node_modules/
diff --git a/deps/npm/node_modules/lockfile/.travis.yml b/deps/npm/node_modules/lockfile/.travis.yml
new file mode 100644
index 0000000000..4af02b3d17
--- /dev/null
+++ b/deps/npm/node_modules/lockfile/.travis.yml
@@ -0,0 +1,8 @@
+language: node_js
+node_js:
+  - '0.8'
+  - '0.10'
+  - '0.12'
+  - 'iojs'
+before_install:
+  - npm install -g npm@latest
diff --git a/deps/npm/node_modules/lockfile/CHANGELOG.md b/deps/npm/node_modules/lockfile/CHANGELOG.md
new file mode 100644
index 0000000000..6d9005b1d0
--- /dev/null
+++ b/deps/npm/node_modules/lockfile/CHANGELOG.md
@@ -0,0 +1,96 @@
+# Changes
+
+
+## v1.0.2
+
+* git ignore coverage and node_modules
+* update tap to v7
+* build a changelog
+* pass tests on 0.8
+* before_script needs to be before_install
+* tap 1.2.0 and travis
+
+## v1.0.1
+
+* isc license
+* updated README.md
+
+## v1.0.0
+
+* Simulate staleness instead of waiting excessively
+* whitespace
+* manage 'retries' so it does not clash with 'wait' polling
+* manage 'wait' timer properly
+* Get rid of the excessive Object.create opts shadowing stuff
+* failing test for the time taken for retries + wait options
+* doc: add pollPeriod, correct opts.wait
+* Fixed #6: polling period should be configurable
+
+## v0.4.3
+
+* Implement race-resistant stale lock detection
+* set req id to 1 to start out
+
+## v0.4.2
+
+* stale option fix for windows file tunneling
+
+## v0.4.1
+
+* Fix version parsing
+
+## v0.4.0
+
+* Don't keep lockfiles open
+
+## v0.3.4
+
+* retry more aggressively
+
+## v0.3.3
+
+* Add debugging function
+
+## v0.3.2
+
+* remove console.error
+
+## v0.3.1
+
+* Support lack of subsecond fs precision
+* Fix error closure overwriting in notStale
+
+## v0.3.0
+
+* Use polling instead of watchers
+* Add more overhead buffer to contention test
+
+## v0.2.2
+
+* Fix wait calculation
+* fixup
+* Style: prefer early return to giant if/else
+* unlock: Close before unlinking
+* Don't get tripped up by locks named 'hasOwnProperty'
+* test: Pathological extreme lock contention
+* refactor license
+
+## 0.2.1
+
+* Handle race conditions more thoroughly
+
+## 0.2.0
+
+* Rename to 'lockfile'
+
+## 0.0.2
+
+* Add retries
+* bsd
+
+## 0.0.1
+
+* tests
+* package.json
+* the code
+* first
diff --git a/deps/npm/node_modules/lockfile/gen-changelog.sh b/deps/npm/node_modules/lockfile/gen-changelog.sh
new file mode 100644
index 0000000000..360e54af40
--- /dev/null
+++ b/deps/npm/node_modules/lockfile/gen-changelog.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+(
+  echo '# Changes'
+  echo ''
+  git log --first-parent --pretty=format:'%s' \
+    | grep -v '^update changelog' \
+    | perl -p -e 's/^((v?[0-9]+\.?)+)$/\n## \1\n/g' \
+    | perl -p -e 's/^([^#\s].*)$/* \1/g'
+)> CHANGELOG.md
diff --git a/deps/npm/node_modules/lockfile/package.json b/deps/npm/node_modules/lockfile/package.json
index dcb230e261..0fa61f34b0 100644
--- a/deps/npm/node_modules/lockfile/package.json
+++ b/deps/npm/node_modules/lockfile/package.json
@@ -1,54 +1,83 @@
 {
-  "name": "lockfile",
-  "version": "1.0.1",
-  "main": "lockfile.js",
-  "directories": {
-    "test": "test"
+  "_args": [
+    [
+      {
+        "raw": "lockfile@1.0.2",
+        "scope": null,
+        "escapedName": "lockfile",
+        "name": "lockfile",
+        "rawSpec": "1.0.2",
+        "spec": "1.0.2",
+        "type": "version"
+      },
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "lockfile@1.0.2",
+  "_id": "lockfile@1.0.2",
+  "_inCache": true,
+  "_location": "/lockfile",
+  "_nodeVersion": "6.5.0",
+  "_npmOperationalInternal": {
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/lockfile-1.0.2.tgz_1474488698320_0.008735276060178876"
   },
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "~0.2.5",
-    "touch": "0"
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "_npmVersion": "3.10.7",
+  "_phantomChildren": {},
+  "_requested": {
+    "raw": "lockfile@1.0.2",
+    "scope": null,
+    "escapedName": "lockfile",
+    "name": "lockfile",
+    "rawSpec": "1.0.2",
+    "spec": "1.0.2",
+    "type": "version"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/lockfile.git"
-  },
-  "keywords": [
-    "lockfile",
-    "lock",
-    "file",
-    "fs",
-    "O_EXCL"
+  "_requiredBy": [
+    "#USER",
+    "/"
   ],
+  "_resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz",
+  "_shasum": "97e1990174f696cbe0a3acd58a43b84aa30c7c83",
+  "_shrinkwrap": null,
+  "_spec": "lockfile@1.0.2",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "license": "ISC",
-  "description": "A very polite lock file utility, which endeavors to not litter, and to wait patiently for others.",
-  "gitHead": "9d338ed8e3e3a166955d051f6b5fb6bb1e563ca8",
   "bugs": {
     "url": "https://github.com/isaacs/lockfile/issues"
   },
-  "homepage": "https://github.com/isaacs/lockfile#readme",
-  "_id": "lockfile@1.0.1",
-  "_shasum": "9d353ecfe3f54d150bb57f89d51746935a39c4f5",
-  "_from": "lockfile@>=1.0.1 <1.1.0",
-  "_npmVersion": "2.10.0",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
+  "dependencies": {},
+  "description": "A very polite lock file utility, which endeavors to not litter, and to wait patiently for others.",
+  "devDependencies": {
+    "tap": "^7.1.2",
+    "touch": "0"
+  },
+  "directories": {
+    "test": "test"
   },
   "dist": {
-    "shasum": "9d353ecfe3f54d150bb57f89d51746935a39c4f5",
-    "tarball": "http://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
+    "shasum": "97e1990174f696cbe0a3acd58a43b84aa30c7c83",
+    "tarball": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz"
   },
+  "gitHead": "a25076ca142a08951a9265bc1091e715e9bc7f05",
+  "homepage": "https://github.com/isaacs/lockfile#readme",
+  "keywords": [
+    "lockfile",
+    "lock",
+    "file",
+    "fs",
+    "O_EXCL"
+  ],
+  "license": "ISC",
+  "main": "lockfile.js",
   "maintainers": [
     {
       "name": "trevorburnham",
@@ -59,6 +88,17 @@
       "email": "i@izs.me"
     }
   ],
-  "_resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "lockfile",
+  "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/lockfile.git"
+  },
+  "scripts": {
+    "changelog": "bash gen-changelog.sh",
+    "postversion": "npm run changelog && git add CHANGELOG.md && git commit -m 'update changelog - '${npm_package_version}",
+    "test": "tap test/*.js --cov"
+  },
+  "version": "1.0.2"
 }
diff --git a/deps/npm/node_modules/lockfile/test/retry-time.js b/deps/npm/node_modules/lockfile/test/retry-time.js
index 160bc1376d..7d5eaa8499 100644
--- a/deps/npm/node_modules/lockfile/test/retry-time.js
+++ b/deps/npm/node_modules/lockfile/test/retry-time.js
@@ -17,7 +17,7 @@ var RETRYWAIT = 100
 var WAIT = 100
 var RETRIES = 2
 var EXPECTTIME = (RETRYWAIT * RETRIES) + (WAIT * (RETRIES + 1))
-var TOOLONG = EXPECTTIME * 1.1
+var TOOLONG = EXPECTTIME * 1.5
 
 test('setup', function (t) {
   touch.sync('file.lock')
@@ -33,7 +33,9 @@ pollPeriods.forEach(function (pp) {
       ended = true
       t.end()
     }, 2000)
-    timer.unref()
+
+    if (timer.unref)
+      timer.unref()
 
     var start = Date.now()
     lockFile.lock('file.lock', {
@@ -56,7 +58,11 @@ pollPeriods.forEach(function (pp) {
 test('cleanup', function (t) {
   fs.unlinkSync('file.lock')
   t.end()
-  setTimeout(function() {
+  var timer = setTimeout(function() {
     process.exit(1)
-  }, 500).unref()
+  }, 500)
+  if (timer.unref)
+    timer.unref()
+  else
+    clearTimeout(timer)
 })