Skip to content

Commit afe68c1

Browse files
committed
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: nodejs#14806 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Timothy Gu <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
1 parent b2a9b81 commit afe68c1

File tree

3 files changed

+82
-7
lines changed

3 files changed

+82
-7
lines changed

LICENSE

+57-7
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,32 @@ The externally maintained libraries used by Node.js are:
487487

488488
- libuv, located at deps/uv, is licensed as follows:
489489
"""
490-
libuv is part of the Node project: http://nodejs.org/
491-
libuv may be distributed alone under Node's license:
490+
libuv is licensed for use as follows:
491+
492+
====
493+
Copyright (c) 2015-present libuv project contributors.
494+
495+
Permission is hereby granted, free of charge, to any person obtaining a copy
496+
of this software and associated documentation files (the "Software"), to
497+
deal in the Software without restriction, including without limitation the
498+
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
499+
sell copies of the Software, and to permit persons to whom the Software is
500+
furnished to do so, subject to the following conditions:
501+
502+
The above copyright notice and this permission notice shall be included in
503+
all copies or substantial portions of the Software.
504+
505+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
506+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
507+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
508+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
509+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
510+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
511+
IN THE SOFTWARE.
512+
====
513+
514+
This license applies to parts of libuv originating from the
515+
https://github.com/joyent/libuv repository:
492516

493517
====
494518

@@ -537,7 +561,7 @@ The externally maintained libraries used by Node.js are:
537561

538562
- OpenSSL, located at deps/openssl, is licensed as follows:
539563
"""
540-
Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved.
564+
Copyright (c) 1998-2017 The OpenSSL Project. All rights reserved.
541565

542566
Redistribution and use in source and binary forms, with or without
543567
modification, are permitted provided that the following conditions
@@ -677,9 +701,9 @@ The externally maintained libraries used by Node.js are:
677701
- zlib, located at deps/zlib, is licensed as follows:
678702
"""
679703
zlib.h -- interface of the 'zlib' general purpose compression library
680-
version 1.2.8, April 28th, 2013
704+
version 1.2.11, January 15th, 2017
681705

682-
Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
706+
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
683707

684708
This software is provided 'as-is', without any express or implied
685709
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:
10171041

10181042
- ESLint, located at tools/eslint, is licensed as follows:
10191043
"""
1020-
ESLint
1021-
Copyright jQuery Foundation and other contributors, https://jquery.org/
1044+
Copyright JS Foundation and other contributors, https://js.foundation
10221045

10231046
Permission is hereby granted, free of charge, to any person obtaining a copy
10241047
of this software and associated documentation files (the "Software"), to deal
@@ -1070,3 +1093,30 @@ The externally maintained libraries used by Node.js are:
10701093
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
10711094
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10721095
"""
1096+
1097+
- nghttp2, located at deps/nghttp2, is licensed as follows:
1098+
"""
1099+
The MIT License
1100+
1101+
Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
1102+
Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
1103+
1104+
Permission is hereby granted, free of charge, to any person obtaining
1105+
a copy of this software and associated documentation files (the
1106+
"Software"), to deal in the Software without restriction, including
1107+
without limitation the rights to use, copy, modify, merge, publish,
1108+
distribute, sublicense, and/or sell copies of the Software, and to
1109+
permit persons to whom the Software is furnished to do so, subject to
1110+
the following conditions:
1111+
1112+
The above copyright notice and this permission notice shall be
1113+
included in all copies or substantial portions of the Software.
1114+
1115+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1116+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1117+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
1118+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
1119+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
1120+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
1121+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1122+
"""

deps/nghttp2/COPYING

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
The MIT License
2+
3+
Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
4+
Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
5+
6+
Permission is hereby granted, free of charge, to any person obtaining
7+
a copy of this software and associated documentation files (the
8+
"Software"), to deal in the Software without restriction, including
9+
without limitation the rights to use, copy, modify, merge, publish,
10+
distribute, sublicense, and/or sell copies of the Software, and to
11+
permit persons to whom the Software is furnished to do so, subject to
12+
the following conditions:
13+
14+
The above copyright notice and this permission notice shall be
15+
included in all copies or substantial portions of the Software.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
18+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
20+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
21+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
22+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
23+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

tools/license-builder.sh

+2
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ addlicense "cpplint.py" "tools/cpplint.py" \
8080
addlicense "ESLint" "tools/eslint" "$(cat ${rootdir}/tools/eslint/LICENSE)"
8181
addlicense "gtest" "deps/gtest" "$(cat ${rootdir}/deps/gtest/LICENSE)"
8282

83+
# nghttp2
84+
addlicense "nghttp2" "deps/nghttp2" "$(cat ${rootdir}/deps/nghttp2/COPYING)"
8385

8486

8587
mv $tmplicense $licensefile

0 commit comments

Comments
 (0)