From 17dc9b40dd39147362e1bbf141875f30e8b6dcd5 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Sun, 4 Apr 2021 12:08:09 +0800 Subject: [PATCH 01/12] Add the Mulan-PSL v2 license 1. SPDX Identifier: https://spdx.org/licenses/MulanPSL-2.0.html 2. OSI approved: https://opensource.org/licenses/MulanPSL-2.0 3. Over 1000 projects: https://hub.fastgit.org/search?q=%22Mulan+PSL+v2%22+filename%3ALICENSE 4. 3 notable projects founded Chinese characters are wrapped to 50 characters each line width since they're much wider than English letters. previous issue: #761 --- _licenses/mulanpsl-2.0.txt | 225 +++++++++++++++++++++++++++++++++++++ 1 file changed, 225 insertions(+) create mode 100644 _licenses/mulanpsl-2.0.txt diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt new file mode 100644 index 0000000..d904c0c --- /dev/null +++ b/_licenses/mulanpsl-2.0.txt @@ -0,0 +1,225 @@ +--- +title: Mulan Permissive Software License，Version 2 +spdx-id: MulanPSL-2.0 +hidden: true + +description: A permissive license similar to the Apache License, but explicitly states that it does not grant trademark rights. Mulan Permissive Software License is the first open source license in both Chinese and English approved by OSI. + +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. + +note: It's suggested to take the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license. + +using: + - openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/LICENSE + - OSCPU NutShell: https://github.com/OSCPU/NutShell/blob/master/LICENSE + - Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE + +permissions: + - commercial-use + - modifications + - distribution + - patent-use + - private-use + +conditions: + - include-copyright + +limitations: + - liability + - trademark-use + - warranty + +--- + +木兰宽松许可证, 第2版 + +木兰宽松许可证， 第2版 + +2020年1月 http://license.coscl.org.cn/MulanPSL2 + +您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束： + +0. 定义 + +“软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。 + +“贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。 + +“贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。 + +“法人实体” 是指提交贡献的机构及其“关联实体”。 + +“关联实体” 是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是 +指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。 + +1. 授予版权许可 + +每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可 +以复制、使用、修改、分发其“贡献”，不论修改与否。 + +2. 授予专利许可 + +每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定 +撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡 +献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软 +件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“ +关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或 +其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权 +行动之日终止。 + +3. 无商标许可 + +“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定 +的声明义务而必须使用除外。 + +4. 分发限制 + +您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“ +本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。 + +5. 免责声明与责任限制 + +“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对 +任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于 +何种法律理论，即使其曾被建议有此种损失的可能性。 + +6. 语言 + +“本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文 +版为准。 + +条款结束 + +如何将木兰宽松许可证，第2版，应用到您的软件 + +如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步： + +1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字； + +2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中； + +3， 请将如下声明文本放入每个源文件的头部注释中。 + +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 +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. +See the Mulan PSL v2 for more details. + +Mulan Permissive Software License，Version 2 + +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 b +e subject to Mulan PSL v2 (this License) with the following terms and conditi +ons: + +0. Definition + +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 +Contributor under this License. + +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 +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 +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 +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 +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 +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 +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 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 +SHALL PREVAIL. + +END OF THE TERMS AND CONDITIONS + +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 +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 +identified as the copyright owner; +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 +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 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. +See the Mulan PSL v2 for more details. From 7d0e120a22fa15b1711e098da24cd7f36b2437b3 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Sun, 4 Apr 2021 14:53:30 +0800 Subject: [PATCH 02/12] Correct the YAML format for MulanPSL-v2 --- _licenses/mulanpsl-2.0.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index d904c0c..81841ef 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -1,7 +1,6 @@ --- title: Mulan Permissive Software License，Version 2 spdx-id: MulanPSL-2.0 -hidden: true description: A permissive license similar to the Apache License, but explicitly states that it does not grant trademark rights. Mulan Permissive Software License is the first open source license in both Chinese and English approved by OSI. @@ -10,9 +9,9 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: It's suggested to take the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license. using: - - openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/LICENSE - - OSCPU NutShell: https://github.com/OSCPU/NutShell/blob/master/LICENSE - - Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE + openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/LICENSE + OSCPU NutShell: https://github.com/OSCPU/NutShell/blob/master/LICENSE + Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE permissions: - commercial-use From d8a0cbe843d0b3b9bc6c4062b318d86bf00f75ce Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Sun, 4 Apr 2021 15:10:00 +0800 Subject: [PATCH 03/12] Correct the wrap lines for MulanPSL-v2 --- _licenses/mulanpsl-2.0.txt | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index 81841ef..f40f663 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -105,8 +105,9 @@ 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, +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. @@ -116,9 +117,9 @@ 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 b -e subject to Mulan PSL v2 (this License) with the following terms and conditi -ons: +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 @@ -156,8 +157,8 @@ 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 +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 @@ -183,9 +184,9 @@ disclaimer statements in the Software. 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 +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. @@ -214,11 +215,12 @@ 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 PSL -v2. +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, +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 8ab1de200066cd58b5a84fdc593252c25ea24f6f Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Sun, 4 Apr 2021 15:13:09 +0800 Subject: [PATCH 04/12] Correct the wrap lines for MulanPSL-v2 --- _licenses/mulanpsl-2.0.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index f40f663..a563ebe 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -158,8 +158,8 @@ 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 +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 @@ -199,8 +199,8 @@ SHALL PREVAIL. END OF THE TERMS AND CONDITIONS -How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) -to Your Software +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 recipients, you are suggested to complete following three steps: From 7aa85522343ec71b1869469d43f74354fbba9df3 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Sun, 4 Apr 2021 15:18:06 +0800 Subject: [PATCH 05/12] Correct the for MulanPSL-v2 --- _licenses/mulanpsl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index a563ebe..ad2537d 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -9,7 +9,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: It's suggested to take the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license. using: - openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/LICENSE + openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/License OSCPU NutShell: https://github.com/OSCPU/NutShell/blob/master/LICENSE Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE From 86129dc939ecc4ea85ca172f32b14f5430e3d80f Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Sun, 4 Apr 2021 15:32:23 +0800 Subject: [PATCH 06/12] Change the comma form for MulanPSL-v2 --- _licenses/mulanpsl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index ad2537d..2cfb15a 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -1,5 +1,5 @@ --- -title: Mulan Permissive Software License，Version 2 +title: Mulan Permissive Software License, Version 2 spdx-id: MulanPSL-2.0 description: A permissive license similar to the Apache License, but explicitly states that it does not grant trademark rights. Mulan Permissive Software License is the first open source license in both Chinese and English approved by OSI. From 3d952744bc2782eb2176e1e82ce215eaf54f4814 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Mon, 5 Apr 2021 09:50:15 +0800 Subject: [PATCH 07/12] Fix missing comma in MulanPSL-2.0 --- _licenses/mulanpsl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index 2cfb15a..424ebfe 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -221,6 +221,6 @@ 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 +NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. From 74170e098ab3710700bc1af62b18a3bcaf724f6f Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Mon, 5 Apr 2021 09:57:34 +0800 Subject: [PATCH 08/12] Update `using` example in MulanPSL-2.0 Huawei LiteOS is licensed under BSD-3-Clause, but the security function library, called `libsec`, is stored in a secondary directory. --- _licenses/mulanpsl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index 424ebfe..b734281 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -10,7 +10,7 @@ note: It's suggested to take the additional step of adding a boilerplate notice using: openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/License - OSCPU NutShell: https://github.com/OSCPU/NutShell/blob/master/LICENSE + Huawei LiteOS security function library: https://github.com/LiteOS/LiteOS/blob/master/lib/libsec/LICENSE Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE permissions: From f0efa379bb1a22d382bb2136bf2b7523da09e9b0 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Mon, 5 Apr 2021 10:23:29 +0800 Subject: [PATCH 09/12] Correct the writing format in MulanPSL-2.0 --- _licenses/mulanpsl-2.0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index b734281..d9e4df5 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -220,7 +220,7 @@ 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, +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 071d0a76abeb7f439a4f5c9e6db1c898e1bc739e Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Mon, 5 Apr 2021 10:34:27 +0800 Subject: [PATCH 10/12] Change the `using` example in MulanPSL-v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Got one from Google search with `site:github.com` qualifier. （ --- _licenses/mulanpsl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index d9e4df5..d092562 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -10,7 +10,7 @@ note: It's suggested to take the additional step of adding a boilerplate notice using: openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/License - Huawei LiteOS security function library: https://github.com/LiteOS/LiteOS/blob/master/lib/libsec/LICENSE + lute: https://github.com/88250/lute/blob/master/LICENSE Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE permissions: From 370441731651463ac3c3efe641fd29b15b106f69 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Mon, 5 Apr 2021 10:41:43 +0800 Subject: [PATCH 11/12] Correct writing in MulanPSL-2.0 --- _licenses/mulanpsl-2.0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index d092562..f28743d 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -220,7 +220,7 @@ 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, +KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO +NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. From 49800f1b9b693e722a2db626a3c6a5e0eddc0990 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Mon, 5 Apr 2021 10:45:57 +0800 Subject: [PATCH 12/12] Remove the duplicate line in MulanPSL-2.0 Forgive me for not wearing glasses. --- _licenses/mulanpsl-2.0.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index f28743d..9a1dbea 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -222,5 +222,4 @@ You may obtain a copy of Mulan PSL v2 at: 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. -MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details.