All of lore.kernel.org
 help / color / mirror / Atom feed
From: Trevor Woerner <twoerner@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-oe][PATCH] nodejs: update from 4.2.3 to 4.2.4
Date: Thu, 7 Jan 2016 11:26:20 -0500	[thread overview]
Message-ID: <568E91AC.3010702@gmail.com> (raw)
In-Reply-To: <1452183872-22328-1-git-send-email-twoerner@gmail.com>

Oops, looks like this one got mangled somewhere along the way, and I
forgot to mention this was a v2.
v3 in a minute...

On 01/07/16 11:24, Trevor Woerner wrote:
> Additionally, the LICENSE file changed as follows:
>
> --- node-v4.2.3/LICENSE	2015-12-03 17:16:54.000000000 -0500
> +++ node-v4.2.4/LICENSE	2015-12-23 11:53:36.000000000 -0500
> @@ -338,11 +338,32 @@
>  - npm is a package manager program located at deps/npm.
>    npm's license follows:
>    """
> -    Copyright (c) Isaac Z. Schlueter
> -    All rights reserved.
> -
> -    npm is released under the Artistic 2.0 License.
> -    The text of the License follows:
> +    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.
> +
> +    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 @@
>      --------
>
> -    "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.
> -
> -    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.
> +    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.
>
> -    "npm Logo" created by Mathias Pettersson and Brian Hammond,
> -    used with permission.
> +    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.
>    """
>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  .../recipes-devtools/nodejs/{nodejs_4.2.3.bb => nodejs_4.2.4.bb}    | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta-oe/recipes-devtools/nodejs/{nodejs_4.2.3.bb => nodejs_4.2.4.bb} (93%)
>
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_4.2.3.bb b/meta-oe/recipes-devtools/nodejs/nodejs_4.2.4.bb
> similarity index 93%
> rename from meta-oe/recipes-devtools/nodejs/nodejs_4.2.3.bb
> rename to meta-oe/recipes-devtools/nodejs/nodejs_4.2.4.bb
> index 66a3c11..18e23b7 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_4.2.3.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_4.2.4.bb
> @@ -1,7 +1,7 @@
>  DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
>  HOMEPAGE = "http://nodejs.org"
>  LICENSE = "MIT & BSD & Artistic-2.0"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=ee90ba97d933fc8d56e97812b7dd62e9"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=963ca39eebcb15ac618bc3006504ae3f"
>  
>  DEPENDS = "openssl"
>  
> @@ -12,8 +12,8 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
>  SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \
>      file://no-registry.patch \
>  "
> -SRC_URI[md5sum] = "529a8abd4ca5a2225636767d3f14c382"
> -SRC_URI[sha256sum] = "5008ade5feb4b089f59163f66bffddc113f27de5d78edf203e39435c2c5d554f"
> +SRC_URI[md5sum] = "86e4d0d8b626f6e60ca7bef02f2543d2"
> +SRC_URI[sha256sum] = "4ee244ffede7328d9fa24c3024787e71225b7abaac49fe2b30e68b27460c10ec"
>  
>  S = "${WORKDIR}/node-v${PV}"
>  



  reply	other threads:[~2016-01-07 16:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-07 16:24 [meta-oe][PATCH] nodejs: update from 4.2.3 to 4.2.4 Trevor Woerner
2016-01-07 16:26 ` Trevor Woerner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-12-30 18:00 Trevor Woerner
2015-12-30 18:19 ` Martin Jansa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=568E91AC.3010702@gmail.com \
    --to=twoerner@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.