Merge pull request #1421 from nexB/new-and-improved-license-rules-03-06

Add new and improved licenses and licenses rules

Author: pombredanne

etc/scripts/synclic.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2019 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -56,9 +56,9 @@
  - the DejaCode licenses
 
 Run python synclic.py -h for help.
-
 """
 
+
 TRACE = True
 TRACE_ADD = True
 TRACE_FETCH = True
@@ -434,10 +434,6 @@ def build_license(self, mapping, scancode_licenses):
 
         other_urls = list(other_urls)
 
-#         notes = mapping.get('licenseComments')
-#         if notes and notes.strip():
-#             notes = 'Per SPDX.org, ' + ' '.join(notes.split())
-
         standard_notice = mapping.get('standardLicenseHeader') or ''
         if standard_notice:
             standard_notice = clean_text(standard_notice)
@@ -545,11 +541,7 @@ def build_license(self, mapping, scancode_licenses):
         # these licenses are combos of many others and are ignored: we detect
         # instead each part of the combo
         dejacode_special_composites = set([
-            'lzma-sdk-2006',
-            'intel-bsd-special',
-            'openssh',
-            'aes-128-3.0',
-            'stlport-2000',
+              'intel-bsd-special',
             ])
         is_combo = key in dejacode_special_composites
         if is_combo:
@@ -772,27 +764,35 @@ def license_to_dict(lico):
     Return an OrderedDict of license data with texts for API calls.
     Fields with empty values are not included.
     """
