Skip to content

Commit 6515a34

Browse files
Merge branch 'develop' into update-license-rules
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
2 parents 30ff428 + 3cd628c commit 6515a34

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+297
-43
lines changed

CHANGELOG.rst

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,32 @@ Changes in Output Data Structure:
8989
is_license_notice, is_license_intro etc, as applicable).
9090

9191
- New and updated licenses, including support for newly released
92-
SPDX license list version 3.22. This release of the SPDX license
93-
list had 48 new licenses, and several of them we already had as
94-
licenses/rules, and these has been modified to be consistent with
95-
the SPDX list. And the rest have been added as new licenses.
96-
For more details see https://github.com/nexB/scancode-toolkit/pull/3554
92+
SPDX license list versions:
93+
- SPDX License List 3.22:
94+
This release of the SPDX license list had 48 new licenses,
95+
and several of them we already had as licenses/rules, and
96+
these has been modified to be consistent with the SPDX list.
97+
And the rest have been added as new licenses.
98+
For more details see https://github.com/nexB/scancode-toolkit/pull/3554
99+
100+
- SPDX License List 3.23:
101+
This release of the SPDX license list had 43 new licenses,
102+
and out of them 22 were present as licenses and 10 were
103+
present as rules already. There were 4 new license/exception
104+
texts added, and the rest were either texts with small variations,
105+
additions to texts or several rule texts together.
106+
For more details see https://github.com/nexB/scancode-toolkit/pull/3653
107+
108+
- We also have lots of other misc new licenses and rules added to
109+
LicenseDB, see PRs below for more details:
110+
https://github.com/nexB/scancode-toolkit/pull/3663
111+
https://github.com/nexB/scancode-toolkit/pull/3642
112+
https://github.com/nexB/scancode-toolkit/pull/3586
113+
https://github.com/nexB/scancode-toolkit/pull/3584
114+
https://github.com/nexB/scancode-toolkit/pull/3575
115+
https://github.com/nexB/scancode-toolkit/pull/3570
116+
https://github.com/nexB/scancode-toolkit/pull/3568
117+
https://github.com/nexB/scancode-toolkit/pull/3562
97118

98119
- Improve debian namespace detection based on clues and fix
99120
namespace and qualifier bugs for debian purls.

