Skip to content

Commit 1163957

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
authored
Merge pull request #3554 from nexB/update-to-spdx-3.22
Update to spdx 3.22
2 parents 20430c4 + 9cb5e9a commit 1163957

File tree

110 files changed

+1108
-180
lines changed

Some content is hidden

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

110 files changed

+1108
-180
lines changed

‎CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ v32.1.0 (next, roadmap)
4242
of these in other summary plugins.
4343
See https://github.com/nexB/scancode-toolkit/issues/1745
4444

45+
- New and updated licenses, including support for newly released
46+
SPDX license list version 3.22. This release of the SPDX license
47+
list had 48 new licenses, and several of them we already had as
48+
licenses/rules, and these has been modified to be consistent with
49+
the SPDX list. And the rest have been added as new licenses.
50+
For more details see https://github.com/nexB/scancode-toolkit/pull/3554
51+
4552
- Upgraded spdx-tools dependency to v0.8.
4653
See https://github.com/nexB/scancode-toolkit/issues/3455
4754

‎src/licensedcode/data/licenses/adobe-utopia.LICENSE

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
key: adobe-utopia
3+
short_name: Adobe Utopia Font License
4+
name: Adobe Utopia Font License
5+
category: Permissive
6+
owner: Adobe Systems
7+
spdx_license_key: Adobe-Utopia
8+
other_urls:
9+
- https://gitlab.freedesktop.org/xorg/font/adobe-utopia-100dpi/-/blob/master/COPYING?ref_type=heads
10+
---
11+
12+
Permission to use, reproduce, display and distribute the listed typefaces
13+
is hereby granted, provided that the Adobe Copyright notice appears in all
14+
whole and partial copies of the software and that the following trademark
15+
symbol and attribution appear in all unmodified copies of the software:
16+
17+
The Adobe typefaces (Type 1 font program, bitmaps and Adobe Font Metric
18+
files) donated are:
19+
20+
Utopia Regular
21+
Utopia Italic
22+
Utopia Bold
23+
Utopia Bold Italic

‎src/licensedcode/data/licenses/autoconf-simple-exception.LICENSE

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ notes: |
99
this is a simpler version of the Autonconf exception to the GPL 3.0 used in
1010
GNU Config config.guess and config.sub
1111
is_exception: yes
12-
spdx_license_key: LicenseRef-scancode-autoconf-simple-exception
12+
spdx_license_key: Autoconf-exception-generic-3.0
13+
other_spdx_license_keys:
14+
- LicenseRef-scancode-autoconf-simple-exception
15+
other_urls:
16+
- https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/rawhide/f/config.guess
1317
---
1418

1519
As a special exception to the GNU General Public License, if you

‎src/licensedcode/data/licenses/bigelow-holmes.LICENSE

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@ name: Bigelow & Holmes Lucida Fonts License
55
category: Permissive
66
owner: Oracle Corporation
77
homepage_url: http://www.opensolaris.org/os/project/indiana/resources/getit/OpenSolaris_Dev_Preview_Third_Party_License.txt
8-
spdx_license_key: LicenseRef-scancode-bigelow-holmes
8+
spdx_license_key: Lucida-Bitmap-Fonts
9+
other_spdx_license_keys:
10+
- LicenseRef-scancode-bigelow-holmes
911
text_urls:
1012
- http://www.opensolaris.org/os/project/indiana/resources/getit/OpenSolaris_Dev_Preview_Third_Party_License.txt
13+
other_urls:
14+
- https://gitlab.freedesktop.org/xorg/font/bh-100dpi/-/blob/master/COPYING?ref_type=heads
1115
ignorable_copyrights:
1216
- (c) Copyright 1989 Sun Microsystems, Inc.
1317
- (c) Copyright Bigelow & Holmes 1986, 1985

‎src/licensedcode/data/licenses/bsd-3-clause-hp.LICENSE

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
key: bsd-3-clause-hp
3+
short_name: Hewlett-Packard BSD variant license
4+
name: Hewlett-Packard BSD variant license
5+
category: Permissive
6+
owner: HP - Hewlett Packard
7+
spdx_license_key: BSD-3-Clause-HP
8+
other_urls:
9+
- https://github.com/zdohnal/hplip/blob/master/COPYING#L939
10+
---
11+
12+
Redistribution and use in source and binary forms, with or without
13+
modification, are permitted provided that the following conditions
14+
are met:
15+
1. Redistributions of source code must retain the above copyright
16+
notice, this list of conditions and the following disclaimer.
17+
2. Redistributions in binary form must reproduce the above copyright
18+
notice, this list of conditions and the following disclaimer in the
19+
documentation and/or other materials provided with the distribution.
20+
3. Neither the name of the {{HP}} nor the names of its
21+
contributors may be used to endorse or promote products derived
22+
from this software without specific prior written permission.
23+
24+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
25+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
26+
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
27+
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
28+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
29+
NOT LIMITED TO, PATENT INFRINGEMENT; PROCUREMENT OF SUBSTITUTE GOODS OR
30+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
32+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
33+
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34+
POSSIBILITY OF SUCH DAMAGE.

‎src/licensedcode/data/licenses/bsd-3-clause-sun.LICENSE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ category: Permissive
66
owner: Oracle (Sun)
77
notes: This is the same as the bsd-3-clause-no-nuclear-warranty but without the nuclear related
88
terms. Rare and not exactly the same as a plain bsd.
9-
spdx_license_key: LicenseRef-scancode-bsd-3-clause-sun
9+
spdx_license_key: BSD-3-Clause-Sun
10+
other_spdx_license_keys:
11+
- LicenseRef-scancode-bsd-3-clause-sun
1012
minimum_coverage: 90
1113
---
1214

‎src/licensedcode/data/licenses/bsd-inferno-nettverk.LICENSE

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
key: bsd-inferno-nettverk
3+
short_name: BSD-Inferno-Nettverk
4+
name: BSD-Inferno-Nettverk
5+
category: Permissive
6+
owner: Inferno Nettverk
7+
spdx_license_key: BSD-Inferno-Nettverk
8+
other_urls:
9+
- https://www.inet.no/dante/LICENSE
10+
ignorable_authors:
11+
- Inferno Nettverk A/S, Norway
12+
ignorable_emails:
13+
- sdc@inet.no
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+
1. The above copyright notice, this list of conditions and the following
20+
disclaimer must appear in all copies of the software, derivative works
21+
or modified versions, and any portions thereof, aswell as in all
22+
supporting documentation.
23+
2. All advertising materials mentioning features or use of this software
24+
must display the following acknowledgement:
25+
This product includes software developed by
26+
Inferno Nettverk A/S, Norway.
27+
3. The name of the author may not be used to endorse or promote products
28+
derived from this software without specific prior written permission.
29+
30+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
31+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
32+
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
33+
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
34+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
35+
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
36+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
37+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
38+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
39+
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
40+
41+
Inferno Nettverk A/S requests users of this software to return to
42+
43+
Software Distribution Coordinator or sdc@inet.no
44+
Inferno Nettverk A/S
45+
Oslo Research Park
46+
Gaustadalléen 21
47+
NO-0349 Oslo
48+
Norway
49+
50+
any improvements or extensions that they make and grant Inferno Nettverk A/S
51+
the rights to redistribute these changes.

‎src/licensedcode/data/licenses/bsd-systemics.LICENSE

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
key: bsd-systemics
3+
short_name: Systemics BSD variant license
4+
name: Systemics BSD variant license
5+
category: Permissive
6+
owner: Systemics Ltd
7+
spdx_license_key: BSD-Systemics
8+
other_urls:
9+
- https://metacpan.org/release/DPARIS/Crypt-DES-2.07/source/COPYRIGHT
10+
ignorable_authors:
11+
- Systemics Ltd (http://www.systemics.com/)
12+
ignorable_urls:
13+
- http://www.systemics.com/
14+
---
15+
16+
This library and applications are FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
17+
as long as the following conditions are adhered to.
18+
19+
Copyright remains with Systemics Ltd, and as such any Copyright notices
20+
in the code are not to be removed. If this code is used in a product,
21+
Systemics should be given attribution as the author of the parts used.
22+
This can be in the form of a textual message at program startup or
23+
in documentation (online or textual) provided with the package.
24+
25+
Redistribution and use in source and binary forms, with or without
26+
modification, are permitted provided that the following conditions
27+
are met:
28+
1. Redistributions of source code must retain the copyright
29+
notice, this list of conditions and the following disclaimer.
30+
2. Redistributions in binary form must reproduce the above copyright
31+
notice, this list of conditions and the following disclaimer in the
32+
documentation and/or other materials provided with the distribution.
33+
3. All advertising materials mentioning features or use of this software
34+
must display the following acknowledgement:
35+
This product includes software developed by Systemics Ltd (http://www.systemics.com/)
36+
37+
THIS SOFTWARE IS PROVIDED BY SYSTEMICS LTD ``AS IS'' AND
38+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
39+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
40+
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
41+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
42+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
43+
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
44+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
45+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
46+
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
47+
SUCH DAMAGE.
48+
49+
The licence and distribution terms for any publically available version or
50+
derivative of this code cannot be changed. i.e. this code cannot simply be
51+
copied and put under another distribution licence [including the GNU Public Licence.]

‎src/licensedcode/data/licenses/check-cvs.LICENSE

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
key: check-cvs
3+
short_name: check-cvs License
4+
name: check-cvs License
5+
category: Permissive
6+
owner: GNU Savannah Project
7+
spdx_license_key: check-cvs
8+
other_urls:
9+
- http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/contrib/check_cvs.in?revision=1.1.4.3&view=markup&pathrev=cvs1-11-23#l2
10+
---
11+
12+
Permission is granted to copy and/or distribute this file, with or
13+
without modifications, provided this notice is preserved.

‎src/licensedcode/data/licenses/cronyx.LICENSE

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
key: cronyx
3+
short_name: Cronyx License
4+
name: Cronyx License
5+
category: Permissive
6+
owner: Cronyx Ltd.
7+
spdx_license_key: Cronyx
8+
other_urls:
9+
- https://gitlab.freedesktop.org/xorg/font/alias/-/blob/master/COPYING
10+
- https://gitlab.freedesktop.org/xorg/font/cronyx-cyrillic/-/blob/master/COPYING
11+
- https://gitlab.freedesktop.org/xorg/font/misc-cyrillic/-/blob/master/COPYING
12+
- https://gitlab.freedesktop.org/xorg/font/screen-cyrillic/-/blob/master/COPYING
13+
---
14+
15+
This software may be used, modified, copied, distributed, and sold,
16+
in both source and binary form provided that the copyright
17+
and these terms are retained. Under no circumstances is the author
18+
responsible for the proper functioning of this software, nor does
19+
the author assume any responsibility for damages incurred with its use.

0 commit comments

Comments
 (0)