Merge pull request #2998 from nexB/spring-q2-license-updates

Update license detection

Author: pombredanne

src/licensedcode/data/licenses/arphic-public.LICENSE

@@ -1,3 +1,7 @@
+ARPHIC PUBLIC LICENSE
+
+Copyright (C) 1999 Arphic Technology Co., Ltd.
+11Fl. No.168, Yung Chi Rd., Taipei, 110 Taiwan
 All rights reserved except as specified below.
 
 Everyone is permitted to copy and distribute verbatim copies of this license
@@ -14,7 +18,6 @@ Preamble
 Legal Terms
 
 0. Definitions:
-
    Throughout this License, "Font" means the TrueType fonts "AR PL Mingti2L Big5",
    "AR PL KaitiM Big5" (BIG-5 character set) and "AR PL SungtiL GB", "AR PL KaitiM
    GB" (GB character set) which are originally distributed by Arphic, and the
@@ -71,6 +74,7 @@ Legal Terms
    of this License.
 
 3. Condition Subsequent
+
    You may not copy, modify, sublicense, or distribute the Font except as expressly
    provided under this License. Any attempt otherwise to copy, modify, sublicense or
    distribute the Font will automatically retroactively void your rights under this
@@ -79,20 +83,23 @@ Legal Terms
    compliance.
 
 4. Acceptance
+
    You are not required to accept this License, since you have not signed it.
    However, nothing else grants you permission to copy, modify, sublicense or
    distribute the Font. These actions are prohibited by law if you do not accept this
    License. Therefore, by copying, modifying, sublicensing or distributing the Font,
    you indicate your acceptance of this License and all its terms and conditions.
 
 5. Automatic Receipt
+
    Each time you redistribute the Font, the recipient automatically receives a
    license from the original licensor to copy, distribute or modify the Font subject
    to these terms and conditions. You may not impose any further restrictions on the
    recipients' exercise of the rights granted herein. You are not responsible for
    enforcing compliance by third parties to this License.
 
 6. Contradiction
+
    If, as a consequence of a court judgment or allegation of patent infringement or
    for any other reason (not limited to patent issues), conditions are imposed on you
    (whether by court order, agreement or otherwise) that contradict the conditions of
@@ -109,6 +116,7 @@ Legal Terms
    section as a whole is intended to apply in other circumstances.
 
 7. NO WARRANTY
+
    BECAUSE THE FONT IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE FONT, TO
    THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING
    THE COPYRIGHT HOLDERS OR OTHER PARTIES PROVIDE THE FONT "AS IS" WITHOUT WARRANTY
@@ -119,10 +127,11 @@ Legal Terms
    CORRECTION.
 
 8. DAMAGES WAIVER
+
    UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, IN NO EVENT WILL ANY
    COPYRIGHTT HOLDERS, OR OTHER PARTIES WHO MAY COPY, MODIFY OR REDISTRIBUTE THE FONT
    AS PERMITTED ABOVE, BE LIABLE TO YOU FOR ANY DIRECT, INDIRECT, CONSEQUENTIAL,
    INCIDENTAL, SPECIAL OR EXEMPLARY DAMAGES ARISING OUT OF THE USE OR INABILITY TO
    USE THE FONT (INCLUDING BUT NOT LIMITED TO PROCUREMENT OF SUBSTITUTE GOODS OR
    SERVICES; LOSS OF USE, DATA OR PROFITS; OR BUSINESS INTERRUPTION), EVEN IF SUCH
-   HOLDERS OR OTHER PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+   HOLDERS OR OTHER PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

src/licensedcode/data/licenses/arphic-public.yml

@@ -4,6 +4,14 @@ name: Arphic Public License
 category: Copyleft
 owner: Arphic Technology
 homepage_url: http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE
-spdx_license_key: LicenseRef-scancode-arphic-public
+spdx_license_key: Arphic-1999
+other_spdx_license_keys:
+    - LicenseRef-scancode-arphic-public
 text_urls:
     - http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE
+ignorable_copyrights:
+    - Copyright (c) 1999 Arphic Technology Co., Ltd. 11Fl. No.168, Yung Chi Rd., Taipei, 110
+        Taiwan
+ignorable_holders:
+    - Arphic Technology Co., Ltd. 11Fl. No.168, Yung Chi Rd., Taipei, 110 Taiwan
+    

