licensee 9.15.1 → 9.15.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (46) hide show
  1. checksums.yaml +4 -4
  2. data/lib/licensee/commands/detect.rb +1 -1
  3. data/lib/licensee/commands/diff.rb +2 -4
  4. data/lib/licensee/content_helper.rb +3 -3
  5. data/lib/licensee/license.rb +3 -4
  6. data/lib/licensee/matchers/copyright.rb +1 -1
  7. data/lib/licensee/matchers/dice.rb +5 -7
  8. data/lib/licensee/project_files/license_file.rb +5 -7
  9. data/lib/licensee/projects/git_project.rb +5 -7
  10. data/lib/licensee/projects/project.rb +13 -19
  11. data/lib/licensee/version.rb +1 -1
  12. data/lib/licensee.rb +6 -3
  13. data/licensee.gemspec +1 -0
  14. data/spec/fixtures/detect.json +1 -1
  15. data/spec/fixtures/license-hashes.json +3 -2
  16. data/spec/licensee/content_helper_spec.rb +1 -1
  17. data/spec/licensee/license_spec.rb +3 -3
  18. data/spec/licensee/matchers/dice_matcher_spec.rb +1 -1
  19. data/spec/licensee/project_files/license_file_spec.rb +1 -1
  20. data/spec/licensee/project_files/package_info_spec.rb +2 -2
  21. data/spec/licensee/project_spec.rb +3 -2
  22. data/spec/licensee_spec.rb +8 -2
  23. data/spec/vendored_license_spec.rb +0 -2
  24. data/vendor/choosealicense.com/_licenses/0bsd.txt +4 -2
  25. data/vendor/choosealicense.com/_licenses/afl-3.0.txt +12 -12
  26. data/vendor/choosealicense.com/_licenses/bsd-3-clause.txt +2 -2
  27. data/vendor/choosealicense.com/_licenses/cc-by-4.0.txt +1 -1
  28. data/vendor/choosealicense.com/_licenses/cc-by-sa-4.0.txt +1 -1
  29. data/vendor/choosealicense.com/_licenses/isc.txt +8 -8
  30. data/vendor/choosealicense.com/_licenses/mulanpsl-2.0.txt +226 -0
  31. data/vendor/choosealicense.com/_licenses/odbl-1.0.txt +1 -1
  32. data/vendor/choosealicense.com/_licenses/osl-3.0.txt +1 -1
  33. data/vendor/choosealicense.com/_licenses/upl-1.0.txt +1 -1
  34. data/vendor/license-list-XML/src/0BSD.xml +5 -1
  35. data/vendor/license-list-XML/src/AGPL-3.0.xml +4 -4
  36. data/vendor/license-list-XML/src/Apache-2.0.xml +1 -1
  37. data/vendor/license-list-XML/src/BSD-2-Clause.xml +1 -1
  38. data/vendor/license-list-XML/src/BSD-3-Clause.xml +1 -1
  39. data/vendor/license-list-XML/src/CC-BY-4.0.xml +13 -11
  40. data/vendor/license-list-XML/src/CC-BY-SA-4.0.xml +13 -11
  41. data/vendor/license-list-XML/src/GPL-3.0.xml +5 -5
  42. data/vendor/license-list-XML/src/ISC.xml +7 -5
  43. data/vendor/license-list-XML/src/LGPL-3.0.xml +1 -1
  44. data/vendor/license-list-XML/src/MPL-2.0.xml +1 -1
  45. data/vendor/license-list-XML/src/MulanPSL-2.0.xml +167 -0
  46. metadata +7 -4
