From 5881f34b1e2f0824552c87a7b6aee9d63c9509db Mon Sep 17 00:00:00 2001 From: Yishuai Li Date: Thu, 14 Apr 2022 19:36:12 -0400 Subject: [PATCH 1/4] mulan: fix wrapping and trim space --- _licenses/mulanpsl-2.0.txt | 111 ++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index 90a2248..8b3d598 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -102,14 +102,13 @@ limitations: Copyright (c) [Year] [name of copyright holder] [Software Name] is licensed under Mulan PSL v2. -You can use this software according to the terms and conditions of the Mulan +You can use this software according to the terms and conditions of the Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at: http://license.coscl.org.cn/MulanPSL2 -THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY -KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO -NON-INFRINGEMENT, -MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY +KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO +NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. Mulan Permissive Software License，Version 2 @@ -118,109 +117,109 @@ Mulan Permissive Software License，Version 2 (Mulan PSL v2) January 2020 http://license.coscl.org.cn/MulanPSL2 -Your reproduction, use, modification and distribution of the Software shall -be subject to Mulan PSL v2 (this License) with the following terms and +Your reproduction, use, modification and distribution of the Software shall +be subject to Mulan PSL v2 (this License) with the following terms and conditions: 0. Definition -Software means the program and related documents which are licensed under +Software means the program and related documents which are licensed under this License and comprise all Contribution(s). -Contribution means the copyrightable work licensed by a particular +Contribution means the copyrightable work licensed by a particular Contributor under this License. -Contributor means the Individual or Legal Entity who licenses its +Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License. -Legal Entity means the entity making a Contribution and all its +Legal Entity means the entity making a Contribution and all its Affiliates. -Affiliates means entities that control, are controlled by, or are under -common control with the acting entity under this License, ‘control’ means -direct or indirect ownership of at least fifty percent (50%) of the voting -power, capital or other securities of controlled or commonly controlled +Affiliates means entities that control, are controlled by, or are under +common control with the acting entity under this License, ‘control’ means +direct or indirect ownership of at least fifty percent (50%) of the voting +power, capital or other securities of controlled or commonly controlled entity. 1. Grant of Copyright License -Subject to the terms and conditions of this License, each Contributor hereby -grants to you a perpetual, worldwide, royalty-free, non-exclusive, -irrevocable copyright license to reproduce, use, modify, or distribute its +Subject to the terms and conditions of this License, each Contributor hereby +grants to you a perpetual, worldwide, royalty-free, non-exclusive, +irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not. 2. Grant of Patent License -Subject to the terms and conditions of this License, each Contributor hereby -grants to you a perpetual, worldwide, royalty-free, non-exclusive, -irrevocable (except for revocation under this Section) patent license to -make, have made, use, offer for sale, sell, import or otherwise transfer its -Contribution, where such patent license is only limited to the patent claims -owned or controlled by such Contributor now or in future which will be -necessarily infringed by its Contribution alone, or by combination of the -Contribution with the Software to which the Contribution was contributed. -The patent license shall not apply to any modification of the Contribution, -and any other combination which includes the Contribution. If you or your -Affiliates directly or indirectly institute patent litigation (including a -cross claim or counterclaim in a litigation) or other patent enforcement -activities against any individual or entity by alleging that the Software or -any Contribution in it infringes patents, then any patent license granted to -you under this License for the Software shall terminate as of the date such +Subject to the terms and conditions of this License, each Contributor hereby +grants to you a perpetual, worldwide, royalty-free, non-exclusive, +irrevocable (except for revocation under this Section) patent license to +make, have made, use, offer for sale, sell, import or otherwise transfer its +Contribution, where such patent license is only limited to the patent claims +owned or controlled by such Contributor now or in future which will be +necessarily infringed by its Contribution alone, or by combination of the +Contribution with the Software to which the Contribution was contributed. +The patent license shall not apply to any modification of the Contribution, +and any other combination which includes the Contribution. If you or your +Affiliates directly or indirectly institute patent litigation (including a +cross claim or counterclaim in a litigation) or other patent enforcement +activities against any individual or entity by alleging that the Software or +any Contribution in it infringes patents, then any patent license granted to +you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken. 3. No Trademark License -No trademark license is granted to use the trade names, trademarks, service -marks, or product names of Contributor, except as required to fulfill notice +No trademark license is granted to use the trade names, trademarks, service +marks, or product names of Contributor, except as required to fulfill notice requirements in section 4. 4. Distribution Restriction -You may distribute the Software in any medium with or without modification, -whether in source or executable forms, provided that you provide recipients -with a copy of this License and retain copyright, patent, trademark and +You may distribute the Software in any medium with or without modification, +whether in source or executable forms, provided that you provide recipients +with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software. 5. Disclaimer of Warranty and Limitation of Liability -THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY -KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR -COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT -LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING -FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO -MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF +THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY +KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR +COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT +LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING +FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO +MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 6. Language -THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION -AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF -DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION +THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION +AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF +DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL. END OF THE TERMS AND CONDITIONS -How to Apply the Mulan Permissive Software License，Version 2 +How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software -To apply the Mulan PSL v2 to your work, for easy identification by +To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps: -i. Fill in the blanks in following statement, including insert your software -name, the year of the first publication of your software, and your name +i. Fill in the blanks in following statement, including insert your software +name, the year of the first publication of your software, and your name identified as the copyright owner; -ii. Create a file named "LICENSE" which contains the whole context of this +ii. Create a file named "LICENSE" which contains the whole context of this License in the first directory of your software package; -iii. Attach the statement to the appropriate annotated syntax at the +iii. Attach the statement to the appropriate annotated syntax at the beginning of each source file. Copyright (c) [Year] [name of copyright holder] [Software Name] is licensed under Mulan PSL v2. -You can use this software according to the terms and conditions of the Mulan +You can use this software according to the terms and conditions of the Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at: http://license.coscl.org.cn/MulanPSL2 -THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY -KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO +THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY +KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. From 242b0638db25f809980c1fcd212286996a270398 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 14 Apr 2022 16:50:00 -0700 Subject: [PATCH 2/4] update cncf link --- community.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community.md b/community.md index f4ea7d9..0caae39 100644 --- a/community.md +++ b/community.md @@ -14,7 +14,7 @@ Some communities have strong preferences for particular licenses. If you want to {: .bullets} * [Apache](https://www.apache.org/licenses/) requires [Apache License 2.0](/licenses/apache-2.0/) -* [Cloud Native Computing Foundation](https://github.com/cncf/toc/blob/master/process/project_proposals.adoc) dictates [Apache License 2.0](/licenses/apache-2.0/) by default +* [Cloud Native Computing Foundation](https://github.com/cncf/toc/blob/main/process/project_proposals.md) dictates [Apache License 2.0](/licenses/apache-2.0/) by default * [GNU](https://www.gnu.org/licenses/license-recommendations.html) recommends [GNU GPLv3](/licenses/gpl-3.0/) for most programs * [npm packages](https://libraries.io/search?platforms=npm) overwhelmingly use the [MIT](/licenses/mit/) or the very similar [ISC](/licenses/isc) licenses * [OpenBSD](https://www.openbsd.org/policy.html) prefers the [ISC License](/licenses/isc/) From 1a2ed662394573c2c369532f19f2403265ec11bf Mon Sep 17 00:00:00 2001 From: Baoshuo Ren Date: Wed, 27 Apr 2022 17:19:40 +0800 Subject: [PATCH 3/4] chore: remove git.io All links on git.io will stop redirecting after April 29, 2022. - https://github.blog/changelog/2022-04-25-git-io-deprecation/ --- spec/license_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/license_spec.rb b/spec/license_spec.rb index 0fd8a96..09460c6 100644 --- a/spec/license_spec.rb +++ b/spec/license_spec.rb @@ -28,7 +28,7 @@ describe 'licenses' do context 'industry approval' do it 'should be approved by OSI or FSF or OD' do - expect(approved_licenses).to include(spdx_lcase), 'See https://git.io/vzCTV.' + expect(approved_licenses).to include(spdx_lcase), 'See https://github.com/github/choosealicense.com/blob/master/CONTRIBUTING.md#adding-new-licenses.' end end From 8359cdcb3f4886976a8dd5616c6b52fd62f1fe22 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 27 Apr 2022 07:43:32 -0700 Subject: [PATCH 4/4] avoid master->gh-pages redirect --- spec/license_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/license_spec.rb b/spec/license_spec.rb index 09460c6..d0dbaf1 100644 --- a/spec/license_spec.rb +++ b/spec/license_spec.rb @@ -28,7 +28,7 @@ describe 'licenses' do context 'industry approval' do it 'should be approved by OSI or FSF or OD' do - expect(approved_licenses).to include(spdx_lcase), 'See https://github.com/github/choosealicense.com/blob/master/CONTRIBUTING.md#adding-new-licenses.' + expect(approved_licenses).to include(spdx_lcase), 'See https://github.com/github/choosealicense.com/blob/gh-pages/CONTRIBUTING.md#adding-new-licenses.' end end