src/licensedcode/data/licenses/caldera-no-preamble.LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ key: caldera-no-preamble
33
short_name: Caldera License (without preamble)
44
name: Caldera License (without preamble)
55
category: Permissive
6-
owner: Caldera International Inc.
6+
owner: Caldera
77
notes: |
88
Added in SPDX license list 3.23
99
This was previously the license rule: bsd-original_46.RULE
Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
---
2+
key: catharon-osl
3+
short_name: Catharon OSL
4+
name: Catharon Open Source License
5+
category: Permissive
6+
owner: Catharon
7+
homepage_url: https://github.com/scummvm/scummvm/blob/master/LICENSES/CatharonLicense.txt
8+
spdx_license_key: LicenseRef-scancode-catharon-osl
9+
text_urls:
10+
- https://github.com/scummvm/scummvm/tree/master/engines/ags/lib/freetype-2.1.3/autohint
11+
- https://www.copperspice.com/docs/cs_overview/legal-3rdparty.html
12+
other_urls:
13+
- https://github.com/search?q=%22The+Catharon+Open+Source+LICENSE%22&type=code
14+
standard_notice: |
15+
This file is part of the Catharon Typography Project and shall only be
16+
used, modified, and distributed under the terms of the Catharon Open Source
17+
License. By continuing to use, modify, or distribute this file you indicate
18+
that you have read the license and understand and accept it fully.
19+
ignorable_copyrights:
20+
- copyright (c) 2000 by Catharon Productions, Inc.
21+
ignorable_holders:
22+
- Catharon Productions, Inc.
23+
---
24+
25+
The Catharon Open Source LICENSE
26+
27+
2000-Jul-04
28+
29+
Introduction
30+
============
31+
32+
This license applies to source files distributed by Catharon
33+
Productions, Inc. in several archive packages. This license
34+
applies to all files found in such packages which do not fall
35+
under their own explicit license.
36+
37+
This license was inspired by the BSD, Artistic, and IJG
38+
(Independent JPEG Group) licenses, which all encourage inclusion
39+
and use of free software in commercial and freeware products
40+
alike. As a consequence, its main points are that:
41+
42+
o We don't promise that this software works. However, we are
43+
interested in any kind of bug reports. (`as is' distribution)
44+
45+
o You can use this software for whatever you want, in parts or
46+
full form, without having to pay us. (`royalty-free' usage)
47+
48+
o You may not pretend that you wrote this software. If you use
49+
it, or only parts of it, in a program, you must acknowledge
50+
somewhere in your documentation that you have used the
51+
Catharon Code. (`credits')
52+
53+
We specifically permit and encourage the inclusion of this
54+
software, with or without modifications, in commercial products.
55+
We disclaim all warranties covering the packages distributed by
56+
Catharon Productions, Inc. and assume no liability related to
57+
their use.
58+
59+
60+
Legal Terms
61+
===========
62+
63+
0. Definitions
64+
--------------
65+
66+
Throughout this license, the terms `Catharon Package', `package',
67+
and `Catharon Code' refer to the set of files originally
68+
distributed by Catharon Productions, Inc.
69+
70+
`You' refers to the licensee, or person using the project, where
71+
`using' is a generic term including compiling the project's source
72+
code as well as linking it to form a `program' or `executable'.
73+
This program is referred to as `a program using one of the
74+
Catharon Packages'.
75+
76+
This license applies to all files distributed in the original
77+
Catharon Package(s), including all source code, binaries and
78+
documentation, unless otherwise stated in the file in its
79+
original, unmodified form as distributed in the original archive.
80+
If you are unsure whether or not a particular file is covered by
81+
this license, you must contact us to verify this.
82+
83+
The Catharon Packages are copyright (C) 2000 by Catharon
84+
Productions, Inc. All rights reserved except as specified below.
85+
86+
1. No Warranty
87+
--------------
88+
89+
THE CATHARON PACKAGES ARE PROVIDED `AS IS' WITHOUT WARRANTY OF ANY
90+
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
91+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
92+
PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
93+
BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OF OR THE INABILITY TO
94+
USE THE CATHARON PACKAGE.
95+
96+
2. Redistribution
97+
-----------------
98+
99+
This license grants a worldwide, royalty-free, perpetual and
100+
irrevocable right and license to use, execute, perform, compile,
101+
display, copy, create derivative works of, distribute and
102+
sublicense the Catharon Packages (in both source and object code
103+
forms) and derivative works thereof for any purpose; and to
104+
authorize others to exercise some or all of the rights granted
105+
herein, subject to the following conditions:
106+
107+
o Redistribution of source code must retain this license file
108+
(`license.txt') unaltered; any additions, deletions or changes
109+
to the original files must be clearly indicated in
110+
accompanying documentation. The copyright notices of the
111+
unaltered, original files must be preserved in all copies of
112+
source files.
113+
114+
o Redistribution in binary form must provide a disclaimer that
115+
states that the software is based in part on the work of
116+
Catharon Productions, Inc. in the distribution documentation.
117+
118+
These conditions apply to any software derived from or based on
119+
the Catharon Packages, not just the unmodified files. If you use
120+
our work, you must acknowledge us. However, no fee need be paid
121+
to us.
122+
123+
3. Advertising
124+
--------------
125+
126+
Neither Catharon Productions, Inc. and contributors nor you shall
127+
use the name of the other for commercial, advertising, or
128+
promotional purposes without specific prior written permission.
129+
130+
We suggest, but do not require, that you use the following phrase
131+
to refer to this software in your documentation: 'this software is
132+
based in part on the Catharon Typography Project'.
133+
134+
As you have not signed this license, you are not required to
135+
accept it. However, as the Catharon Packages are copyrighted
136+
material, only this license, or another one contracted with the
137+
authors, grants you the right to use, distribute, and modify it.
138+
Therefore, by using, distributing, or modifying the Catharon
139+
Packages, you indicate that you understand and accept all the
140+
terms of this license.

src/licensedcode/data/licenses/cc-by-nc-3.0-de.LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ key: cc-by-nc-3.0-de
33
language: de
44
short_name: CC-BY-NC-3.0-DE
55
name: Creative Commons Attribution Non Commercial 3.0 Germany
6-
category: Free Restricted
6+
category: Source-available
77
owner: Creative Commons
88
spdx_license_key: CC-BY-NC-3.0-DE
99
other_urls:

src/licensedcode/data/licenses/cc-by-nc-nd-2.0-at.LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ key: cc-by-nc-nd-2.0-at
33
language: de
44
short_name: CC-BY-NC-ND-2.0-AT
55
name: Creative Commons Namensnennung - Nicht-kommerziell - Keine Bearbeitung 2.0
6-
category: Free Restricted
6+
category: Source-available
77
owner: Creative Commons
88
homepage_url: https://creativecommons.org/licenses/by-nc-nd/2.0/
99
spdx_license_key: LicenseRef-scancode-cc-by-nc-nd-2.0-at

src/licensedcode/data/licenses/cc-by-nc-nd-3.0-de.LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ key: cc-by-nc-nd-3.0-de
33
language: de
44
short_name: CC-BY-NC-ND-3.0-DE
55
name: Creative Commons Attribution Non Commercial No Derivatives 3.0 Germany
6-
category: Free Restricted
6+
category: Source-available
77
owner: Creative Commons
88
spdx_license_key: CC-BY-NC-ND-3.0-DE
99
other_urls:

src/licensedcode/data/licenses/cc-by-nd-3.0-de.LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ key: cc-by-nd-3.0-de
33
language: de
44
short_name: CC-BY-ND-3.0-DE
55
name: Creative Commons Attribution No Derivatives 3.0 Germany
6-
category: Free Restricted
6+
category: Source-available
77
owner: Creative Commons
88
spdx_license_key: CC-BY-ND-3.0-DE
99
other_urls:

src/licensedcode/data/licenses/dec-3-clause.LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ key: dec-3-clause
33
short_name: DEC 3-Clause License
44
name: DEC 3-Clause License
55
category: Permissive
6-
owner: Digital Equipment Corporation
6+
owner: DEC - Digital Equipment Corporation
77
spdx_license_key: DEC-3-Clause
88
other_urls:
99
- https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/COPYING?ref_type=heads#L239

src/licensedcode/data/licenses/embedthis-extension.LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ category: Free Restricted
66
owner: Embedthis
77
homepage_url: https://www.embedthis.com/licensing/extension.html
88
spdx_license_key: LicenseRef-scancode-embedthis-extension
9+
minimum_coverage: 95
910
---
1011

1112
Embedthis Extension License
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
key: fpdf
3+
short_name: FPDF License
4+
name: FPDF License
5+
category: Permissive
6+
owner: FPDF
7+
homepage_url: http://fpdf.org/
8+
spdx_license_key: LicenseRef-scancode-fpdf
9+
---
10+
11+
Permission is hereby granted, free of charge, to any person obtaining a copy
12+
of this software to use, copy, modify, distribute, sublicense, and/or sell
13+
copies of the software, and to permit persons to whom the software is furnished
14+
to do so.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED.

0 commit comments

Comments
 (0)