summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2017-08-13 15:42:18 +0200
committerAnna Henningsen <anna@addaleax.net>2017-08-14 17:22:15 +0200
commitafe68c18682579d19a0cc37566e2edda73481dc6 (patch)
tree55c41690162f83d35f5890dd8ed04c16eb5b0ab7
parentb2a9b81738a77bd4dc63926d74cc4f037a3cb43c (diff)
downloadandroid-node-v8-afe68c18682579d19a0cc37566e2edda73481dc6.tar.gz
android-node-v8-afe68c18682579d19a0cc37566e2edda73481dc6.tar.bz2
android-node-v8-afe68c18682579d19a0cc37566e2edda73481dc6.zip
deps,tools: add missing nghttp2 license
Add `COPYING` from `nghttp2` and register it in `tools/license-builder.sh`. Also run `tools/license-builder.sh` and commit the resulting `LICENSE` file. Ref: https://github.com/nghttp2/nghttp2/blob/master/COPYING PR-URL: https://github.com/nodejs/node/pull/14806 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
-rw-r--r--LICENSE64
-rw-r--r--deps/nghttp2/COPYING23
-rwxr-xr-xtools/license-builder.sh2
3 files changed, 82 insertions, 7 deletions
diff --git a/LICENSE b/LICENSE
index 53ebbc7052..c7ed5897ec 100644
--- a/LICENSE
+++ b/LICENSE
@@ -487,8 +487,32 @@ The externally maintained libraries used by Node.js are:
- libuv, located at deps/uv, is licensed as follows:
"""
- libuv is part of the Node project: http://nodejs.org/
- libuv may be distributed alone under Node's license:
+ 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
+ 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.
+ ====
+
+ This license applies to parts of libuv originating from the
+ https://github.com/joyent/libuv repository:
====
@@ -537,7 +561,7 @@ The externally maintained libraries used by Node.js are:
- OpenSSL, located at deps/openssl, is licensed as follows:
"""
- Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved.
+ Copyright (c) 1998-2017 The OpenSSL Project. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -677,9 +701,9 @@ The externally maintained libraries used by Node.js are:
- zlib, located at deps/zlib, is licensed as follows:
"""
zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.2.8, April 28th, 2013
+ version 1.2.11, January 15th, 2017
- Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -1017,8 +1041,7 @@ The externally maintained libraries used by Node.js are:
- ESLint, located at tools/eslint, is licensed as follows:
"""
- ESLint
- Copyright jQuery Foundation and other contributors, https://jquery.org/
+ Copyright JS Foundation and other contributors, https://js.foundation
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -1070,3 +1093,30 @@ The externally maintained libraries used by Node.js are:
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""
+
+- nghttp2, located at deps/nghttp2, is licensed as follows:
+ """
+ The MIT License
+
+ Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
+ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
+
+ 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/deps/nghttp2/COPYING b/deps/nghttp2/COPYING
new file mode 100644
index 0000000000..80201792ec
--- /dev/null
+++ b/deps/nghttp2/COPYING
@@ -0,0 +1,23 @@
+The MIT License
+
+Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
+Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
+
+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 de06fdb2e2..62eabf0e1f 100755
--- a/tools/license-builder.sh
+++ b/tools/license-builder.sh
@@ -80,6 +80,8 @@ addlicense "cpplint.py" "tools/cpplint.py" \
addlicense "ESLint" "tools/eslint" "$(cat ${rootdir}/tools/eslint/LICENSE)"
addlicense "gtest" "deps/gtest" "$(cat ${rootdir}/deps/gtest/LICENSE)"
+# nghttp2
+addlicense "nghttp2" "deps/nghttp2" "$(cat ${rootdir}/deps/nghttp2/COPYING)"
mv $tmplicense $licensefile