Adress review comments and fix test failures

There are suggestions from @DennisClark and @pombredanne

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

src/licensedcode/data/licenses/any-osi.LICENSE

@@ -5,12 +5,12 @@ name: Any OSI License
 category: Unstated License
 owner: Unstated
 spdx_license_key: any-OSI
+minimum_coverage: 100
 other_urls:
     - https://metacpan.org/pod/Exporter::Tidy#LICENSE
 ignorable_urls:
     - http://www.opensource.org/licenses/alphabetical
 ---
-
-{{Pick your favourite OSI approved license}} :)
+Pick your favourite OSI approved license :)
 
 http://www.opensource.org/licenses/alphabetical

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

@@ -2,7 +2,7 @@
 key: asterisk-linking-protocols-exception
 short_name: Asterisk linking protocols exception
 name: Asterisk linking protocols exception
-owner: The Asterisk Project 
+owner: Asterisk
 category: Copyleft Limited
 is_exception: yes
 spdx_license_key: Asterisk-linking-protocols-exception

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

@@ -1,6 +1,6 @@
 ---
 key: bsd-2-clause-first-lines
-short_name: BSD 2-Clause - first lines requirement
+short_name: BSD 2-Clause first lines
 name: BSD 2-Clause - first lines requirement
 owner: Nippon Telegraph and Telephone Corporation
 category: Permissive

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

@@ -2,7 +2,7 @@
 key: hpnd-export-us-acknowledgement
 short_name: HPND US export acknowledgment
 name: HPND with US Government export control warning and acknowledgment
-owner: University of California
+owner: Regents of the University of California
 category: Free Restricted
 notes: |
     Added in SPDX license list 3.24
@@ -11,6 +11,8 @@ spdx_license_key: HPND-export-US-acknowledgement
 other_urls:
     - https://github.com/krb5/krb5/blob/krb5-1.21.2-final/NOTICE#L831-L852
     - https://web.mit.edu/kerberos/krb5-1.21/doc/mitK5license.html
+ignorable_authors:
+    - the University of Southern California
 ---
 
 EXPORT OF THIS SOFTWARE from the United States of America may

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

@@ -2,7 +2,7 @@
 key: hpnd-uc-export-us
 short_name: HPND UC US export warning
 name: Historical Permission Notice and Disclaimer - University of California, US export warning
-owner: University of California
+owner: Regents of the University of California
 category: Free Restricted
 spdx_license_key: HPND-UC-export-US
 notes: Added in SPDX license list 3.24

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

@@ -2,14 +2,16 @@
 key: mit-khronos-old
 short_name: MIT Khronos - old variant
 name: MIT Khronos - old variant
-owner: The Khronos Group Inc.
+owner: Khronos Group
 category: Permissive
 notes: |
     Added in SPDX license list 3.24
     This is the same as khronos.LICENSE except the third paragraph
 spdx_license_key: MIT-Khronos-old
 other_urls:
     - https://github.com/KhronosGroup/SPIRV-Cross/blob/main/LICENSES/LicenseRef-KhronosFreeUse.txt
+ignorable_urls:
+    - https://www.khronos.org/registry/
 ---
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

src/licensedcode/data/licenses/ppl.LICENSE

@@ -2,7 +2,7 @@
 key: ppl
 short_name: Peer Production License
 name: Peer Production License
-category: Commercial
+category: Copyleft
 owner: p2pfoundation.net
 spdx_license_key: PPL
 other_urls:

src/licensedcode/data/rules/any-osi_1.RULE

@@ -1,9 +1,11 @@
 ---
 license_expression: any-osi
-is_license_reference: yes
-relevance: 100
+is_license_text: yes
+minimum_coverage: 100
 ignorable_urls:
     - http://www.opensource.org/licenses/
 ---
 
+Pick your favourite OSI approved license :)
+
 http://www.opensource.org/licenses/

src/licensedcode/data/rules/any-osi_2.RULE

@@ -0,0 +1,7 @@
+---
+license_expression: any-osi
+is_license_text: yes
+minimum_coverage: 100
+---
+
+Pick your favourite OSI approved license

src/licensedcode/data/rules/free-unknown_112.RULE

@@ -2,7 +2,6 @@
 license_expression: free-unknown
 is_license_clue: yes
 relevance: 100
-is_deprecated: yes
 ---
 
 OSI Approved License

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

@@ -752,8 +752,8 @@ license_detections:
              OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
              SUCH DAMAGE.
     identifier: bsd_new-405dd1d5-a75a-5b1c-3698-dad680358560
-  - license_expression: bsd-new AND bsd-2-clause-first-lines
-    license_expression_spdx: BSD-3-Clause AND BSD-2-Clause-first-lines
+  - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - license_expression: bsd-new
         spdx_license_expression: BSD-3-Clause