-    return dict(
+    licm = dict(
         is_active=False,
         reviewed=False,
         license_status='NotReviewed',
         is_component_license=False,
-
         key=lico.key,
         short_name=lico.short_name,
         name=lico.name,
         category=lico.category,
         owner=lico.owner,
-        homepage_url=lico.homepage_url,
-        reference_notes=lico.notes,
-        full_text=lico.text,
-        is_exception=lico.is_exception,
-        spdx_license_key=lico.spdx_license_key,
-        text_urls='\n'.join(lico.text_urls),
-        osi_url=lico.osi_url,
-        faq_url=lico.faq_url,
-        other_urls='\n'.join(lico.other_urls),
+        is_exception=lico.is_exception
     )
+    if lico.text:
+        licm.update(full_text=lico.text)
+    if lico.homepage_url:
+        licm.update(homepage_url=lico.homepage_url)
+    if lico.spdx_license_key:
+        licm.update(spdx_license_key=lico.spdx_license_key)
+    if lico.notes:
+        licm.update(reference_notes=lico.notes)
+    if lico.text_urls:
+        licm.update(text_urls='\n'.join(lico.text_urls))
+    if lico.osi_url:
+        licm.update(osi_url=lico.osi_url)
+    if lico.faq_url:
+        licm.update(faq_url=lico.faq_url)
+    if lico.other_urls:
+        licm.update(other_urls='\n'.join(lico.other_urls))
+    return licm
 
 
 EXTERNAL_LICENSE_SYNCHRONIZATION_SOURCES = {
@@ -863,12 +863,15 @@ def update_external(_attrib, _sc_val, _ext_val):
             # special case for URL lists, we consider all URL fields to
             # update
             if attrib.endswith('_urls',):
-                all_sc_urls = set(list(normalized_scancode_value)
-                    +scancode_license.text_urls
-                    +scancode_license.other_urls
-                    +[scancode_license.homepage_url,
-                       scancode_license.osi_url,
-                       scancode_license.faq_url])
+                all_sc_urls = set(
+                    list(normalized_scancode_value) +
+                    scancode_license.text_urls +
+                    scancode_license.other_urls +
+                    [scancode_license.homepage_url,
+                     scancode_license.osi_url,
+                     scancode_license.faq_url
+                    ]
+                )
                 all_sc_urls = set(u for u in all_sc_urls if u)
                 new_other_urls = normalize_external_value.difference(all_sc_urls)
                 # add other urls to ScanCode

src/licensedcode/data/licenses/aes-128-3.0.LICENSE

@@ -0,0 +1,15 @@
+All code contained in this distributed is placed in the public domain.
+============================================================= 
+Disclaimer:
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''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 AUTHORS 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.
+============================================================= 

src/licensedcode/data/licenses/aes-128-3.0.yml

@@ -0,0 +1,6 @@
+key: aes-128-3.0
+short_name: AES-128 3.0 License
+name: AES-128 v3.0 License
+category: Public Domain
+owner: Unspecified
+minimum_coverage: 90

src/licensedcode/data/licenses/alfresco-exception-0.5.yml

@@ -1,6 +1,6 @@
 key: alfresco-exception-0.5
-name: Alfresco FLOSS Exception v0.5
 short_name: Alfresco FLOSS Exception v0.5
+name: Alfresco FLOSS Exception v0.5
 category: Copyleft
 owner: Alfresco
 homepage_url: https://web.archive.org/web/20070306001556/http://www.alfresco.com/legal/licensing/floss_exception/

src/licensedcode/data/licenses/autoconf-simple-exception-2.0.yml

@@ -4,6 +4,5 @@ name: Autoconf simple exception to GPL-2.0
 category: Copyleft Limited
 owner: Free Software Foundation (FSF)
 homepage_url: https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob;f=config.guess;h=a7448442748cc6f98a066d2d1051fad3b043761a;hb=HEAD
-notes: |-
-    this is a simpler version of the Autonconf exception to the GPL
+notes: this is a simpler version of the Autonconf exception to the GPL
 is_exception: yes

src/licensedcode/data/licenses/blitz-artistic.yml

@@ -4,6 +4,6 @@ name: Blitz++ Artistic License
 category: Copyleft Limited
 owner: Blitz++
 homepage_url: https://github.com/blitzpp/blitz
-notes:  This is a modified artistic license, no longer in use.
+notes: This is a modified artistic license, no longer in use.
 text_urls:
     - https://raw.githubusercontent.com/blitzpp/blitz/e3c973d68e5ee17aec779bf9711b38fd4afc355f/LICENSE

src/licensedcode/data/licenses/bsd-3-clause-no-change.yml

@@ -1,9 +1,9 @@
 key: bsd-3-clause-no-change
-short_name: BSD 3-Clause No Change 
-name: BSD 3-Clause No Change 
+short_name: BSD 3-Clause No Change
+name: BSD 3-Clause No Change
 category: Permissive
-owner: David Corcoran <[email protected]>   
+owner: David Corcoran <[email protected]>
 homepage_url: https://pcsclite.apdu.fr/
+notes: there is an extra clause about changes which has some ambiguities
 other_urls:
     - https://salsa.debian.org/rousseau/PCSC/blob/master/COPYING
-notes: there is an extra clause about changes which has some ambiguities

src/licensedcode/data/licenses/bsd-original-muscle.yml

@@ -4,4 +4,5 @@ name: BSD-Original MUSCLE
 category: Permissive
 owner: David Corcoran
 homepage_url: https://web.archive.org/web/20060318003856/http://linuxnet.com/
-notes: This license has some extra terms beyond the advertizing clause not found in the bsd-originl 
+notes: This license has some extra terms beyond the advertizing clause not found in the bsd-original
+

src/licensedcode/data/licenses/cvwl.yml

@@ -1,7 +1,7 @@
 key: cvwl
 short_name: Collaborative Virtual Workspace License
 name: Collaborative Virtual Workspace License
-category: Proprietary
+category: Proprietary Free
 owner: Mitre
 homepage_url: https://opensource.org/licenses/mitrepl
 minimum_coverage: 30

src/licensedcode/data/licenses/dwtfnmfpl-3.0.yml

@@ -4,5 +4,4 @@ name: DWTFNMFPL-3.0
 category: Permissive
 owner: dittodhole
 homepage_url: https://github.com/dittodhole/WTFNMFPLv3
-notes: A variation Do What The Fuck You Want
-    Public License (WTFPL) by Sam Hocevar.
+notes: A variant on the Do What The Fuck You Want Public License (WTFPL) by Sam Hocevar.