@@ -0,0 +1,226 @@
1
+ ---
2
+ title: Mulan Permissive Software License, Version 2
3
+ spdx-id: MulanPSL-2.0
4
+ nickname: Mulan PSL v2
5
+
6
+ description: A permissive license similar to the <a href="/licenses/apache-2.0/">Apache License</a>, 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.
7
+
8
+ 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.
9
+
10
+ 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.
11
+
12
+ using:
13
+ openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/License
14
+ lute: https://github.com/88250/lute/blob/master/LICENSE
15
+ Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE
16
+
17
+ permissions:
18
+ - commercial-use
19
+ - modifications
20
+ - distribution
21
+ - patent-use
22
+ - private-use
23
+
24
+ conditions:
25
+ - include-copyright
26
+
27
+ limitations:
28
+ - liability
29
+ - trademark-use
30
+ - warranty
31
+
32
+ ---
33
+
34
+ 木兰宽松许可证, 第2版
35
+
36
+ 木兰宽松许可证, 第2版
37
+
38
+ 2020年1月 http://license.coscl.org.cn/MulanPSL2
39
+
40
+ 您对“软件”的复制、使用、修改及分发受木兰宽松许可证,第2版(“本许可证”)的如下条款的约束:
41
+
42
+ 0. 定义
43
+
44
+ “软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
45
+
46
+ “贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
47
+
48
+ “贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
49
+
50
+ “法人实体” 是指提交贡献的机构及其“关联实体”。
51
+
52
+ “关联实体” 是指,对“本许可证”下的行为方而言,控制、受控制或与其共同受控制的机构,此处的控制是
53
+ 指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
54
+
55
+ 1. 授予版权许可
56
+
57
+ 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可,您可
58
+ 以复制、使用、修改、分发其“贡献”,不论修改与否。
59
+
60
+ 2. 授予专利许可
61
+
62
+ 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的(根据本条规定
63
+ 撤销除外)专利许可,供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡
64
+ 献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软
65
+ 件”结合而将必然会侵犯的专利权利要求,不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“
66
+ 关联实体”直接或间接地,就“软件”或其中的“贡献”对任何人发起专利侵权诉讼(包括反诉或交叉诉讼)或
67
+ 其他专利维权行动,指控其侵犯专利权,则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权
68
+ 行动之日终止。
69
+
70
+ 3. 无商标许可
71
+
72
+ “本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可,但您为满足第4条规定
73
+ 的声明义务而必须使用除外。
74
+
75
+ 4. 分发限制
76
+
77
+ 您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发,不论修改与否,但您必须向接收者提供“
78
+ 本许可证”的副本,并保留“软件”中的版权、商标、专利及免责声明。
79
+
80
+ 5. 免责声明与责任限制
81
+
82
+ “软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下,“贡献者”或版权所有者不对
83
+ 任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任,不论因何种原因导致或者基于
84
+ 何种法律理论,即使其曾被建议有此种损失的可能性。
85
+
86
+ 6. 语言
87
+
88
+ “本许可证”以中英文双语表述,中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致,以中文
89
+ 版为准。
90
+
91
+ 条款结束
92
+
93
+ 如何将木兰宽松许可证,第2版,应用到您的软件
94
+
95
+ 如果您希望将木兰宽松许可证,第2版,应用到您的新软件,为了方便接收者查阅,建议您完成如下三步:
96
+
97
+ 1, 请您补充如下声明中的空白,包括软件名、软件的首次发表年份以及您作为版权人的名字;
98
+
99
+ 2, 请您在软件包的一级目录下创建以“LICENSE”为名的文件,将整个许可证文本放入该文件中;
100
+
101
+ 3, 请将如下声明文本放入每个源文件的头部注释中。
102
+
103
+ Copyright (c) [Year] [name of copyright holder]
104
+ [Software Name] is licensed under Mulan PSL v2.
105
+ You can use this software according to the terms and conditions of the Mulan
106
+ PSL v2.
107
+ You may obtain a copy of Mulan PSL v2 at:
108
+ http://license.coscl.org.cn/MulanPSL2
109
+ THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY
110
+ KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
111
+ NON-INFRINGEMENT,
112
+ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
113
+ See the Mulan PSL v2 for more details.
114
+
115
+ Mulan Permissive Software License,Version 2
116
+
117
+ Mulan Permissive Software License,Version 2 (Mulan PSL v2)
118
+
119
+ January 2020 http://license.coscl.org.cn/MulanPSL2
120
+
121
+ Your reproduction, use, modification and distribution of the Software shall
122
+ be subject to Mulan PSL v2 (this License) with the following terms and
123
+ conditions:
124
+
125
+ 0. Definition
126
+
127
+ Software means the program and related documents which are licensed under
128
+ this License and comprise all Contribution(s).
129
+
130
+ Contribution means the copyrightable work licensed by a particular
131
+ Contributor under this License.
132
+
133
+ Contributor means the Individual or Legal Entity who licenses its
134
+ copyrightable work under this License.
135
+
136
+ Legal Entity means the entity making a Contribution and all its
137
+ Affiliates.
138
+
139
+ Affiliates means entities that control, are controlled by, or are under
140
+ common control with the acting entity under this License, ‘control’ means
141
+ direct or indirect ownership of at least fifty percent (50%) of the voting
142
+ power, capital or other securities of controlled or commonly controlled
143
+ entity.
144
+
145
+ 1. Grant of Copyright License
146
+
147
+ Subject to the terms and conditions of this License, each Contributor hereby
148
+ grants to you a perpetual, worldwide, royalty-free, non-exclusive,
149
+ irrevocable copyright license to reproduce, use, modify, or distribute its
150
+ Contribution, with modification or not.
151
+
152
+ 2. Grant of Patent License
153
+
154
+ Subject to the terms and conditions of this License, each Contributor hereby
155
+ grants to you a perpetual, worldwide, royalty-free, non-exclusive,
156
+ irrevocable (except for revocation under this Section) patent license to
157
+ make, have made, use, offer for sale, sell, import or otherwise transfer its
158
+ Contribution, where such patent license is only limited to the patent claims
159
+ owned or controlled by such Contributor now or in future which will be
160
+ necessarily infringed by its Contribution alone, or by combination of the
161
+ Contribution with the Software to which the Contribution was contributed.
162
+ The patent license shall not apply to any modification of the Contribution,
163
+ and any other combination which includes the Contribution. If you or your
164
+ Affiliates directly or indirectly institute patent litigation (including a
165
+ cross claim or counterclaim in a litigation) or other patent enforcement
166
+ activities against any individual or entity by alleging that the Software or
167
+ any Contribution in it infringes patents, then any patent license granted to
168
+ you under this License for the Software shall terminate as of the date such
169
+ litigation or activity is filed or taken.
170
+
171
+ 3. No Trademark License
172
+
173
+ No trademark license is granted to use the trade names, trademarks, service
174
+ marks, or product names of Contributor, except as required to fulfill notice
175
+ requirements in section 4.
176
+
177
+ 4. Distribution Restriction
178
+
179
+ You may distribute the Software in any medium with or without modification,
180
+ whether in source or executable forms, provided that you provide recipients
181
+ with a copy of this License and retain copyright, patent, trademark and
182
+ disclaimer statements in the Software.
183
+
184
+ 5. Disclaimer of Warranty and Limitation of Liability
185
+
186
+ THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY
187
+ KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR
188
+ COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT
189
+ LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING
190
+ FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO
191
+ MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF
192
+ THE POSSIBILITY OF SUCH DAMAGES.
193
+
194
+ 6. Language
195
+
196
+ THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION
197
+ AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF
198
+ DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION
199
+ SHALL PREVAIL.
200
+
201
+ END OF THE TERMS AND CONDITIONS
202
+
203
+ How to Apply the Mulan Permissive Software License,Version 2
204
+ (Mulan PSL v2) to Your Software
205
+
206
+ To apply the Mulan PSL v2 to your work, for easy identification by
207
+ recipients, you are suggested to complete following three steps:
208
+
209
+ i. Fill in the blanks in following statement, including insert your software
210
+ name, the year of the first publication of your software, and your name
211
+ identified as the copyright owner;
212
+ ii. Create a file named "LICENSE" which contains the whole context of this
213
+ License in the first directory of your software package;
214
+ iii. Attach the statement to the appropriate annotated syntax at the
215
+ beginning of each source file.
216
+
217
+ Copyright (c) [Year] [name of copyright holder]
218
+ [Software Name] is licensed under Mulan PSL v2.
219
+ You can use this software according to the terms and conditions of the Mulan
220
+ PSL v2.
221
+ You may obtain a copy of Mulan PSL v2 at:
222
+ http://license.coscl.org.cn/MulanPSL2
223
+ THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY
224
+ KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
225
+ NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
226
+ See the Mulan PSL v2 for more details.
@@ -1,5 +1,5 @@
1
1
  ---
