From ded0e2d755717607d9b2555f140f2efe225d7449 Mon Sep 17 00:00:00 2001 From: Santiago Gimeno Date: Wed, 24 May 2023 07:47:22 +0200 Subject: [PATCH] tools: update LICENSE and license-builder.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A libuv `LICENSE-extra` file was added and a couple of files were removed (stdint-msvc2008.h and pthread-fixes.c). PR-URL: https://github.com/nodejs/node/pull/48078 Fixes: https://github.com/nodejs/node/issues/43931 Fixes: https://github.com/nodejs/node/issues/42496 Fixes: https://github.com/nodejs/node/issues/47715 Fixes: https://github.com/nodejs/node/issues/47259 Fixes: https://github.com/nodejs/node/issues/47241 Reviewed-By: Ben Noordhuis Reviewed-By: Mohammed Keyvanzadeh Reviewed-By: Debadree Chatterjee Reviewed-By: Luigi Pinca Reviewed-By: Colin Ihrig Reviewed-By: Yagiz Nizipli Reviewed-By: Michaël Zasso Reviewed-By: Rafael Gonzaga Reviewed-By: Richard Lau Reviewed-By: Tobias Nießen Reviewed-By: Jiawen Geng --- LICENSE | 11 ----------- tools/license-builder.sh | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/LICENSE b/LICENSE index b2f25c4e4b8974..b26c65a2410529 100644 --- a/LICENSE +++ b/LICENSE @@ -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 @@ -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: @@ -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: diff --git a/tools/license-builder.sh b/tools/license-builder.sh index aaedfeed5c7b1b..10b894262946ea 100755 --- a/tools/license-builder.sh +++ b/tools/license-builder.sh @@ -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"