Skip to content

Commit e166626

Browse files
Update to SPDX license list 3.24.0 (#3795)
* Update to SPDX license list 3.24.0 Reference: #3787 Reference: https://github.com/spdx/license-list-XML/releases/tag/v3.24.0 Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com> Co-authored-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent 3202d75 commit e166626

File tree

47 files changed

+939
-146
lines changed

Some content is hidden

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

47 files changed

+939
-146
lines changed

CHANGELOG.rst

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,19 @@ v33.0.0 (next next, roadmap)
5252

5353
swift package resolve
5454

55-
v32.1.0 (next, roadmap)
56-
----------------------------
55+
- New and updated licenses, including support for newly released
56+
SPDX license list versions:
57+
- SPDX License List 3.24:
58+
This release of the SPDX license list had 25 new licenses
59+
and exceptions, and out of them 12 were present as licenses
60+
and 5 were present as rules already. There were 3 new
61+
license/exception texts added, and the rest 5 were either
62+
texts with small variations, additions to texts or several
63+
rule texts together. And the rest have been added as new licenses.
64+
For more details see https://github.com/nexB/scancode-toolkit/pull/3795
65+
66+
v32.1.0 - 2024-03-23
67+
---------------------
5768

5869
New CLI options:
5970

src/licensedcode/data/licenses/3dslicer-1.0.LICENSE

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@ name: 3D Slicer Contribution and Software License Agreement v1.0
55
category: Permissive
66
owner: Slicer Project
77
homepage_url: https://www.slicer.org/wiki/License
8-
spdx_license_key: LicenseRef-scancode-3dslicer-1.0
8+
spdx_license_key: 3D-Slicer-1.0
9+
other_spdx_license_keys:
10+
- LicenseRef-scancode-3dslicer-1.0
911
text_urls:
1012
- https://github.com/Slicer/Slicer/blob/v4.6.2/COPYRIGHT.txt
1113
faq_url: https://www.slicer.org/wiki/CommercialUse
1214
other_urls:
15+
- https://slicer.readthedocs.io/en/latest/user_guide/about.html#license
16+
- https://github.com/Slicer/Slicer/blob/main/License.txt
1317
- http://www.slicer.org
1418
- http://wiki.na-mic.org/Wiki/index.php/Slicer3
1519
ignorable_authors:

src/licensedcode/data/licenses/amd-historical.LICENSE

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ name: AMD Historical License
55
category: Permissive
66
owner: Advanced Micro Devices
77
notes: this is a short historical permissive license seen in the newlib C library
8-
spdx_license_key: LicenseRef-scancode-amd-historical
8+
spdx_license_key: AMD-newlib
9+
other_spdx_license_keys:
10+
- LicenseRef-scancode-amd-historical
11+
other_urls:
12+
- https://sourceware.org/git/?p=newlib-cygwin.git;a=blob;f=newlib/libc/sys/a29khif/_close.S;h=04f52ae00de1dafbd9055ad8d73c5c697a3aae7f;hb=HEAD
913
---
1014

1115
This software is the property of Advanced Micro Devices, Inc (AMD) which
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
key: any-osi
3+
short_name: Any OSI License
4+
name: Any OSI License
5+
category: Unstated License
6+
owner: Unspecified
7+
spdx_license_key: any-OSI
8+
minimum_coverage: 100
9+
other_urls:
10+
- http://www.opensource.org/licenses/alphabetical
11+
- https://metacpan.org/pod/Exporter::Tidy#LICENSE
12+
ignorable_urls:
13+
- http://www.opensource.org/licenses/alphabetical
14+
---
15+
16+
Pick your favourite OSI approved license :)
17+
18+
http://www.opensource.org/licenses/alphabetical
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
key: asterisk-linking-protocols-exception
3+
short_name: Asterisk linking protocols exception
4+
name: Asterisk linking protocols exception
5+
owner: Asterisk
6+
category: Copyleft Limited
7+
is_exception: yes
8+
spdx_license_key: Asterisk-linking-protocols-exception
9+
other_urls:
10+
- https://github.com/asterisk/asterisk/blob/115d7c01e32ccf4566a99e9d74e2b88830985a0b/LICENSE#L27
11+
---
12+
13+
Specific permission is also granted to link Asterisk with OpenSSL, OpenH323
14+
UniMRCP, and/or the UW IMAP Toolkit and distribute the resulting binary files.
15+
16+
In addition, Asterisk implements several management/control protocols.
17+
This includes the Asterisk Manager Interface (AMI), the Asterisk Gateway
18+
Interface (AGI), and the Asterisk REST Interface (ARI). It is our belief
19+
that applications using these protocols to manage or control an Asterisk
20+
instance do not have to be licensed under the GPL or a compatible license,
21+
as we believe these protocols do not create a 'derivative work' as referred
22+
to in the GPL. However, should any court or other judiciary body find that
23+
these protocols do fall under the terms of the GPL, then we hereby grant you a
24+
license to use these protocols in combination with Asterisk in external
25+
applications licensed under any license you wish.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
key: bsd-2-clause-first-lines
3+
short_name: BSD 2-Clause first lines
4+
name: BSD 2-Clause - first lines requirement
5+
owner: Nippon Telegraph and Telephone Corporation
6+
category: Permissive
7+
notes: |
8+
Added in SPDX license list 3.24
9+
This was previously the license rule: freebsd-doc_5.RULE
10+
spdx_license_key: BSD-2-Clause-first-lines
11+
other_urls:
12+
- https://github.com/krb5/krb5/blob/krb5-1.21.2-final/NOTICE#L664-L690
13+
- https://web.mit.edu/kerberos/krb5-1.21/doc/mitK5license.html
14+
---
15+
16+
Redistribution and use in source and binary forms, with or without
17+
modification, are permitted provided that the following conditions
18+
are met:
19+
20+
1. Redistributions of source code must retain the above
21+
copyright notice, this list of conditions and the following
22+
disclaimer as the first lines of this file unmodified.
23+
24+
2. Redistributions in binary form must reproduce the above
25+
copyright notice, this list of conditions and the following
26+
disclaimer in the documentation and/or other materials provided
27+
with the distribution.
28+
29+
THIS SOFTWARE IS PROVIDED BY NTT "AS IS" AND ANY EXPRESS OR IMPLIED
30+
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
31+
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
32+
DISCLAIMED. IN NO EVENT SHALL NTT BE LIABLE FOR ANY DIRECT,
33+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
34+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
35+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
36+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
37+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
38+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
39+
OF THE POSSIBILITY OF SUCH DAMAGE.