2
- title: ODC Open Database License v1.0
2
+ title: Open Data Commons Open Database License v1.0
3
3
  spdx-id: ODbL-1.0
4
4
  nickname: ODbL
5
5
 
@@ -41,7 +41,7 @@ authorship (the "Original Work") whose owner (the "Licensor") has placed the
41
41
  following licensing notice adjacent to the copyright notice for the Original
42
42
  Work:
43
43
 
44
- Licensed under the Open Software License version 3.0
44
+ Licensed under the Open Software License version 3.0
45
45
 
46
46
  1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free,
47
47
  non-exclusive, sublicensable license, for the duration of the copyright, to do
@@ -9,7 +9,7 @@ how: Insert the license or a link to it along with a copyright notice into your
9
9
  note: It is recommended to add a link to the license and copyright notice at the top of each source file, example text can be found at https://oss.oracle.com/licenses/upl/.
10
10
 
11
11
  using:
12
- Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/master/LICENSE
12
+ Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/main/LICENSE.txt
13
13
  Skater: https://github.com/oracle/Skater/blob/master/LICENSE
14
14
  Soufflé: https://github.com/souffle-lang/souffle/blob/master/LICENSE
15
15
 
@@ -3,10 +3,14 @@
3
3
  <license isOsiApproved="true" licenseId="0BSD" name="BSD Zero Clause License">
