Merge pull request #1646 from nexB/license-updates-07-10

Add new License rules and licenses

Author: pombredanne

configure

@@ -33,3 +33,5 @@ $PYTHON_EXE "$CONFIGURE_ROOT_DIR/etc/configure.py" $CFG_CMD_LINE_ARGS
 if [ -f "$CONFIGURE_ROOT_DIR/bin/activate" ]; then
     source "$CONFIGURE_ROOT_DIR/bin/activate"
 fi
+
+set +e

etc/scripts/synclic.py

@@ -816,6 +816,9 @@ def merge_licenses(scancode_license, external_license, updatable_attributes,
     matching. In this case, the key that is used is that from the ScanCode
     license.
     """
+    if TRACE:
+        print('merge_licenses:', scancode_license, external_license)
+
     updated_scancode_attributes = []
 
     def update_scancode(_attrib, _sc_val, _ext_val):

src/cluecode/copyrights.py

@@ -273,7 +273,7 @@ def detect_copyrights(location, copyrights=True, holders=True, authors=True,
     # MORE NN exceptions to NNP or CAPS
     # 'Berkeley Software Distribution',??
     (r'^(Unicode|Modified|NULL|FALSE|False|TRUE|True|Last|Predefined|If|Standard'
-      r'|Versions?\.?|Package|PACKAGE|Powered|License[d\.e\:]?|License-Alias\:?|Legal'
+      r'|Versions?\.?|Package|PACKAGE|Powered|Licen[cs]e[d\.e\:]?|License-Alias\:?|Legal'
       r'|Entity|Indemnification\.?|IS|This|Java|DoubleClick|DOM|SAX|URL|Operating'
       r'|Original|Release|IEEE|Std|BSD|POSIX|Derivative|Works|Intellij|IDEA|README'
       r'|NEWS|CHANGELOG|Change[lL]og|CHANGElogger|SIGN|F2Wku|LegalTrademarks|OriginalFilename'
@@ -282,7 +282,7 @@ def detect_copyrights(location, copyrights=True, holders=True, authors=True,
       r')$', 'NN'),
 
     # MORE NN exceptions to CAPS
-    (r'^(OR|VALUE|END|TODO)$', 'NN'),
+    (r'^(OR|VALUE|END|TODO|DOCUMENTATION|CHANGES|ISC-LICENSE)$', 'NN'),
 
     # Various rare non CAPS but NNP, treated as full names
     (r'^(FSF[\.,]?)$', 'NAME'),
@@ -291,16 +291,16 @@ def detect_copyrights(location, copyrights=True, holders=True, authors=True,
     (r'^(Windows|XP|SP1|SP2|SP3|SP4|assembly)$', 'JUNK'),
 
     # various junk bits
-    (r'^example\.com$', 'JUNK'),
-    (r'^null$', 'JUNK'),
-
+    (r'^(example\.com'
+      r'|null$'
+      r'|:Licen[cs]e)$', 'JUNK'),
+    
     # when uppercase this is likely part of some SQL statement
     (r'FROM|CREATE|CURDIR', 'JUNK'),
     (r'RECURSIVE|VIEW', 'NN'),
     # found in sqlite
     (r'\+0|ToUpper', 'JUNK'),
 
-
     # Java
     (r'^.*Servlet,?|class$', 'JUNK'),
 
@@ -479,7 +479,8 @@ def detect_copyrights(location, copyrights=True, holders=True, authors=True,
     # or et.al.
     (r'^[Oo]ther?s|et\.al[\.,]?$', 'OTH'),
     # in year ranges: dash, or 'to': "1990-1995", "1990/1995" or "1990 to 1995"
-    (r'^([-/]|to)$', 'DASH'),
+    (r'^[-/]$', 'DASH'),
+    (r'^to$', 'TO'),
 
     # explicitly ignoring these words: FIXME: WHY?
     (r'^([Tt]his|THIS|[Pp]ermissions?|PERMISSIONS?|All)$', 'NN'),
@@ -631,11 +632,12 @@ def detect_copyrights(location, copyrights=True, holders=True, authors=True,
 #######################################
 
     YR-RANGE: {<YR>+ <CC>+ <YR>}        #20
-    YR-RANGE: {<YR> <DASH>* <YR|CD>+}        #30
+    YR-RANGE: {<YR> <DASH|TO>* <YR|CD>+}        #30
     YR-RANGE: {<CD>? <YR>+}        #40
     YR-RANGE: {<YR>+ }        #50
     YR-AND: {<CC>? <YR>+ <CC>+ <YR>}        #60
     YR-RANGE: {<YR-AND>+}        #70
+    YR-RANGE: {<YR-RANGE>+ <DASH|TO> <YR-RANGE>+}        #71
     YR-RANGE: {<YR-RANGE>+ <DASH>?}        #72
 
 #######################################
@@ -1209,6 +1211,11 @@ def detect_copyrights(location, copyrights=True, holders=True, authors=True,
     # Copyright (c) 2007-2014 IOLA and Ole Laursen.
     COPYRIGHT: {<COPYRIGHT> <ANDCO>}
 
+    # Vladimir Oleynik <dzo@simtreas.ru> (c) 2002
+    COPYRIGHT: {<NAME2> <COPYRIGHT2>}        #2840
+
+
+
 # Authors
     # Created by XYZ
     AUTH: {<AUTH2>+ <BY>}        #2645

src/licensedcode/data/licenses/activestate-community-2012.yml

@@ -1,10 +1,10 @@
 key: activestate-community-2012
 short_name: ActiveState Community License 2012
 name: ActiveState Community License 2012
-category: Free Restricted
+category: Proprietary Free
 owner: ActiveState Software, Inc.
 homepage_url: https://web.archive.org/web/20130420143215/http://www.activestate.com/activeperl/license-agreement
-standard_notice: |-
+standard_notice: |
     ActivePerl is covered by the ActiveState Community License.
     Please note:
     If you plan to redistribute ActivePerl you will need a different license.

src/licensedcode/data/licenses/activestate-community.yml

@@ -1,5 +1,5 @@
 key: activestate-community
 short_name: ActiveState Community License
 name: ActiveState Community License
-category: Free Restricted
+category: Proprietary Free
 owner: ActiveState Software, Inc.

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

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

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

@@ -2,7 +2,7 @@ key: ams-fonts
 short_name: AMSFonts license
 name: AMSFonts license
 category: Permissive
-owner: AMS
+owner: American Mathematical Society (AMS)
 homepage_url: http://www.ams.org/publications/type1-fonts
 other_urls:
     - https://fedoraproject.org/wiki/Licensing:AMS