Skip to content

Commit e7ed56f

Browse files
Trottrichardlau
Trott
authored and
richardlau
committed
tools: make license-builder.sh comply with shellcheck 0.8.0
Fixes for SC2312 added in shellcheck 0.8.0. PR-URL: #41258 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]>
1 parent cc819b4 commit e7ed56f

File tree

2 files changed

+127
-53
lines changed

2 files changed

+127
-53
lines changed

‎LICENSE

+124-51
Original file line numberDiff line numberDiff line change
@@ -763,56 +763,129 @@ The externally maintained libraries used by Node.js are:
763763

764764
- OpenSSL, located at deps/openssl, is licensed as follows:
765765
"""
766-
Copyright (c) 1998-2019 The OpenSSL Project. All rights reserved.
767-
768-
Redistribution and use in source and binary forms, with or without
769-
modification, are permitted provided that the following conditions
770-
are met:
771-
772-
1. Redistributions of source code must retain the above copyright
773-
notice, this list of conditions and the following disclaimer.
774-
775-
2. Redistributions in binary form must reproduce the above copyright
776-
notice, this list of conditions and the following disclaimer in
777-
the documentation and/or other materials provided with the
778-
distribution.
779-
780-
3. All advertising materials mentioning features or use of this
781-
software must display the following acknowledgment:
782-
"This product includes software developed by the OpenSSL Project
783-
for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
784-
785-
4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
786-
endorse or promote products derived from this software without
787-
prior written permission. For written permission, please contact
788-
[email protected].
789-
790-
5. Products derived from this software may not be called "OpenSSL"
791-
nor may "OpenSSL" appear in their names without prior written
792-
permission of the OpenSSL Project.
793-
794-
6. Redistributions of any form whatsoever must retain the following
795-
acknowledgment:
796-
"This product includes software developed by the OpenSSL Project
797-
for use in the OpenSSL Toolkit (http://www.openssl.org/)"
798-
799-
THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
800-
EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
801-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
802-
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
803-
ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
804-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
805-
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
806-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
807-
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
808-
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
809-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
810-
OF THE POSSIBILITY OF SUCH DAMAGE.
811-
====================================================================
812-
813-
This product includes cryptographic software written by Eric Young
814-
([email protected]). This product includes software written by Tim
815-
Hudson ([email protected]).
766+
LICENSE ISSUES
767+
==============
768+
769+
The OpenSSL toolkit stays under a double license, i.e. both the conditions of
770+
the OpenSSL License and the original SSLeay license apply to the toolkit.
771+
See below for the actual license texts.
772+
773+
OpenSSL License
774+
---------------
775+
776+
/* ====================================================================
777+
* Copyright (c) 1998-2019 The OpenSSL Project. All rights reserved.
778+
*
779+
* Redistribution and use in source and binary forms, with or without
780+
* modification, are permitted provided that the following conditions
781+
* are met:
782+
*
783+
* 1. Redistributions of source code must retain the above copyright
784+
* notice, this list of conditions and the following disclaimer.
785+
*
786+
* 2. Redistributions in binary form must reproduce the above copyright
787+
* notice, this list of conditions and the following disclaimer in
788+
* the documentation and/or other materials provided with the
789+
* distribution.
790+
*
791+
* 3. All advertising materials mentioning features or use of this
792+
* software must display the following acknowledgment:
793+
* "This product includes software developed by the OpenSSL Project
794+
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
795+
*
796+
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
797+
* endorse or promote products derived from this software without
798+
* prior written permission. For written permission, please contact
799+
* [email protected].
800+
*
801+
* 5. Products derived from this software may not be called "OpenSSL"
802+
* nor may "OpenSSL" appear in their names without prior written
803+
* permission of the OpenSSL Project.
804+
*
805+
* 6. Redistributions of any form whatsoever must retain the following
806+
* acknowledgment:
807+
* "This product includes software developed by the OpenSSL Project
808+
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
809+
*
810+
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
811+
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
812+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
813+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
814+
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
815+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
816+
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
817+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
818+
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
819+
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
820+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
821+
* OF THE POSSIBILITY OF SUCH DAMAGE.
822+
* ====================================================================
823+
*
824+
* This product includes cryptographic software written by Eric Young
825+
* ([email protected]). This product includes software written by Tim
826+
* Hudson ([email protected]).
827+
*
828+
*/
829+
830+
Original SSLeay License
831+
-----------------------
832+
833+
/* Copyright (C) 1995-1998 Eric Young ([email protected])
834+
* All rights reserved.
835+
*
836+
* This package is an SSL implementation written
837+
* by Eric Young ([email protected]).
838+
* The implementation was written so as to conform with Netscapes SSL.
839+
*
840+
* This library is free for commercial and non-commercial use as long as
841+
* the following conditions are aheared to. The following conditions
842+
* apply to all code found in this distribution, be it the RC4, RSA,
843+
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
844+
* included with this distribution is covered by the same copyright terms
845+
* except that the holder is Tim Hudson ([email protected]).
846+
*
847+
* Copyright remains Eric Young's, and as such any Copyright notices in
848+
* the code are not to be removed.
849+
* If this package is used in a product, Eric Young should be given attribution
850+
* as the author of the parts of the library used.
851+
* This can be in the form of a textual message at program startup or
852+
* in documentation (online or textual) provided with the package.
853+
*
854+
* Redistribution and use in source and binary forms, with or without
855+
* modification, are permitted provided that the following conditions
856+
* are met:
857+
* 1. Redistributions of source code must retain the copyright
858+
* notice, this list of conditions and the following disclaimer.
859+
* 2. Redistributions in binary form must reproduce the above copyright
860+
* notice, this list of conditions and the following disclaimer in the
861+
* documentation and/or other materials provided with the distribution.
862+
* 3. All advertising materials mentioning features or use of this software
863+
* must display the following acknowledgement:
864+
* "This product includes cryptographic software written by
865+
* Eric Young ([email protected])"
866+
* The word 'cryptographic' can be left out if the rouines from the library
867+
* being used are not cryptographic related :-).
868+
* 4. If you include any Windows specific code (or a derivative thereof) from
869+
* the apps directory (application code) you must include an acknowledgement:
870+
* "This product includes software written by Tim Hudson ([email protected])"
871+
*
872+
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
873+
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
874+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
875+
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
876+
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
877+
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
878+
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
879+
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
880+
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
881+
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
882+
* SUCH DAMAGE.
883+
*
884+
* The licence and distribution terms for any publically available version or
885+
* derivative of this code cannot be changed. i.e. this code cannot simply be
886+
* copied and put under another distribution licence
887+
* [including the GNU Public Licence.]
888+
*/
816889
"""
817890

818891
- Punycode.js, located at lib/punycode.js, is licensed as follows:
@@ -1340,7 +1413,7 @@ The externally maintained libraries used by Node.js are:
13401413

13411414
- ESLint, located at tools/node_modules/eslint, is licensed as follows:
13421415
"""
1343-
Copyright JS Foundation and other contributors, https://js.foundation
1416+
Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
13441417

13451418
Permission is hereby granted, free of charge, to any person obtaining a copy
13461419
of this software and associated documentation files (the "Software"), to deal

‎tools/license-builder.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ licenseText="$(cat "${rootdir}"/deps/corepack/LICENSE.md)"
6565
addlicense "corepack" "deps/corepack" "$licenseText"
6666
licenseText="$(cat "${rootdir}"/deps/undici/LICENSE)"
6767
addlicense "undici" "deps/undici" "$licenseText"
68-
licenseText="$(cat "${rootdir}"/deps/openssl/openssl/LICENSE.txt)"
68+
licenseText="$(cat "${rootdir}"/deps/openssl/openssl/LICENSE)"
6969
addlicense "OpenSSL" "deps/openssl" "$licenseText"
7070
licenseText="$(curl -sL https://raw.githubusercontent.com/bestiejs/punycode.js/HEAD/LICENSE-MIT.txt)"
7171
addlicense "Punycode.js" "lib/punycode.js" "$licenseText"
@@ -136,6 +136,7 @@ addlicense "nghttp3" "deps/ngtcp2/nghttp3/" "$licenseText"
136136
licenseText="$(curl -sL https://raw.githubusercontent.com/jprichardson/node-fs-extra/b34da2762a4865b025cac06d02d6a2f1f1027b65/LICENSE)"
137137
addlicense "node-fs-extra" "lib/internal/fs/cp" "$licenseText"
138138

139-
addlicense "base64" "deps/base64/base64/" "$(cat "${rootdir}"/deps/base64/base64/LICENSE)"
139+
licenseText="$(cat "${rootdir}"/deps/base64/base64/LICENSE)"
140+
addlicense "base64" "deps/base64/base64/" "$licenseText"
140141

141142
mv "$tmplicense" "$licensefile"

0 commit comments

Comments
 (0)