4
4
  <crossRefs>
5
5
  <crossRef>http://landley.net/toybox/license.html</crossRef>
6
+ <crossRef>https://opensource.org/licenses/0BSD</crossRef>
6
7
  </crossRefs>
7
8
  <text>
9
+ <titleText>
10
+ <p><alt name="title" match="(BSD Zero[ -]Clause|Zero[ -]Clause BSD)( License)?( \(0BSD\))?">BSD Zero Clause License</alt></p>
11
+ </titleText>
8
12
  <copyrightText>
9
- <p>Copyright (C) 2006 by Rob Landley &lt;rob@landley.net&gt;</p>
13
+ <p>Copyright (C) YEAR by AUTHOR EMAIL</p>
10
14
  </copyrightText>
11
15
 
12
16
  <p>Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is
@@ -21,7 +21,7 @@
21
21
  PURPOSE. See the GNU Affero General Public License for more details.
22
22
  You should have received a copy of the GNU Affero General Public License
23
23
  along with this program. If not, see
24
- &lt;http<optional spacing="none">s</optional>://www.gnu.org/licenses/&gt;
24
+ &lt;https://www.gnu.org/licenses/&gt;
25
25
  </standardLicenseHeader>
26
26
  <text>
27
27
  <titleText>
@@ -32,7 +32,7 @@
32
32
  </titleText>
33
33
  <p>
34
34
  Copyright (C) 2007 Free Software Foundation, Inc.
35
- &lt;http<optional spacing="none">s</optional>://fsf.org/&gt;
35
+ &lt;https://fsf.org/&gt;
36
36
  </p>
37
37
  <p>
38
38
  Everyone is permitted to copy and distribute verbatim copies
@@ -825,7 +825,7 @@
825
825
  <p>
826
826
  You should have received a copy of the GNU Affero General
827
827
  Public License along with this program. If not, see
828
- &lt;http<optional spacing="none">s</optional>://www.gnu.org/licenses/&gt;.
828
+ &lt;https://www.gnu.org/licenses/&gt;.
829
829
  </p>
830
830
  <p>
831
831
  Also add information on how to contact you by electronic and paper mail.
@@ -844,7 +844,7 @@
844
844
  or school, if any, to sign a "copyright disclaimer" for
845
845
  the program, if necessary. For more information on this,
846
846
  and how to apply and follow the GNU AGPL, see
847
- &lt;http<optional spacing="none">s</optional>://www.gnu.org/licenses/&gt;.
847
+ &lt;https://www.gnu.org/licenses/&gt;.
848
848
  </p>
849
849
  </optional>
850
850
  </text>
@@ -2,7 +2,7 @@
2
2
  <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
3
3
  <license isOsiApproved="true" licenseId="Apache-2.0" name="Apache License 2.0">
4
4
  <crossRefs>
5
- <crossRef>http://www.apache.org/licenses/LICENSE-2.0</crossRef>
5
+ <crossRef>https://www.apache.org/licenses/LICENSE-2.0</crossRef>
6
6
  <crossRef>https://opensource.org/licenses/Apache-2.0</crossRef>
7
7
  </crossRefs>
8
8
  <notes>This license was released January 2004</notes>
@@ -7,7 +7,7 @@
7
7
  </crossRefs>
8
8
  <text>
9
9
  <copyrightText>
10
- <p>Copyright (c) &lt;year&gt; &lt;owner&gt;. All rights reserved.
10
+ <p>Copyright (c) &lt;year&gt; &lt;owner&gt;.
11
11
  </p>
12
12
  </copyrightText>
13
13
 
@@ -7,7 +7,7 @@
7
7
  </crossRefs>
8
8
  <text>
9
9
  <copyrightText>
10
- <p>Copyright (c) &lt;year&gt; &lt;owner&gt;. All rights reserved.</p>
10
+ <p>Copyright (c) &lt;year&gt; &lt;owner&gt;. </p>
11
11
  </copyrightText>
12
12
 
13
13
  <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided
@@ -428,17 +428,19 @@
428
428
  the legal processes of any jurisdiction or authority.
429
429
  </item>
430
430
  </list>
431
- <p>Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to
432
- apply one of its public licenses to material it publishes and in those instances will be considered
433
- the “Licensor.” <optional>The text of the Creative Commons public licenses is dedicated to the public
434
- domain under the CC0 Public Domain Dedication.</optional> Except for the limited purpose of indicating that material is shared under a Creative
435
- Commons public license or as otherwise permitted by the Creative Commons policies published at
436
- creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative
437
- Commons or any other trademark or logo of Creative Commons without its prior written consent
438
- including, without limitation, in connection with any unauthorized modifications to any of its public
439
- licenses or any other arrangements, understandings, or agreements concerning use of licensed material.
440
- For the avoidance of doubt, this paragraph does not form part of the public licenses.</p>
441
- <p>Creative Commons may be contacted at creativecommons.org.</p>
431
+ <optional>
432
+ <p>Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to
433
+ apply one of its public licenses to material it publishes and in those instances will be considered
434
+ the “Licensor.” <optional>The text of the Creative Commons public licenses is dedicated to the public
435
+ domain under the CC0 Public Domain Dedication.</optional> Except for the limited purpose of indicating that material is shared under a Creative
436
+ Commons public license or as otherwise permitted by the Creative Commons policies published at
437
+ creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative
438
+ Commons” or any other trademark or logo of Creative Commons without its prior written consent
439
+ including, without limitation, in connection with any unauthorized modifications to any of its public
440
+ licenses or any other arrangements, understandings, or agreements concerning use of licensed material.
441
+ For the avoidance of doubt, this paragraph does not form part of the public licenses.</p>
442
+ <p>Creative Commons may be contacted at creativecommons.org.</p>
443
+ </optional>
442
444
  </text>
443
445
  </license>
444
446
  </SPDXLicenseCollection>
@@ -459,17 +459,19 @@
459
459
  the legal processes of any jurisdiction or authority.
460
460
  </item>
461
461
  </list>
462
- <p>Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to
463
- apply one of its public licenses to material it publishes and in those instances will be considered
464
- the “Licensor.” <optional>The text of the Creative Commons public licenses is dedicated to the public
465
- domain under the CC0 Public Domain Dedication.</optional> Except for the limited purpose of indicating that material is shared under a Creative
466
- Commons public license or as otherwise permitted by the Creative Commons policies published at
467
- creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative
468
- Commons or any other trademark or logo of Creative Commons without its prior written consent
469
- including, without limitation, in connection with any unauthorized modifications to any of its public
470
- licenses or any other arrangements, understandings, or agreements concerning use of licensed material.
471
- For the avoidance of doubt, this paragraph does not form part of the public licenses.</p>
472
- <p>Creative Commons may be contacted at creativecommons.org.</p>
462
+ <optional>
463
+ <p>Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to
464
+ apply one of its public licenses to material it publishes and in those instances will be considered
465
+ the “Licensor.” <optional>The text of the Creative Commons public licenses is dedicated to the public
466
+ domain under the CC0 Public Domain Dedication.</optional> Except for the limited purpose of indicating that material is shared under a Creative
467
+ Commons public license or as otherwise permitted by the Creative Commons policies published at
468
+ creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative
469
+ Commons” or any other trademark or logo of Creative Commons without its prior written consent
470
+ including, without limitation, in connection with any unauthorized modifications to any of its public
471
+ licenses or any other arrangements, understandings, or agreements concerning use of licensed material.
472
+ For the avoidance of doubt, this paragraph does not form part of the public licenses.</p>
473
+ <p>Creative Commons may be contacted at creativecommons.org.</p>
474
+ </optional>
473
475
  </text>
474
476
  </license>
475
477
  </SPDXLicenseCollection>
@@ -28,7 +28,7 @@
28
28
  <p>
29
29
  You should have received a copy of the GNU General
30
30
  Public License along with this program. If not, see
31
- &lt;http<optional spacing="none">s</optional>://www.gnu.org/licenses/&gt;.
31
+ &lt;https://www.gnu.org/licenses/&gt;.
32
32
  </p>
33
33
  </standardLicenseHeader>
34
34
  <text>
@@ -40,7 +40,7 @@
40
40
  </titleText>
41
41
  <p>
42
42
  Copyright © 2007 Free Software Foundation, Inc.
43
- &lt;http<optional spacing="none">s</optional>://fsf.org/&gt;
43
+ &lt;https://fsf.org/&gt;
44
44
  </p>
45
45
  <p>
46
46
  Everyone is permitted to copy and distribute verbatim copies
@@ -813,7 +813,7 @@
813
813
  <p>
814
814
  You should have received a copy of the GNU General
815
815
  Public License along with this program. If not, see
816
- &lt;http<optional spacing="none">s</optional>://www.gnu.org/licenses/&gt;.
816
+ &lt;https://www.gnu.org/licenses/&gt;.
817
817
  </p>
818
818
  <p>
819
819
  Also add information on how to contact you by electronic and paper mail.
@@ -841,7 +841,7 @@
841
841
  programmer) or school, if any, to sign a “copyright disclaimer”
842
842
  for the program, if necessary. For more information on
843
843
  this, and how to apply and follow the GNU GPL, see