src/licensedcode/data/licenses/baekmuk-fonts.yml

@@ -3,7 +3,12 @@ short_name: Baekmuk Fonts License
 name: Baekmuk Fonts License
 category: Permissive
 owner: Unspecified
-spdx_license_key: LicenseRef-scancode-baekmuk-fonts
+spdx_license_key: Baekmuk
+other_urls:
+    - https://fedoraproject.org/wiki/Licensing:Baekmuk?rd=Licensing/Baekmuk
+
+other_spdx_license_keys:
+    - LicenseRef-scancode-baekmuk-fonts
 ignorable_copyrights:
     - Copyright (c) Kim Jeong-Hwan
 ignorable_holders:

src/licensedcode/data/licenses/bitstream.yml

@@ -4,7 +4,9 @@ name: Bitstream Vera Font License
 category: Permissive
 owner: Bitstream
 homepage_url: http://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts
-spdx_license_key: LicenseRef-scancode-bitstream
+spdx_license_key: Bitstream-Vera
+other_spdx_license_keys:
+    - LicenseRef-scancode-bitstream
 text_urls:
     - http://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts
 minimum_coverage: 50

src/licensedcode/data/licenses/bsd-new.yml

@@ -6,6 +6,8 @@ owner: Regents of the University of California
 homepage_url: http://www.opensource.org/licenses/BSD-3-Clause
 notes: Per SPDX.org, this license is OSI certified.
 spdx_license_key: BSD-3-Clause
+other_spdx_license_keys:
+    - LicenseRef-scancode-libzip
 text_urls:
     - http://www.opensource.org/licenses/BSD-3-Clause
 osi_url: http://www.opensource.org/licenses/BSD-3-Clause

src/licensedcode/data/licenses/dl-de-by-2-0-de.yml

@@ -10,5 +10,6 @@ other_spdx_license_keys:
     - LicenseRef-scancode-dl-de-by-2-0-de
 other_urls:
     - https://www.dcat-ap.de/def/licenses/
+    - https://www.govdata.de/dl-de/by-2-0
 ignorable_urls:
     - http://www.govdata.de/dl-de/by-2-0

src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_4.RULE renamed to src/licensedcode/data/licenses/kicad-libraries-exception.LICENSE

@@ -0,0 +1,13 @@
+key: kicad-libraries-exception
+short_name: KiCad Libraries Exception to CC-BY-SA-4.0
+name: KiCad Libraries Exception to CC-BY-SA-4.0
+category: Copyleft Limited
+owner: KiCad
+spdx_license_key: KiCad-libraries-exception
+other_urls:
+    - https://www.kicad.org/libraries/license/
+notes: this is always an execption to the CC-BY-SA-4.0 license.
+ and the homepage introduces this expection this way "The KiCad libraries
+ are licensed under the Creative Commons CC-BY-SA 4.0 License, with the
+ following exception."
+ We used to track this as cc-by-sa-4.0 WITH generic-exception

src/licensedcode/data/licenses/kicad-libraries-exception.yml

@@ -8,3 +8,4 @@ homepage_url: http://artlibre.org/
 spdx_license_key: LAL-1.3
 other_urls:
     - http://artlibre.org/licence/lal/en/
+    - https://artlibre.org/

src/licensedcode/data/licenses/lal-1.3.yml

@@ -16,12 +16,12 @@ other_urls:
     - http://www.gnu.org/copyleft/lesser.html
     - http://www.opensource.org/licenses/LGPL-3.0
     - https://opensource.org/licenses/LGPL-3.0
+    - https://www.gnu.org/licenses/lgpl+gpl-3.0.txt
     - https://www.gnu.org/licenses/lgpl-3.0-standalone.html
 minimum_coverage: 99
 ignorable_copyrights:
-  - Copyright (c) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+    - Copyright (c) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 ignorable_holders:
-  - Free Software Foundation, Inc.
+    - Free Software Foundation, Inc.
 ignorable_urls:
-  - https://fsf.org/
-
+    - https://fsf.org/