Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/licensedcode/data/licenses/agpl-1.0-plus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ other_spdx_license_keys:
text_urls:
- http://www.affero.org/oagpl.html
faq_url: http://www.affero.org/oagf.html
minimum_coverage: 99
ignorable_copyrights:
- Copyright (c) 2002 Affero Inc.
- copyright (c) 1989, 1991 Free Software Foundation, Inc.
Expand Down
3 changes: 0 additions & 3 deletions src/licensedcode/data/licenses/agpl-3.0-plus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ other_urls:
- http://www.opensource.org/licenses/AGPL-3.0
- https://opensource.org/licenses/AGPL-3.0
- https://www.gnu.org/licenses/agpl.txt
ignorable_urls:
- http://www.gnu.org/licenses/
minimum_coverage: 99
ignorable_copyrights:
- Copyright (c) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Expand All @@ -31,4 +29,3 @@ ignorable_urls:
- http://www.gnu.org/licenses/
- https://fsf.org/
- https://www.gnu.org/licenses/

5 changes: 3 additions & 2 deletions src/licensedcode/data/licenses/ecos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ name: GPL 2.0 or later with eCos Exception
category: Copyleft Limited
owner: eCos
homepage_url: http://ecos.sourceware.org/ecos-license/
notes: Per SPDX.org, this is really GPL v2 or later + an exception
Comment thread
fangxlmr marked this conversation as resolved.
is_exception: yes
spdx_license_key: eCos-2.0
text_urls:
- http://www.fsf.org/licensing/licenses/ecos-license.html
- http://www.gnu.org/licenses/ecos-license.html
faq_url: http://ecos.sourceware.org/license-overview.html
minimum_coverage: 100
notes: replaced by ecos-exception-2.0
notes: |
Per SPDX.org, this is really GPL v2 or later + an exception.
Replaced by ecos-exception-2.0.
2 changes: 1 addition & 1 deletion src/licensedcode/data/licenses/ekioh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ short_name: Ekioh License
name: Ekioh License
category: Permissive
owner: Ekioh
notes: see also https://kryogenix.org/code/browser/licence.html
Comment thread
fangxlmr marked this conversation as resolved.
notes: |
Obsolete License -- do not use. Except for the dangling ", subject to the
following conditions:" text, this license is essentially identical to the
MIT-0-Clause (mit-0) license, which has been accepted in the open source
community relatively recently.
See also https://kryogenix.org/code/browser/licence.html.
1 change: 0 additions & 1 deletion src/licensedcode/data/licenses/gpl-2.0-plus-openssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ owner: magnumripper
homepage_url: https://github.com/magnumripper/JohnTheRipper/blob/1.8.0/doc/LICENSE
notes: replaced by openssl-exception-gpl-2.0-plus
is_exception: yes
notes: replaced by openssl-exception-gpl-2.0-plus
3 changes: 0 additions & 3 deletions src/licensedcode/data/licenses/gpl-3.0-plus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ other_urls:
- http://www.opensource.org/licenses/GPL-3.0
- https://opensource.org/licenses/GPL-3.0
- https://www.gnu.org/licenses/gpl-3.0-standalone.html
ignorable_urls:
- http://www.gnu.org/licenses/
minimum_coverage: 99
ignorable_copyrights:
- Copyright (c) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Expand All @@ -28,4 +26,3 @@ ignorable_urls:
- https://fsf.org/
- https://www.gnu.org/licenses/
- https://www.gnu.org/licenses/why-not-lgpl.html

1 change: 0 additions & 1 deletion src/licensedcode/data/licenses/lgpl-2.1-spell-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ standard_notice: |-
this file, you may extend this exception to your version of the
file, but you are not obligated to do so. If you do not wish to
do so, delete this exception statement from your version.
notes: replaced by spell-checker-exception-lgpl-2.1-plus
1 change: 0 additions & 1 deletion src/licensedcode/data/licenses/openssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ spdx_license_key: LicenseRef-scancode-openssl
faq_url: http://www.openssl.org/support/faq.html
other_urls:
- http://www.openssl.org/source/license.html
minimum_coverage: 30
ignorable_authors:
- the OpenSSL Project
ignorable_urls:
Expand Down
6 changes: 3 additions & 3 deletions src/licensedcode/data/rules/bsd-new_or_gpl-2.0_30.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
license_expression: bsd-new OR gpl-2.0
is_license_notice: yes
relevance: 99
notes: this is also rarely seen with the bsd-simplified license, hence the lowered relevance
referenced_filenames:
- LICENSE
- COPYING
notes: this is used sometimes with a bsd-new and sometimes with a
bsd-simplified and is both long enough and vaguely defined
notes: |
This is used sometimes with a bsd-new and is both long enough and vaguely defined.
This is also rarely seen with the bsd-simplified license, hence the lowered relevance.
4 changes: 2 additions & 2 deletions src/licensedcode/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def load(self):
"""
try:
with io.open(self.data_file, encoding='utf-8') as f:
data = saneyaml.load(f.read())
data = saneyaml.load(f.read(), allow_duplicate_keys=False)

for k, v in data.items():
if k == 'minimum_coverage':
Expand Down Expand Up @@ -1228,7 +1228,7 @@ def load(self):
"""
try:
with io.open(self.data_file, encoding='utf-8') as f:
data = saneyaml.load(f.read())
data = saneyaml.load(f.read(), allow_duplicate_keys=False)
except Exception as e:
print('#############################')
print('INVALID LICENSE RULE FILE:', f'file://{self.data_file}')
Expand Down