844
- &lt;http<optional spacing="none">s</optional>://www.gnu.org/licenses/&gt;.
844
+ &lt;https://www.gnu.org/licenses/&gt;.
845
845
  </p>
846
846
  <p>
847
847
  The GNU General Public License does not permit incorporating
@@ -850,7 +850,7 @@
850
850
  linking proprietary applications with the library. If this
851
851
  is what you want to do, use the GNU Lesser General Public
852
852
  License instead of this License. But first, please read
853
- &lt;http<optional spacing="none">s</optional>://www.gnu.org/<alt match="philosophy|licenses" name="philicenses">licenses</alt>/why-not-lgpl.html&gt;.
853
+ &lt;https://www.gnu.org/<alt match="philosophy|licenses" name="philicenses">licenses</alt>/why-not-lgpl.html&gt;.
854
854
  </p>
855
855
  </optional>
856
856
  </text>
@@ -2,25 +2,27 @@
2
2
  <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
3
3
  <license isOsiApproved="true" licenseId="ISC" name="ISC License">
4
4
  <crossRefs>
5
+ <crossRef>https://www.isc.org/licenses/</crossRef>
5
6
  <crossRef>https://www.isc.org/downloads/software-support-policy/isc-license/</crossRef>
6
7
  <crossRef>https://opensource.org/licenses/ISC</crossRef>
7
8
  </crossRefs>
9
+ <notes>
10
+ The ISC License text changed 'and' to 'and/or' in July 2007.
11
+ </notes>
8
12
  <text>
9
13
  <titleText>
10
14
  <p><alt name="title" match="(The )?ISC License( \(ISC[L]?\))?:?">ISC License</alt></p>
11
15
  </titleText>
12
16
  <copyrightText>
13
- <p>Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
14
- <br/>Copyright (c) 1995-2003 by Internet Software Consortium
15
- </p>
17
+ <p>&lt;copyright notice&gt;</p>
16
18
  </copyrightText>
17
19
 
18
20
  <p>Permission to use, copy, modify, and<optional>/or</optional> distribute this software for any purpose with or without fee is
19
21
  hereby granted, provided that the above copyright notice and this permission notice appear in all
20
22
  copies.</p>
21
- <p>THE SOFTWARE IS PROVIDED "AS IS" AND <alt match=".+" name="copyrightHolder">ISC</alt> DISCLAIMS ALL
23
+ <p>THE SOFTWARE IS PROVIDED "AS IS" AND <alt match=".+" name="author">THE AUTHOR</alt> DISCLAIMS ALL
22
24
  WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
23
- FITNESS. IN NO EVENT SHALL <alt match=".+" name="copyrightHolderLiability">ISC</alt> BE LIABLE FOR ANY
25
+ FITNESS. IN NO EVENT SHALL <alt match=".+" name="authorLiability">THE AUTHOR</alt> BE LIABLE FOR ANY
24
26
  SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
25
27
  USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
26
28
  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</p>
@@ -20,7 +20,7 @@
20
20
  </titleText>
21
21
  <p>
22
22
  Copyright (C) 2007 Free Software Foundation, Inc.
23
- &lt;http<optional spacing="none">s</optional>://fsf.org/&gt;
23
+ &lt;https://fsf.org/&gt;
24
24
  </p>
25
25
  <p>
26
26
  Everyone is permitted to copy and distribute verbatim copies
@@ -2,7 +2,7 @@
2
2
  <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
3
3
  <license isOsiApproved="true" licenseId="MPL-2.0" name="Mozilla Public License 2.0">
4
4
  <crossRefs>
5
- <crossRef>http://www.mozilla.org/MPL/2.0/</crossRef>
5
+ <crossRef>https://www.mozilla.org/MPL/2.0/</crossRef>
6
6
  <crossRef>https://opensource.org/licenses/MPL-2.0</crossRef>
7
7
  </crossRefs>
8
8
  <notes>This license was released in January 2012. This license list entry is for use when the standard MPL 2.0 is