Skip to content

Commit

Permalink
Add new and improved licenses
Browse files Browse the repository at this point in the history
* Update SPDX licenses to v3.10
* Update deprecated SPDX licenses
* Update licensedcode license owner names to Unspecified
* Update licensedcode test cases
* Ignore swp files during license indexing
* Skip problematic bzip2-1.0.5 SPDX key in synclic script
* Properly name non-english license keys

Signed-off-by: Steven Esser <sesser@nexb.com>
  • Loading branch information
steven-esser committed Aug 31, 2020
1 parent bce3557 commit f6e28bb
Show file tree
Hide file tree
Showing 177 changed files with 3,642 additions and 136 deletions.
4 changes: 3 additions & 1 deletion etc/scripts/synclic.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ def build_license(self, mapping, scancode_licenses):
'lgpl-2.0', 'lgpl-2.1', 'lgpl-3.0',
'agpl-1.0', 'agpl-2.0', 'agpl-3.0',
'gfdl-1.1', 'gfdl-1.2', 'gfdl-1.3',
'nokia-qt-exception-1.1', ]):
'nokia-qt-exception-1.1', 'bzip2-1.0.5']):
return

deprecated = mapping.get('isDeprecatedLicenseId', False)
Expand All @@ -425,6 +425,8 @@ def build_license(self, mapping, scancode_licenses):
# 'agpl-3.0+'
deprecated = False

# TODO: handle other_spdx_license_keys in license yaml files.

other_urls = mapping.get('seeAlso', [])
other_urls = (o for o in other_urls if o)
other_urls = (o.strip() for o in other_urls)
Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/data/licenses/abrms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ name: Anyone But Richard Stallman License
short_name: ABRMS
category: Proprietary Free
notes: From https://github.com/ErikMcClure/bad-licenses
owner: unspecified
owner: Unspecified
46 changes: 46 additions & 0 deletions src/licensedcode/data/licenses/alasir.LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
The Alasir Licence

This is a free software. It's provided as-is and carries absolutely no
warranty or responsibility by the author and the contributors, neither in
general nor in particular. No matter if this software is able or unable to
cause any damage to your or third party's computer hardware, software, or any
other asset available, neither the author nor a separate contributor may be
found liable for any harm or its consequences resulting from either proper or
improper use of the software, even if advised of the possibility of certain
injury as such and so forth.

The software isn't a public domain, it's a copyrighted one. In no event
shall the author's or a separate contributor's copyright be denied or violated
otherwise. No copyright may be removed unless together with the code
contributed to the software by a holder of the respective copyright. A
copyright itself indicates the rights of ownership over the code contributed.
Back and forth, the author is defined as the one who holds the oldest
copyright over the software. Furthermore, the software is defined as either
source or binary computer code, which is organised in the form of a single
computer file usually.

The software, the whole or a part of it, is prohibited from being sold or
leased in any form or manner with the only possible exceptions:

a) money may be charged for a physical medium used to transfer the software;
b) money may be charged for optional warranty or support services related to
the software.

Nevertheless, if the software, the whole or a part of it, is expected to
become an object of sale or lease, the whole or a part of it, then a separate
non-exclusive licence agreement must be negotiated from the author. Benefits
accrued should be distributed between the contributors or likewise at the
author's discretion.

Whenever and wherever the software is distributed, in either source or
binary form, either in whole or in part, it must include the complete
unchanged text of this licence agreement unless different conditions have been
negotiated. In case of a binary only distribution, the names of the copyright
holders must be mentioned in the documentation supplied with the software.
This is supposed to protect rights and freedom of those who have contributed
their time and labour to free software development, because otherwise the
development itself and this licence agreement are of a very little sense.

Nothing else but this licence agreement grants you rights to use, modify
and distribute the software. Any violation of this licence agreement is
recognised as an action prohibited by an applicable legislation.
6 changes: 6 additions & 0 deletions src/licensedcode/data/licenses/alasir.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
key: alasir
short_name: Alasir Licence
name: The Alasir Licence
category: Proprietary Free
owner: Alasir
homepage_url: http://alasir.com/licence/TAL.txt
2 changes: 2 additions & 0 deletions src/licensedcode/data/licenses/bsd-2-clause-freebsd.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
key: bsd-2-clause-freebsd
short_name: BSD-2-Clause-FreeBSD
is_deprecated: yes
notes: This license was deprecated because BSD-2-Clause-Views has been added, as a more generalized version; and because FreeBSD project community members have indicated that the final sentence is not part of that project's code license.
name: BSD-2-Clause-FreeBSD License
category: Permissive
owner: FreeBSD
Expand Down
2 changes: 2 additions & 0 deletions src/licensedcode/data/licenses/bsd-2-clause-netbsd.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
key: bsd-2-clause-netbsd
short_name: BSD-2-Clause-NetBSD
is_deprecated: yes
notes: NetBSD adopted this 2-clause license in 2008 for code contributed to NetBSD Foundation. It is being deprecated as a separate license because it is a match to BSD-2-Clause. The line describing that the code is derived from software contributed to NetBSD is not viewed as being a substantive part of the license text.
name: BSD-2-Clause-NetBSD License
category: Permissive
owner: NetBSD
Expand Down
9 changes: 9 additions & 0 deletions src/licensedcode/data/licenses/bsd-2-clause-views.LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

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.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project.
17 changes: 17 additions & 0 deletions src/licensedcode/data/licenses/bsd-2-clause-views.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
key: bsd-2-clause-views
short_name: BSD-2-Clause-Views
name: BSD 2-Clause with views sentence
category: Permissive
owner: FreeBSD
homepage_url: https://www.freebsd.org/copyright/freebsd-license.html
spdx_license_key: BSD-2-Clause-Views
other_spdx_license_keys:
- BSD-2-Clause-FreeBSD
text_urls:
- https://github.com/protegeproject/protege/blob/master/license.txt
other_urls:
- http://www.freebsd.org/copyright/freebsd-license.html
- https://people.freebsd.org/~ivoras/wine/patch-wine-nvidia.sh
standard_notice: |
The FreeBSD Copyright
Copyright 1992-2020 The FreeBSD Project.
2 changes: 2 additions & 0 deletions src/licensedcode/data/licenses/bsd-simplified.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ owner: Regents of the University of California
homepage_url: http://www.opensource.org/licenses/BSD-2-Clause
notes: Per SPDX.org, this license is OSI certified.
spdx_license_key: BSD-2-Clause
other_spdx_license_keys:
- BSD-2-Clause-NetBSD
text_urls:
- http://opensource.org/licenses/bsd-license.php
osi_url: http://opensource.org/licenses/bsd-license.php
Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/data/licenses/bzip2-libbzip-1.0.5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ name: bzip2 License
category: Permissive
owner: bzip
homepage_url: http://bzip.org/1.0.5/bzip2-manual-1.0.5.html
# spdx_license_key: bzip2-1.0.5
spdx_license_key: bzip2-1.0.5
other_urls:
- http://www.bzip.org/
2 changes: 2 additions & 0 deletions src/licensedcode/data/licenses/bzip2-libbzip-2010.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ spdx_license_key: bzip2-1.0.6
other_spdx_license_keys:
- bzip2-1.0.5
other_urls:
- http://bzip.org/1.0.5/bzip2-manual-1.0.5.html
- http://www.bzip.org/
- https://sourceware.org/git/?p=bzip2.git;a=blob;f=LICENSE;hb=bzip2-1.0.6
Loading

0 comments on commit f6e28bb

Please sign in to comment.