Re: [meta-oe][PATCH v2] nodejs: update from 4.2.3 to 4.2.4

[Trevor Woerner <twoerner@gmail.com>]

On 12/30/15 17:05, Khem Raj wrote:
> Yes. please include exact diff instead of summarizing as your patch does.

diff --git a/LICENSE b/LICENSE
index 7920cbb..ea51cc4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -338,11 +338,32 @@ The externally maintained libraries used by
Node.js are:
 - npm is a package manager program located at deps/npm.
   npm's license follows:
   """
-    Copyright (c) Isaac Z. Schlueter
-    All rights reserved.
+    The npm application
+    Copyright (c) npm, Inc. and Contributors
+    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.com
+    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 2.0 License.
-    The text of the License follows:
+    The Node.js application
+    Project of Node Foundation, https://nodejs.org
+
+    The npm Logo
+    Copyright (c) Mathias Pettersson and Brian Hammond
+
+    "Gubblebum Blocky" typeface
+    Copyright (c) Tjarda Koster, https://jelloween.deviantart.com
+    Used with permission
 
 
     --------
@@ -554,24 +575,49 @@ The externally maintained libraries used by
Node.js are:
     --------
 
 
-    "Node.js" and "node" trademark Joyent, Inc. npm is not officially
-    part of the Node.js project, and is neither owned by nor
-    officially affiliated with Joyent, Inc.
+    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.:
 
-    Packages published in the npm registry (other than the Software and
-    its included dependencies) are not part of npm itself, are the sole
-    property of their respective maintainers, and are not covered by
-    this license.
+    "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 Logo" created by Mathias Pettersson and Brian Hammond,
-    used with permission.
+    "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, http://jelloween.deviantart.com
+    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.js modules contained in the
node_modules/
+    This program uses several Node modules contained in the node_modules/
     subdirectory, according to the terms of their respective licenses.
   """