Skip to content

Commit

Permalink
Merge pull request #3554 from nexB/update-to-spdx-3.22
Browse files Browse the repository at this point in the history
Update to spdx 3.22
  • Loading branch information
AyanSinhaMahapatra authored Nov 8, 2023
2 parents 20430c4 + 9cb5e9a commit 1163957
Show file tree
Hide file tree
Showing 110 changed files with 1,108 additions and 180 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ v32.1.0 (next, roadmap)
of these in other summary plugins.
See https://github.com/nexB/scancode-toolkit/issues/1745

- New and updated licenses, including support for newly released
SPDX license list version 3.22. This release of the SPDX license
list had 48 new licenses, and several of them we already had as
licenses/rules, and these has been modified to be consistent with
the SPDX list. And the rest have been added as new licenses.
For more details see https://github.com/nexB/scancode-toolkit/pull/3554

- Upgraded spdx-tools dependency to v0.8.
See https://github.com/nexB/scancode-toolkit/issues/3455

Expand Down
23 changes: 23 additions & 0 deletions src/licensedcode/data/licenses/adobe-utopia.LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
key: adobe-utopia
short_name: Adobe Utopia Font License
name: Adobe Utopia Font License
category: Permissive
owner: Adobe Systems
spdx_license_key: Adobe-Utopia
other_urls:
- https://gitlab.freedesktop.org/xorg/font/adobe-utopia-100dpi/-/blob/master/COPYING?ref_type=heads
---

Permission to use, reproduce, display and distribute the listed typefaces
is hereby granted, provided that the Adobe Copyright notice appears in all
whole and partial copies of the software and that the following trademark
symbol and attribution appear in all unmodified copies of the software:

The Adobe typefaces (Type 1 font program, bitmaps and Adobe Font Metric
files) donated are:

Utopia Regular
Utopia Italic
Utopia Bold
Utopia Bold Italic
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ notes: |
this is a simpler version of the Autonconf exception to the GPL 3.0 used in
GNU Config config.guess and config.sub
is_exception: yes
spdx_license_key: LicenseRef-scancode-autoconf-simple-exception
spdx_license_key: Autoconf-exception-generic-3.0
other_spdx_license_keys:
- LicenseRef-scancode-autoconf-simple-exception
other_urls:
- https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/rawhide/f/config.guess
---

As a special exception to the GNU General Public License, if you
Expand Down
6 changes: 5 additions & 1 deletion src/licensedcode/data/licenses/bigelow-holmes.LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ name: Bigelow & Holmes Lucida Fonts License
category: Permissive
owner: Oracle Corporation
homepage_url: http://www.opensolaris.org/os/project/indiana/resources/getit/OpenSolaris_Dev_Preview_Third_Party_License.txt
spdx_license_key: LicenseRef-scancode-bigelow-holmes
spdx_license_key: Lucida-Bitmap-Fonts
other_spdx_license_keys:
- LicenseRef-scancode-bigelow-holmes
text_urls:
- http://www.opensolaris.org/os/project/indiana/resources/getit/OpenSolaris_Dev_Preview_Third_Party_License.txt
other_urls:
- https://gitlab.freedesktop.org/xorg/font/bh-100dpi/-/blob/master/COPYING?ref_type=heads
ignorable_copyrights:
- (c) Copyright 1989 Sun Microsystems, Inc.
- (c) Copyright Bigelow & Holmes 1986, 1985
Expand Down
34 changes: 34 additions & 0 deletions src/licensedcode/data/licenses/bsd-3-clause-hp.LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
key: bsd-3-clause-hp
short_name: Hewlett-Packard BSD variant license
name: Hewlett-Packard BSD variant license
category: Permissive
owner: HP - Hewlett Packard
spdx_license_key: BSD-3-Clause-HP
other_urls:
- https://github.com/zdohnal/hplip/blob/master/COPYING#L939
---

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the {{HP}} nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PATENT INFRINGEMENT; PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
4 changes: 3 additions & 1 deletion src/licensedcode/data/licenses/bsd-3-clause-sun.LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ category: Permissive
owner: Oracle (Sun)
notes: This is the same as the bsd-3-clause-no-nuclear-warranty but without the nuclear related
terms. Rare and not exactly the same as a plain bsd.
spdx_license_key: LicenseRef-scancode-bsd-3-clause-sun
spdx_license_key: BSD-3-Clause-Sun
other_spdx_license_keys:
- LicenseRef-scancode-bsd-3-clause-sun
minimum_coverage: 90
---

Expand Down
51 changes: 51 additions & 0 deletions src/licensedcode/data/licenses/bsd-inferno-nettverk.LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
---
key: bsd-inferno-nettverk
short_name: BSD-Inferno-Nettverk
name: BSD-Inferno-Nettverk
category: Permissive
owner: Inferno Nettverk
spdx_license_key: BSD-Inferno-Nettverk
other_urls:
- https://www.inet.no/dante/LICENSE
ignorable_authors:
- Inferno Nettverk A/S, Norway
ignorable_emails:
- [email protected]
---

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. The above copyright notice, this list of conditions and the following
disclaimer must appear in all copies of the software, derivative works
or modified versions, and any portions thereof, aswell as in all
supporting documentation.
2. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
This product includes software developed by
Inferno Nettverk A/S, Norway.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Inferno Nettverk A/S requests users of this software to return to

Software Distribution Coordinator or [email protected]
Inferno Nettverk A/S
Oslo Research Park
Gaustadalléen 21
NO-0349 Oslo
Norway

any improvements or extensions that they make and grant Inferno Nettverk A/S
the rights to redistribute these changes.
51 changes: 51 additions & 0 deletions src/licensedcode/data/licenses/bsd-systemics.LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
---
key: bsd-systemics
short_name: Systemics BSD variant license
name: Systemics BSD variant license
category: Permissive
owner: Systemics Ltd
spdx_license_key: BSD-Systemics
other_urls:
- https://metacpan.org/release/DPARIS/Crypt-DES-2.07/source/COPYRIGHT
ignorable_authors:
- Systemics Ltd (http://www.systemics.com/)
ignorable_urls:
- http://www.systemics.com/
---

This library and applications are FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
as long as the following conditions are adhered to.

Copyright remains with Systemics Ltd, and as such any Copyright notices
in the code are not to be removed. If this code is used in a product,
Systemics should be given attribution as the author of the parts used.
This can be in the form of a textual message at program startup or
in documentation (online or textual) provided with the package.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
This product includes software developed by Systemics Ltd (http://www.systemics.com/)

THIS SOFTWARE IS PROVIDED BY SYSTEMICS LTD ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.

The licence and distribution terms for any publically available version or
derivative of this code cannot be changed. i.e. this code cannot simply be
copied and put under another distribution licence [including the GNU Public Licence.]
13 changes: 13 additions & 0 deletions src/licensedcode/data/licenses/check-cvs.LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
key: check-cvs
short_name: check-cvs License
name: check-cvs License
category: Permissive
owner: GNU Savannah Project
spdx_license_key: check-cvs
other_urls:
- http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/contrib/check_cvs.in?revision=1.1.4.3&view=markup&pathrev=cvs1-11-23#l2
---

Permission is granted to copy and/or distribute this file, with or
without modifications, provided this notice is preserved.
19 changes: 19 additions & 0 deletions src/licensedcode/data/licenses/cronyx.LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
key: cronyx
short_name: Cronyx License
name: Cronyx License
category: Permissive
owner: Cronyx Ltd.
spdx_license_key: Cronyx
other_urls:
- https://gitlab.freedesktop.org/xorg/font/alias/-/blob/master/COPYING
- https://gitlab.freedesktop.org/xorg/font/cronyx-cyrillic/-/blob/master/COPYING
- https://gitlab.freedesktop.org/xorg/font/misc-cyrillic/-/blob/master/COPYING
- https://gitlab.freedesktop.org/xorg/font/screen-cyrillic/-/blob/master/COPYING
---

This software may be used, modified, copied, distributed, and sold,
in both source and binary form provided that the copyright
and these terms are retained. Under no circumstances is the author
responsible for the proper functioning of this software, nor does
the author assume any responsibility for damages incurred with its use.
38 changes: 38 additions & 0 deletions src/licensedcode/data/licenses/dl-de-zero-2.0.LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
key: dl-de-zero-2.0
short_name: Data licence Germany – zero – version 2.0
name: Data licence Germany – zero – version 2.0
category: Permissive
owner: Germany GovDataProject
spdx_license_key: DL-DE-ZERO-2.0
other_urls:
- https://www.govdata.de/dl-de/zero-2-0
ignorable_urls:
- https://www.govdata.de/dl-de/zero-2-0
---

DL-DE->Zero-2.0
Datenlizenz Deutschland – Zero – Version 2.0

Jede Nutzung ist ohne Einschränkungen oder Bedingungen zulässig.

Die bereitgestellten Daten und Metadaten dürfen für die kommerzielle und nicht kommerzielle Nutzung insbesondere

vervielfältigt, ausgedruckt, präsentiert, verändert, bearbeitet sowie an Dritte übermittelt werden;
mit eigenen Daten und Daten Anderer zusammengeführt und zu selbständigen neuen Datensätzen verbunden werden;
in interne und externe Geschäftsprozesse, Produkte und Anwendungen in öffentlichen und nicht öffentlichen elektronischen Netzwerken eingebunden werden.


Data licence Germany – Zero – version 2.0

Any use is permitted without restrictions or conditions.

The data and meta-data provided may, for commercial and non-commercial use, in particular

be copied, printed, presented, altered, processed and transmitted to third parties;
be merged with own data and with the data of others and be combined to form new and independent datasets;
be integrated in internal and external business processes, products and applications in public and non-public electronic networks.



URL: https://www.govdata.de/dl-de/zero-2-0
16 changes: 16 additions & 0 deletions src/licensedcode/data/licenses/fbm.LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
key: fbm
short_name: Fuzzy Bitmap License
name: Fuzzy Bitmap License
category: Permissive
owner: Michael Mauldin
spdx_license_key: FBM
other_urls:
- https://github.com/SWI-Prolog/packages-xpce/blob/161a40cd82004f731ba48024f9d30af388a7edf5/src/img/gifwrite.c#L21-L26
---

Permission is granted to use this file in whole or in
part for any purpose, educational, recreational or commercial,
provided that this copyright notice is retained unchanged.
This software is available to all free of charge by anonymous
FTP and in the UUNET archives.
27 changes: 27 additions & 0 deletions src/licensedcode/data/licenses/ferguson-twofish.LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
key: ferguson-twofish
short_name: Ferguson Twofish License
name: Ferguson Twofish License
category: Permissive
owner: Niels Ferguson
spdx_license_key: Ferguson-Twofish
other_urls:
- https://github.com/wernerd/ZRTPCPP/blob/6b3cd8e6783642292bad0c21e3e5e5ce45ff3e03/cryptcommon/twofish.c#L113C3-L127
notes: This is essentially niels-ferguson.LICENSE without the disclaimer at the end.
---

The author hereby grants a perpetual license to everybody to
use this code for any purpose as long as the copyright message is included
in the source code of this or any derived work.

Yes, this means that you, your company, your club, and anyone else
can use this code anywhere you want. You can change it and distribute it
under the GPL, include it in your commercial product without releasing
the source code, put it on the web, etc.
The only thing you cannot do is remove my copyright message,
or distribute any source code based on this implementation that does not
include my copyright message.

I appreciate a mention in the documentation or credits,
but I understand if that is difficult to do.
I also appreciate it if you tell me where and why you used my code.
Loading

0 comments on commit 1163957

Please sign in to comment.