@@ -797,23 +797,24 @@ license_detections:
              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.
+    identifier: bsd_new-bcd7c498-0b2c-5abe-4ee7-1e4d56c69bcc
+  - license_expression: bsd-2-clause-first-lines
+    license_expression_spdx: BSD-2-Clause-first-lines
+    matches:
       - license_expression: bsd-2-clause-first-lines
         spdx_license_expression: BSD-2-Clause-first-lines
         from_file:
-        start_line: 679
+        start_line: 682
         end_line: 705
         matcher: 2-aho
         score: '100.0'
-        matched_length: '199'
+        matched_length: 185
         match_coverage: '100.0'
         rule_relevance: 100
         rule_identifier: bsd-2-clause-first-lines.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-2-clause-first-lines.LICENSE
         matched_text: |
-          Copyright (C) 2006,2007,2009 NTT (Nippon Telegraph and Telephone
-             Corporation).  All rights reserved.
-
-             Redistribution and use in source and binary forms, with or without
+          Redistribution and use in source and binary forms, with or without
              modification, are permitted provided that the following conditions
              are met:
 
@@ -837,7 +838,7 @@ license_detections:
              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.
-    identifier: bsd_new_and_bsd_2_clause_first_lines-752c9c54-da95-7a43-7971-494139cd43b3
+    identifier: bsd_2_clause_first_lines-6f015fc4-b8cd-90a5-10f6-9b14c7ee7bfd
   - license_expression: cmu-uc
     license_expression_spdx: MIT-CMU
     matches:
@@ -1031,19 +1032,17 @@ license_detections:
       - license_expression: hpnd-export-us-acknowledgement
         spdx_license_expression: HPND-export-US-acknowledgement
         from_file:
-        start_line: 835
+        start_line: 837
         end_line: 856
         matcher: 2-aho
         score: '100.0'
-        matched_length: 174
+        matched_length: 165
         match_coverage: '100.0'
         rule_relevance: 100
         rule_identifier: hpnd-export-us-acknowledgement.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hpnd-export-us-acknowledgement.LICENSE
         matched_text: |
-          Copyright (C) 1994 by the University of Southern California
-
-                EXPORT OF THIS SOFTWARE from the United States of America may
+          EXPORT OF THIS SOFTWARE from the United States of America may
                 require a specific license from the United States Government. It
                 is the responsibility of any person or organization
                 contemplating export to obtain such a license before exporting.
@@ -1063,7 +1062,7 @@ license_detections:
              be held liable for any liability nor for any direct, indirect, or
              consequential damages with respect to any claim by the user or
              distributor of the ksu software.
-    identifier: bsd_simplified_and_hpnd_export_us_acknowledgement-ae58c726-c255-7dc1-e5ac-0d2252b37abc
+    identifier: bsd_simplified_and_hpnd_export_us_acknowledgement-44301bcd-fd8f-70e4-66c1-5897d73ac6aa
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:

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

@@ -752,8 +752,8 @@ license_detections:
              OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
              SUCH DAMAGE.
     identifier: bsd_new-405dd1d5-a75a-5b1c-3698-dad680358560
-  - license_expression: bsd-new AND bsd-2-clause-first-lines
-    license_expression_spdx: BSD-3-Clause AND BSD-2-Clause-first-lines
+  - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - license_expression: bsd-new
         spdx_license_expression: BSD-3-Clause
@@ -797,23 +797,24 @@ license_detections:
              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.
+    identifier: bsd_new-bcd7c498-0b2c-5abe-4ee7-1e4d56c69bcc
+  - license_expression: bsd-2-clause-first-lines
+    license_expression_spdx: BSD-2-Clause-first-lines
+    matches:
       - license_expression: bsd-2-clause-first-lines
         spdx_license_expression: BSD-2-Clause-first-lines
         from_file:
-        start_line: 679
+        start_line: 682
         end_line: 705
         matcher: 2-aho
         score: '100.0'
-        matched_length: '199'
+        matched_length: 185
         match_coverage: '100.0'
         rule_relevance: 100
         rule_identifier: bsd-2-clause-first-lines.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-2-clause-first-lines.LICENSE
         matched_text: |
-          Copyright (C) 2006,2007,2009 NTT (Nippon Telegraph and Telephone
-             Corporation).  All rights reserved.
-
-             Redistribution and use in source and binary forms, with or without
+          Redistribution and use in source and binary forms, with or without
              modification, are permitted provided that the following conditions
              are met:
 
@@ -837,7 +838,7 @@ license_detections:
              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.
-    identifier: bsd_new_and_bsd_2_clause_first_lines-752c9c54-da95-7a43-7971-494139cd43b3
+    identifier: bsd_2_clause_first_lines-6f015fc4-b8cd-90a5-10f6-9b14c7ee7bfd
   - license_expression: cmu-uc
     license_expression_spdx: MIT-CMU
     matches:
@@ -1031,19 +1032,17 @@ license_detections:
       - license_expression: hpnd-export-us-acknowledgement
         spdx_license_expression: HPND-export-US-acknowledgement
         from_file:
-        start_line: 835
+        start_line: 837
         end_line: 856
         matcher: 2-aho
         score: '100.0'
-        matched_length: 174
+        matched_length: 165
         match_coverage: '100.0'
         rule_relevance: 100
         rule_identifier: hpnd-export-us-acknowledgement.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hpnd-export-us-acknowledgement.LICENSE
         matched_text: |
-          Copyright (C) 1994 by the University of Southern California
-
-                EXPORT OF THIS SOFTWARE from the United States of America may
+          EXPORT OF THIS SOFTWARE from the United States of America may
                 require a specific license from the United States Government. It
                 is the responsibility of any person or organization
                 contemplating export to obtain such a license before exporting.
@@ -1063,7 +1062,7 @@ license_detections:
              be held liable for any liability nor for any direct, indirect, or
              consequential damages with respect to any claim by the user or
              distributor of the ksu software.
-    identifier: bsd_simplified_and_hpnd_export_us_acknowledgement-ae58c726-c255-7dc1-e5ac-0d2252b37abc
+    identifier: bsd_simplified_and_hpnd_export_us_acknowledgement-44301bcd-fd8f-70e4-66c1-5897d73ac6aa
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:

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

@@ -752,8 +752,8 @@ license_detections:
              OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
              SUCH DAMAGE.
     identifier: bsd_new-405dd1d5-a75a-5b1c-3698-dad680358560
-  - license_expression: bsd-new AND bsd-2-clause-first-lines
-    license_expression_spdx: BSD-3-Clause AND BSD-2-Clause-first-lines
+  - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - license_expression: bsd-new
         spdx_license_expression: BSD-3-Clause
@@ -797,23 +797,24 @@ license_detections:
              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.
+    identifier: bsd_new-bcd7c498-0b2c-5abe-4ee7-1e4d56c69bcc
+  - license_expression: bsd-2-clause-first-lines
+    license_expression_spdx: BSD-2-Clause-first-lines
+    matches:
       - license_expression: bsd-2-clause-first-lines
         spdx_license_expression: BSD-2-Clause-first-lines
         from_file:
-        start_line: 679
+        start_line: 682
         end_line: 705
         matcher: 2-aho
         score: '100.0'
-        matched_length: '199'
+        matched_length: 185
         match_coverage: '100.0'
         rule_relevance: 100
         rule_identifier: bsd-2-clause-first-lines.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-2-clause-first-lines.LICENSE
         matched_text: |
-          Copyright (C) 2006,2007,2009 NTT (Nippon Telegraph and Telephone
-             Corporation).  All rights reserved.
-
-             Redistribution and use in source and binary forms, with or without
+          Redistribution and use in source and binary forms, with or without
              modification, are permitted provided that the following conditions
              are met:
 
@@ -837,7 +838,7 @@ license_detections:
              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.
-    identifier: bsd_new_and_bsd_2_clause_first_lines-752c9c54-da95-7a43-7971-494139cd43b3
+    identifier: bsd_2_clause_first_lines-6f015fc4-b8cd-90a5-10f6-9b14c7ee7bfd
   - license_expression: cmu-uc
     license_expression_spdx: MIT-CMU
     matches:
@@ -1031,19 +1032,17 @@ license_detections:
       - license_expression: hpnd-export-us-acknowledgement
         spdx_license_expression: HPND-export-US-acknowledgement
         from_file:
-        start_line: 835
+        start_line: 837
         end_line: 856
         matcher: 2-aho
         score: '100.0'
-        matched_length: 174
+        matched_length: 165
         match_coverage: '100.0'
         rule_relevance: 100
         rule_identifier: hpnd-export-us-acknowledgement.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hpnd-export-us-acknowledgement.LICENSE
         matched_text: |
-          Copyright (C) 1994 by the University of Southern California
-
-                EXPORT OF THIS SOFTWARE from the United States of America may
+          EXPORT OF THIS SOFTWARE from the United States of America may
                 require a specific license from the United States Government. It
                 is the responsibility of any person or organization
                 contemplating export to obtain such a license before exporting.
@@ -1063,7 +1062,7 @@ license_detections:
              be held liable for any liability nor for any direct, indirect, or
              consequential damages with respect to any claim by the user or
              distributor of the ksu software.
-    identifier: bsd_simplified_and_hpnd_export_us_acknowledgement-ae58c726-c255-7dc1-e5ac-0d2252b37abc
+    identifier: bsd_simplified_and_hpnd_export_us_acknowledgement-44301bcd-fd8f-70e4-66c1-5897d73ac6aa
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches: