From e1f53748385c57da782f3b1f743513a853ee9c7f Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 15 Oct 2021 04:12:10 +0000 Subject: [PATCH 1/2] meta: move one or more collaborators to emeritus --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 06599e0a53a530..92dde467d770d5 100644 --- a/README.md +++ b/README.md @@ -453,8 +453,6 @@ For information about the governance of the Node.js project, see **Khaidi Chu** \ (he/him) * [yashLadha](https://github.com/yashLadha) - **Yash Ladha** \ (he/him) -* [yhwang](https://github.com/yhwang) - - **Yihong Wang** \ * [yosuke-furukawa](https://github.com/yosuke-furukawa) - **Yosuke Furukawa** \ * [ZYSzys](https://github.com/ZYSzys) - @@ -617,6 +615,8 @@ For information about the governance of the Node.js project, see **Vse Mozhet Byt** \ (he/him) * [whitlockjc](https://github.com/whitlockjc) - **Jeremy Whitlock** \ +* [yhwang](https://github.com/yhwang) - + **Yihong Wang** \ * [yorkie](https://github.com/yorkie) - **Yorkie Liu** \ From 21775af7708b979d933fc5f54c5adbbc43df9dff Mon Sep 17 00:00:00 2001 From: Create or Update Pull Request Action Date: Mon, 18 Oct 2021 00:03:35 +0000 Subject: [PATCH 2/2] doc: run license-builder --- LICENSE | 52 +--------------------------------------------------- 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/LICENSE b/LICENSE index b1da90352139aa..33a97127b0c4f6 100644 --- a/LICENSE +++ b/LICENSE @@ -638,56 +638,6 @@ The externally maintained libraries used by Node.js are: - OpenSSL, located at deps/openssl, is licensed as follows: """ - Copyright (c) 1998-2019 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 - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - "This product includes software developed by the OpenSSL Project - for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - - 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - endorse or promote products derived from this software without - prior written permission. For written permission, please contact - openssl-core@openssl.org. - - 5. Products derived from this software may not be called "OpenSSL" - nor may "OpenSSL" appear in their names without prior written - permission of the OpenSSL Project. - - 6. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes software developed by the OpenSSL Project - for use in the OpenSSL Toolkit (http://www.openssl.org/)" - - THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - OF THE POSSIBILITY OF SUCH DAMAGE. - ==================================================================== - - This product includes cryptographic software written by Eric Young - (eay@cryptsoft.com). This product includes software written by Tim - Hudson (tjh@cryptsoft.com). """ - Punycode.js, located at lib/punycode.js, is licensed as follows: @@ -1215,7 +1165,7 @@ The externally maintained libraries used by Node.js are: - ESLint, located at tools/node_modules/eslint, is licensed as follows: """ - Copyright JS Foundation and other contributors, https://js.foundation + Copyright OpenJS Foundation and other 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