nodejs · iarna · Jan 29, 2016 · Jan 29, 2016
diff --git a/LICENSE b/LICENSE
@@ -672,14 +672,32 @@ The externally maintained libraries used by Node.js are:
 
 - npm, located at deps/npm, is licensed as follows:
   """
+    The npm application
     Copyright (c) npm, Inc. and Contributors
-    All rights reserved.
+    Licensed on the terms of The Artistic License 2.0
+
+    Node package dependencies of the npm application
+    Copyright (c) their respective copyright owners
+    Licensed on their respective license terms
+
+    The npm public registry at https://registry.npmjs.org
+    and the npm website at https://www.npmjs.com
+    Operated by npm, Inc.
+    Use governed by terms published on https://www.npmjs.com
+
+    "Node.js"
+    Trademark Joyent, Inc., https://joyent.com
+    Neither npm nor npm, Inc. are affiliated with Joyent, Inc.
 
-    npm is released under the Artistic License 2.0, subject to additional terms
-    that are listed below.
+    The Node.js application
+    Project of Node Foundation, https://nodejs.org
 
-    The text of the npm License follows and the text of the additional terms
-    follows the Artistic License 2.0 terms:
+    The npm Logo
+    Copyright (c) Mathias Pettersson and Brian Hammond
+
+    "Gubblebum Blocky" typeface
+    Copyright (c) Tjarda Koster, https://jelloween.deviantart.com
+    Used with permission
 
     --------
 
@@ -879,51 +897,6 @@ The externally maintained libraries used by Node.js are:
     ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     --------
-
-    The following additional terms shall apply to use of the npm software, the npm
-    website, the npm repository and any other services or products offered by npm,
-    Inc.:
-
-    "Node.js" trademark Joyent, Inc.  npm is not officially part of the Node.js
-    project, and is neither owned by nor affiliated with Joyent, Inc.
-
-    "npm" and "The npm Registry" are owned by npm, Inc. All rights reserved.
-
-    Modules published on the npm registry are not officially endorsed by npm, Inc.
-    or the Node.js project.
-
-    Data published to the npm registry is not part of npm itself, and is the sole
-    property of the publisher. While every effort is made to ensure accountability,
-    there is absolutely no guarantee, warrantee, or assertion expressed or implied
-    as to the quality, fitness for a specific purpose, or lack of malice in any
-    given npm package.  Packages downloaded through the npm registry are
-    independently licensed and are not covered by this license.
-
-    Additional policies relating to, and restrictions on use of, npm products and
-    services are available on the npm website.  All such policies and restrictions,
-    as updated from time to time, are hereby incorporated into this license
-    agreement.  By using npm, you acknowledge your agreement to all such policies
-    and restrictions.
-
-    If you have a complaint about a package in the public npm registry, and cannot
-    resolve it with the package owner, please email support@npmjs.com and explain
-    the situation.  See the [npm Dispute Resolution
-    policy](https://github.com/npm/policies/blob/master/disputes.md) for more
-    details.
-
-    Any data published to The npm Registry (including user account information) may
-    be removed or modified at the sole discretion of the npm server administrators.
-
-    "npm Logo" contributed by Mathias Pettersson and Brian Hammond,
-    use is subject to https://www.npmjs.com/policies/trademark
-
-    "Gubblebum Blocky" font
-    Copyright (c) by Tjarda Koster, https://jelloween.deviantart.com
-    included for use in the npm website and documentation,
-    used with permission.
-
-    This program uses several Node modules contained in the node_modules/
-    subdirectory, according to the terms of their respective licenses.
   """
 
 - GYP, located at tools/gyp, is licensed as follows:

diff --git a/deps/npm/.mailmap b/deps/npm/.mailmap
@@ -2,6 +2,8 @@ Alex K. Wolfe <alexkwolfe@gmail.com>
 Andrew Bradley <cspotcode@gmail.com>
 Andrew Lunny <alunny@gmail.com>
 Arlo Breault <arlolra@gmail.com>
+Ashley Williams <ashley@npmjs.com> <ashley@bocoup.com>
+Ashley Williams <ashley@npmjs.com> <ashley666ashley@gmail.com>
 Benjamin Coe <bencoe@gmail.com>
 Benjamin Coe <bencoe@gmail.com> <ben@npmjs.com>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
@@ -28,10 +30,12 @@ James Treworgy <jamietre@gmail.com>
 Jason Smith <jhs@iriscouch.com>
 Jonas Weber <github@jonasw.de>
 Julien Meddah <julien.meddah@deveryware.com>
+Kevin Lorenz <mail@kevinlorenz.com>
 Kris Windham <kriswindham@gmail.com>
 Lin Clark <lin.w.clark@gmail.com>
 Luke Arduini <luke.arduini@gmail.com> <luke.arduini@me.com>
 Maciej Małecki <me@mmalecki.com> <maciej.malecki@notimplemented.org>
+Martin Ek <mail@ekmartin.com>
 Max Goodman <c@chromakode.com>
 Maxim Bogushevich <boga1@mail.ru>
 Maximilian Antoni <mail@maxantoni.de> <maximilian.antoni@juliusbaer.com>

diff --git a/deps/npm/.travis.yml b/deps/npm/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 node_js:
-  - "4.1"
-  - "4.0"
+  - "5"
+  - "4"
   - iojs
   - "0.12"
   - "0.10"

diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
@@ -324,3 +324,31 @@ Jason Kurian <JaKXz@users.noreply.github.com>
 Sebastiaan Deckers <seb@ninja.sg>
 lady3bean <lady3bean@users.noreply.github.com>
 Tomi Carr <TaMe3971@users.noreply.github.com>
+Juan Caicedo <retiredcanadianpoet@gmail.com>
+Ashley Williams <ashley@npmjs.com>
+Andrew Marcinkevičius <andrew.web@ifdattic.com>
+Jorrit Schippers <jorrit@ncode.nl>
+Alex Lukin <alex.lukin@softgrad.com>
+Aria Stewart <aredridel@dinhe.net>
+Tiago Rodrigues <tmcrodrigues@gmail.com>
+Tim <tim-github@baverstock.org.uk>
+Nick Williams <WickyNilliams@users.noreply.github.com>
+Louis Larry <louis.larry@gmail.com>
+Ben Gotow <bengotow@gmail.com>
+Jakub Gieryluk <jakub.g.opensource@gmail.com>
+Kevin Lorenz <mail@kevinlorenz.com>
+Martin von Gagern <Martin.vGagern@gmx.net>
+Eymen Gunay <eymen@egunay.com>
+Martin Ek <mail@ekmartin.com>
+Rafał Pocztarski <r.pocztarski@gmail.com>
+Mark Reeder <mreeder@uber.com>
+Chris Rebert <github@chrisrebert.com>
+Scott Addie <tobias.addie@gmail.com>
+Jeff McMahan <jeffrey.lee.mcmahan@gmail.com>
+Tim Krins <timkrins@gmail.com>
+Hal Henke <halhenke@gmail.com>
+Julian Simioni <julian@simioni.org>
+Jimb Esser <jimb@yahoo-inc.com>
+Alexis Campailla <alexis@janeasystems.com>
+Chris Chua <chris.sirhc@gmail.com>
+Beau Gunderson <beau@beaugunderson.com>