From ec87b6c994ac33ce1296d8770204be282aecf7fa Mon Sep 17 00:00:00 2001 From: Hackzzila Date: Wed, 2 May 2018 15:48:43 -0500 Subject: [PATCH] deps,tools: update license-builder.sh and LICENSE PR-URL: https://github.com/nodejs/node/pull/24938 Reviewed-By: Ruben Bridgewater Reviewed-By: Matteo Collina Reviewed-By: Jan Krems Reviewed-By: James M Snell Reviewed-By: Myles Borins Reviewed-By: Ali Ijaz Sheikh Reviewed-By: Daniel Bevenius --- LICENSE | 23 +++++++++++++++++++++++ tools/license-builder.sh | 3 +++ 2 files changed, 26 insertions(+) diff --git a/LICENSE b/LICENSE index 7a5f7cfe6ee54f..f75f7581d35c8f 100644 --- a/LICENSE +++ b/LICENSE @@ -1348,3 +1348,26 @@ The externally maintained libraries used by Node.js are: ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ + +- brotli, located at deps/brotli, is licensed as follows: + """ + Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + 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. + """ diff --git a/tools/license-builder.sh b/tools/license-builder.sh index 597491bee30130..76d16c2faef025 100755 --- a/tools/license-builder.sh +++ b/tools/license-builder.sh @@ -92,4 +92,7 @@ addlicense "node-inspect" "deps/node-inspect" "$(cat ${rootdir}/deps/node-inspec # large_pages addlicense "large_pages" "src/large_pages" "$(sed -e '/SPDX-License-Identifier/,$d' -e 's/^\/\///' ${rootdir}/src/large_pages/node_large_page.h)" +# brotli +addlicense "brotli" "deps/brotli" "$(cat ${rootdir}/deps/brotli/LICENSE)" + mv $tmplicense $licensefile