Skip to content

Commit

Permalink
tools: update LICENSE and license-builder.sh
Browse files Browse the repository at this point in the history
A libuv `LICENSE-extra` file was added and a couple of files were
removed (stdint-msvc2008.h and pthread-fixes.c).

PR-URL: #48078
Fixes: #43931
Fixes: #42496
Fixes: #47715
Fixes: #47259
Fixes: #47241
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Mohammed Keyvanzadeh <[email protected]>
Reviewed-By: Debadree Chatterjee <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Yagiz Nizipli <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Rafael Gonzaga <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Jiawen Geng <[email protected]>
  • Loading branch information
santigimeno authored and targos committed Jun 4, 2023
1 parent 3440d7c commit ded0e2d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
11 changes: 0 additions & 11 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -644,9 +644,6 @@ The externally maintained libraries used by Node.js are:

- libuv, located at deps/uv, is licensed as follows:
"""
libuv is licensed for use as follows:

====
Copyright (c) 2015-present libuv project contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand All @@ -666,8 +663,6 @@ The externally maintained libraries used by Node.js are:
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
====

This license applies to parts of libuv originating from the
https://github.com/joyent/libuv repository:

Expand Down Expand Up @@ -704,12 +699,6 @@ The externally maintained libraries used by Node.js are:
- inet_pton and inet_ntop implementations, contained in src/inet.c, are
copyright the Internet Systems Consortium, Inc., and licensed under the ISC
license.

- stdint-msvc2008.h (from msinttypes), copyright Alexander Chemeris. Three
clause BSD license.

- pthread-fixes.c, copyright Google Inc. and Sony Mobile Communications AB.
Three clause BSD license.
"""

- llhttp, located at deps/llhttp, is licensed as follows:
Expand Down
2 changes: 1 addition & 1 deletion tools/license-builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ else
exit 1
fi

licenseText="$(cat "${rootdir}/deps/uv/LICENSE")"
licenseText="$(cat "${rootdir}/deps/uv/LICENSE" "${rootdir}/deps/uv/LICENSE-extra")"
addlicense "libuv" "deps/uv" "$licenseText"
licenseText="$(cat deps/llhttp/LICENSE-MIT)"
addlicense "llhttp" "deps/llhttp" "$licenseText"
Expand Down

0 comments on commit ded0e2d

Please sign in to comment.