Skip to content

Commit e41de20

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
committed
Adress review comments and fix test failures
There are suggestions from @DennisClark Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
1 parent 71563ba commit e41de20

File tree

9 files changed

+52
-51
lines changed

9 files changed

+52
-51
lines changed

‎src/licensedcode/data/licenses/asterisk-linking-protocols-exception.LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
key: asterisk-linking-protocols-exception
33
short_name: Asterisk linking protocols exception
44
name: Asterisk linking protocols exception
5-
owner: The Asterisk Project
5+
owner: Asterisk
66
category: Copyleft Limited
77
is_exception: yes
88
spdx_license_key: Asterisk-linking-protocols-exception

‎src/licensedcode/data/licenses/bsd-2-clause-first-lines.LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
key: bsd-2-clause-first-lines
3-
short_name: BSD 2-Clause - first lines requirement
3+
short_name: BSD 2-Clause first lines
44
name: BSD 2-Clause - first lines requirement
55
owner: Nippon Telegraph and Telephone Corporation
66
category: Permissive

‎src/licensedcode/data/licenses/hpnd-export-us-acknowledgement.LICENSE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
key: hpnd-export-us-acknowledgement
33
short_name: HPND US export acknowledgment
44
name: HPND with US Government export control warning and acknowledgment
5-
owner: University of California
5+
owner: Regents of the University of California
66
category: Free Restricted
77
notes: |
88
Added in SPDX license list 3.24
@@ -11,6 +11,8 @@ spdx_license_key: HPND-export-US-acknowledgement
1111
other_urls:
1212
- https://github.com/krb5/krb5/blob/krb5-1.21.2-final/NOTICE#L831-L852
1313
- https://web.mit.edu/kerberos/krb5-1.21/doc/mitK5license.html
14+
ignorable_authors:
15+
- the University of Southern California
1416
---
1517

1618
EXPORT OF THIS SOFTWARE from the United States of America may

‎src/licensedcode/data/licenses/hpnd-uc-export-us.LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
key: hpnd-uc-export-us
33
short_name: HPND UC US export warning
44
name: Historical Permission Notice and Disclaimer - University of California, US export warning
5-
owner: University of California
5+
owner: Regents of the University of California
66
category: Free Restricted
77
spdx_license_key: HPND-UC-export-US
88
notes: Added in SPDX license list 3.24

‎src/licensedcode/data/licenses/mit-khronos-old.LICENSE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
key: mit-khronos-old
33
short_name: MIT Khronos - old variant
44
name: MIT Khronos - old variant
5-
owner: The Khronos Group Inc.
5+
owner: Khronos Group
66
category: Permissive
77
notes: |
88
Added in SPDX license list 3.24
99
This is the same as khronos.LICENSE except the third paragraph
1010
spdx_license_key: MIT-Khronos-old
1111
other_urls:
1212
- https://github.com/KhronosGroup/SPIRV-Cross/blob/main/LICENSES/LicenseRef-KhronosFreeUse.txt
13+
ignorable_urls:
14+
- https://www.khronos.org/registry/
1315
---
1416

1517
Permission is hereby granted, free of charge, to any person obtaining a copy

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
key: ppl
33
short_name: Peer Production License
44
name: Peer Production License
5-
category: Commercial
5+
category: Copyleft
66
owner: p2pfoundation.net
77
spdx_license_key: PPL
88
other_urls:

‎tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgssapi-krb5-2/copyright-detailed.expected.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -752,8 +752,8 @@ license_detections:
752752
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
753753
SUCH DAMAGE.
754754
identifier: bsd_new-405dd1d5-a75a-5b1c-3698-dad680358560
755-
- license_expression: bsd-new AND bsd-2-clause-first-lines
756-
license_expression_spdx: BSD-3-Clause AND BSD-2-Clause-first-lines
755+
- license_expression: bsd-new
756+
license_expression_spdx: BSD-3-Clause
757757
matches:
758758
- license_expression: bsd-new
759759
spdx_license_expression: BSD-3-Clause
@@ -797,23 +797,24 @@ license_detections:
797797
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
798798
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
799799
OF THE POSSIBILITY OF SUCH DAMAGE.
800+
identifier: bsd_new-bcd7c498-0b2c-5abe-4ee7-1e4d56c69bcc
801+
- license_expression: bsd-2-clause-first-lines
802+
license_expression_spdx: BSD-2-Clause-first-lines
803+
matches:
800804
- license_expression: bsd-2-clause-first-lines
801805
spdx_license_expression: BSD-2-Clause-first-lines
802806
from_file:
803-
start_line: 679
807+
start_line: 682
804808
end_line: 705
805809
matcher: 2-aho
806810
score: '100.0'
807-
matched_length: '199'
811+
matched_length: 185
808812
match_coverage: '100.0'
809813
rule_relevance: 100
810814
rule_identifier: bsd-2-clause-first-lines.LICENSE
811815
rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-2-clause-first-lines.LICENSE
812816
matched_text: |
813-
Copyright (C) 2006,2007,2009 NTT (Nippon Telegraph and Telephone
814-
Corporation). All rights reserved.
815-
816-
Redistribution and use in source and binary forms, with or without
817+
Redistribution and use in source and binary forms, with or without
817818
modification, are permitted provided that the following conditions
818819
are met:
819820
@@ -837,7 +838,7 @@ license_detections:
837838
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
838839
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
839840
OF THE POSSIBILITY OF SUCH DAMAGE.
840-
identifier: bsd_new_and_bsd_2_clause_first_lines-752c9c54-da95-7a43-7971-494139cd43b3
841+
identifier: bsd_2_clause_first_lines-6f015fc4-b8cd-90a5-10f6-9b14c7ee7bfd
841842
- license_expression: cmu-uc
842843
license_expression_spdx: MIT-CMU
843844
matches:
@@ -1031,19 +1032,17 @@ license_detections:
10311032
- license_expression: hpnd-export-us-acknowledgement
10321033
spdx_license_expression: HPND-export-US-acknowledgement
10331034
from_file:
1034-
start_line: 835
1035+
start_line: 837
10351036
end_line: 856
10361037
matcher: 2-aho
10371038
score: '100.0'
1038-
matched_length: 174
1039+
matched_length: 165
10391040
match_coverage: '100.0'
10401041
rule_relevance: 100
10411042
rule_identifier: hpnd-export-us-acknowledgement.LICENSE
10421043
rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hpnd-export-us-acknowledgement.LICENSE
10431044
matched_text: |
1044-
Copyright (C) 1994 by the University of Southern California
1045-
1046-
EXPORT OF THIS SOFTWARE from the United States of America may
1045+
EXPORT OF THIS SOFTWARE from the United States of America may
10471046
require a specific license from the United States Government. It
10481047
is the responsibility of any person or organization
10491048
contemplating export to obtain such a license before exporting.
@@ -1063,7 +1062,7 @@ license_detections:
10631062
be held liable for any liability nor for any direct, indirect, or
10641063
consequential damages with respect to any claim by the user or
10651064
distributor of the ksu software.
1066-
identifier: bsd_simplified_and_hpnd_export_us_acknowledgement-ae58c726-c255-7dc1-e5ac-0d2252b37abc
1065+
identifier: bsd_simplified_and_hpnd_export_us_acknowledgement-44301bcd-fd8f-70e4-66c1-5897d73ac6aa
10671066
- license_expression: bsd-original-uc
10681067
license_expression_spdx: BSD-4-Clause-UC
10691068
matches:

‎tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libk5crypto3/copyright-detailed.expected.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -752,8 +752,8 @@ license_detections:
752752
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
753753
SUCH DAMAGE.
754754
identifier: bsd_new-405dd1d5-a75a-5b1c-3698-dad680358560
755-
- license_expression: bsd-new AND bsd-2-clause-first-lines
756-
license_expression_spdx: BSD-3-Clause AND BSD-2-Clause-first-lines
755+
- license_expression: bsd-new
756+
license_expression_spdx: BSD-3-Clause
757757
matches:
758758
- license_expression: bsd-new
759759
spdx_license_expression: BSD-3-Clause
@@ -797,23 +797,24 @@ license_detections:
797797
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
798798
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
799799
OF THE POSSIBILITY OF SUCH DAMAGE.
800+
identifier: bsd_new-bcd7c498-0b2c-5abe-4ee7-1e4d56c69bcc
801+
- license_expression: bsd-2-clause-first-lines
802+
license_expression_spdx: BSD-2-Clause-first-lines
803+
matches:
800804
- license_expression: bsd-2-clause-first-lines
801805
spdx_license_expression: BSD-2-Clause-first-lines
802806
from_file:
803-
start_line: 679
807+
start_line: 682
804808
end_line: 705
805809
matcher: 2-aho
806810
score: '100.0'
807-
matched_length: '199'
811+
matched_length: 185
808812
match_coverage: '100.0'
809813
rule_relevance: 100
810814
rule_identifier: bsd-2-clause-first-lines.LICENSE
811815
rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-2-clause-first-lines.LICENSE
812816
matched_text: |
813-
Copyright (C) 2006,2007,2009 NTT (Nippon Telegraph and Telephone
814-
Corporation). All rights reserved.
815-
816-
Redistribution and use in source and binary forms, with or without
817+
Redistribution and use in source and binary forms, with or without
817818
modification, are permitted provided that the following conditions
818819
are met:
819820
@@ -837,7 +838,7 @@ license_detections:
837838
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
838839
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
839840
OF THE POSSIBILITY OF SUCH DAMAGE.
840-
identifier: bsd_new_and_bsd_2_clause_first_lines-752c9c54-da95-7a43-7971-494139cd43b3
841+
identifier: bsd_2_clause_first_lines-6f015fc4-b8cd-90a5-10f6-9b14c7ee7bfd
841842
- license_expression: cmu-uc
842843
license_expression_spdx: MIT-CMU
843844
matches:
@@ -1031,19 +1032,17 @@ license_detections:
10311032
- license_expression: hpnd-export-us-acknowledgement
10321033
spdx_license_expression: HPND-export-US-acknowledgement
10331034
from_file:
1034-
start_line: 835
1035+
start_line: 837
10351036
end_line: 856
10361037
matcher: 2-aho
10371038
score: '100.0'
1038-
matched_length: 174
1039+
matched_length: 165
10391040
match_coverage: '100.0'
10401041
rule_relevance: 100
10411042
rule_identifier: hpnd-export-us-acknowledgement.LICENSE
10421043
rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hpnd-export-us-acknowledgement.LICENSE
10431044
matched_text: |
1044-
Copyright (C) 1994 by the University of Southern California
1045-
1046-
EXPORT OF THIS SOFTWARE from the United States of America may
1045+
EXPORT OF THIS SOFTWARE from the United States of America may
10471046
require a specific license from the United States Government. It
10481047
is the responsibility of any person or organization
10491048
contemplating export to obtain such a license before exporting.
@@ -1063,7 +1062,7 @@ license_detections:
10631062
be held liable for any liability nor for any direct, indirect, or
10641063
consequential damages with respect to any claim by the user or
10651064
distributor of the ksu software.
1066-
identifier: bsd_simplified_and_hpnd_export_us_acknowledgement-ae58c726-c255-7dc1-e5ac-0d2252b37abc
1065+
identifier: bsd_simplified_and_hpnd_export_us_acknowledgement-44301bcd-fd8f-70e4-66c1-5897d73ac6aa
10671066
- license_expression: bsd-original-uc
10681067
license_expression_spdx: BSD-4-Clause-UC
10691068
matches:

‎tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkrb5-3/copyright-detailed.expected.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -752,8 +752,8 @@ license_detections:
752752
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
753753
SUCH DAMAGE.
754754
identifier: bsd_new-405dd1d5-a75a-5b1c-3698-dad680358560
755-
- license_expression: bsd-new AND bsd-2-clause-first-lines
756-
license_expression_spdx: BSD-3-Clause AND BSD-2-Clause-first-lines
755+
- license_expression: bsd-new
756+
license_expression_spdx: BSD-3-Clause
757757
matches:
758758
- license_expression: bsd-new
759759
spdx_license_expression: BSD-3-Clause
@@ -797,23 +797,24 @@ license_detections:
797797
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
798798
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
799799
OF THE POSSIBILITY OF SUCH DAMAGE.
800+
identifier: bsd_new-bcd7c498-0b2c-5abe-4ee7-1e4d56c69bcc
801+
- license_expression: bsd-2-clause-first-lines
802+
license_expression_spdx: BSD-2-Clause-first-lines
803+
matches:
800804
- license_expression: bsd-2-clause-first-lines
801805
spdx_license_expression: BSD-2-Clause-first-lines
802806
from_file:
803-
start_line: 679
807+
start_line: 682
804808
end_line: 705
805809
matcher: 2-aho
806810
score: '100.0'
807-
matched_length: '199'
811+
matched_length: 185
808812
match_coverage: '100.0'
809813
rule_relevance: 100
810814
rule_identifier: bsd-2-clause-first-lines.LICENSE
811815
rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-2-clause-first-lines.LICENSE
812816
matched_text: |
813-
Copyright (C) 2006,2007,2009 NTT (Nippon Telegraph and Telephone
814-
Corporation). All rights reserved.
815-
816-
Redistribution and use in source and binary forms, with or without
817+
Redistribution and use in source and binary forms, with or without
817818
modification, are permitted provided that the following conditions
818819
are met:
819820
@@ -837,7 +838,7 @@ license_detections:
837838
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
838839
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
839840
OF THE POSSIBILITY OF SUCH DAMAGE.
840-
identifier: bsd_new_and_bsd_2_clause_first_lines-752c9c54-da95-7a43-7971-494139cd43b3
841+
identifier: bsd_2_clause_first_lines-6f015fc4-b8cd-90a5-10f6-9b14c7ee7bfd
841842
- license_expression: cmu-uc
842843
license_expression_spdx: MIT-CMU
843844
matches:
@@ -1031,19 +1032,17 @@ license_detections:
10311032
- license_expression: hpnd-export-us-acknowledgement
10321033
spdx_license_expression: HPND-export-US-acknowledgement
10331034
from_file:
1034-
start_line: 835
1035+
start_line: 837
10351036
end_line: 856
10361037
matcher: 2-aho
10371038
score: '100.0'
1038-
matched_length: 174
1039+
matched_length: 165
10391040
match_coverage: '100.0'
10401041
rule_relevance: 100
10411042
rule_identifier: hpnd-export-us-acknowledgement.LICENSE
10421043
rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hpnd-export-us-acknowledgement.LICENSE
10431044
matched_text: |
1044-
Copyright (C) 1994 by the University of Southern California
1045-
1046-
EXPORT OF THIS SOFTWARE from the United States of America may
1045+
EXPORT OF THIS SOFTWARE from the United States of America may
10471046
require a specific license from the United States Government. It
10481047
is the responsibility of any person or organization
10491048
contemplating export to obtain such a license before exporting.
@@ -1063,7 +1062,7 @@ license_detections:
10631062
be held liable for any liability nor for any direct, indirect, or
10641063
consequential damages with respect to any claim by the user or
10651064
distributor of the ksu software.
1066-
identifier: bsd_simplified_and_hpnd_export_us_acknowledgement-ae58c726-c255-7dc1-e5ac-0d2252b37abc
1065+
identifier: bsd_simplified_and_hpnd_export_us_acknowledgement-44301bcd-fd8f-70e4-66c1-5897d73ac6aa
10671066
- license_expression: bsd-original-uc
10681067
license_expression_spdx: BSD-4-Clause-UC
10691068
matches:

0 commit comments

Comments
 (0)