src/licensedcode/data/licenses/catharon-osl.LICENSE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ name: Catharon Open Source License
55
category: Permissive
66
owner: Catharon
77
homepage_url: https://github.com/scummvm/scummvm/blob/master/LICENSES/CatharonLicense.txt
8-
spdx_license_key: LicenseRef-scancode-catharon-osl
8+
spdx_license_key: Catharon
9+
other_spdx_license_keys:
10+
- LicenseRef-scancode-catharon-osl
911
text_urls:
1012
- https://github.com/scummvm/scummvm/tree/master/engines/ags/lib/freetype-2.1.3/autohint
1113
- https://www.copperspice.com/docs/cs_overview/legal-3rdparty.html

src/licensedcode/data/licenses/codesourcery-2004.LICENSE

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ name: CodeSourcery 2004
55
category: Permissive
66
owner: CodeSourcery
77
homepage_url: https://git.linaro.org/toolchain/newlib.git/tree/newlib/libc/misc/init.c
8-
spdx_license_key: LicenseRef-scancode-codesourcery-2004
8+
spdx_license_key: HPND-merchantability-variant
9+
other_spdx_license_keys:
10+
- LicenseRef-scancode-codesourcery-2004
11+
other_urls:
12+
- https://sourceware.org/git/?p=newlib-cygwin.git;a=blob;f=newlib/libc/misc/fini.c;hb=HEAD
913
---
1014

1115
Permission to use, copy, modify, and distribute this file

src/licensedcode/data/licenses/cve-tou.LICENSE

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ name: Common Vulnerability Enumeration ToU License
55
category: Permissive
66
owner: Mitre
77
homepage_url: https://cve.mitre.org/about/termsofuse.html
8-
spdx_license_key: LicenseRef-scancode-cve-tou
8+
spdx_license_key: cve-tou
9+
other_spdx_license_keys:
10+
- LicenseRef-scancode-cve-tou
11+
other_urls:
12+
- https://www.cve.org/Legal/TermsOfUse
913
---
1014

1115
CVE Usage: MITRE hereby grants you a perpetual, worldwide, non-exclusive,

src/licensedcode/data/licenses/fftpack-2004.LICENSE

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ name: FFTPACK License 2004
55
category: Permissive
66
owner: NCAR
77
homepage_url: https://github.com/marton78/pffft/blob/master/pffft.c
8-
spdx_license_key: LicenseRef-scancode-fftpack-2004
8+
spdx_license_key: NCL
9+
other_spdx_license_keys:
10+
- LicenseRef-scancode-fftpack-2004
911
text_urls:
1012
- https://bitbucket.org/jpommier/pffft/src/master/pffft.c
1113
other_urls:
1214
- https://github.com/nexB/scancode-toolkit/issues/1978
15+
- https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/modules/module-filter-chain/pffft.c?ref_type=heads#L1-52
1316
standard_notice: |
1417
http://www.cisl.ucar.edu/css/software/fftpack5/ftpk.html
1518
Copyright (c) 2004 the University Corporation for Atmospheric

0 commit comments

Comments
 (0)