Merge pull request #211 from hesa/hesa-add-licenses-027

Add licenses bulk 027

Author: hesa

README.md

@@ -56,12 +56,12 @@ Current support:
 
 |Type            | Number |
 |----------------|--------|
-|Licenses        | 195    |
-|Aliases         | 2696   |
+|Licenses        | 201    |
+|Aliases         | 2805   |
 |Compatibilities | 23     |
 |Operators       | 14     |
-|Ambiguities     | 143    |
-|Compounds       | 38     |
+|Ambiguities     | 159    |
+|Compounds       | 46     |
 
 # About
 

STATUS.md

@@ -1,9 +1,9 @@
 
 |Type            | Number |
 |----------------|--------|
-|Licenses        | 195    |
-|Aliases         | 2696   |
+|Licenses        | 201    |
+|Aliases         | 2805   |
 |Compatibilities | 23     |
 |Operators       | 14     |
-|Ambiguities     | 143    |
-|Compounds       | 38     |
+|Ambiguities     | 159    |
+|Compounds       | 46     |

devel/check-license-file.sh

@@ -9,7 +9,8 @@
 #     check-license-file.sh <LICENSE-FILE>
 # 
 
+SCRIPT_DIR=$(dirname ${BASH_SOURCE[0]})/../
 cat $1 | while read LICENSE
 do
     printf "unknown\n$LICENSE\n" 
-done | ./devel/flame shell -s | grep -v Unknown
+done | ${SCRIPT_DIR}/devel/flame shell -s | grep -v Unknown

devel/flame

@@ -4,4 +4,5 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-PYTHONPATH=./python python/flame/__main__.py $*
+SCRIPT_DIR=$(dirname ${BASH_SOURCE[0]})/../
+PYTHONPATH=${SCRIPT_DIR}/python ${SCRIPT_DIR}/python/flame/__main__.py $*

tests/shell/sanity-check.sh

@@ -89,13 +89,17 @@ check_presence()
     if [ "$PRESENT" != "" ]
     then
         echo "FAIL"
-        echo " * cause: Not present in $FILE"
+        echo " * cause: Not present ($PRESENT) in $FILE"
         echo " --------------------------"
         echo "Should be present: $REG_EXP_PRESENCE"
         echo " --------------------------"
+        echo "Try yourself: "
+        echo "              cat $FILE | jq  -r .aliases[] | grep -v \"$REG_EXP_PRESENCE\""
+        echo " --------------------------"
         RET=$(( $RET + 1 ))
         _RET="FAIL"
         LICENSE_ERRORS="$LICENSE_ERRORS  $REG_EXP_PRESENCE not present in $FILE"
+        exit
     fi
 
     # check unpresence
@@ -147,6 +151,8 @@ check_presence AFL-2.0 " -e 2.0 " "-e 1 -e 2.1 -e 3"
 check_presence AFL-2.1 " -e 2.1 " "-e 1. -e 2.0 -e 0  -e 3"
 check_presence AFL-3.0 " -e 3 " "-e 1 -e 2 "
 
+check_presence AGPL-1.0-only     " -i -e 1 -e affero" " -e '1 ' -e 2 -e later -e plus -e + -e library -e lesser "
+check_presence AGPL-1.0-or-later     " -i -e 1 -e affero" " -e '1 '  -e library -e lesser "
 check_presence AGPL-3.0-only     " -i -e 3 -e affero" " -e '1 ' -e 2 -e later -e plus -e + -e library -e lesser "
 check_presence AGPL-3.0-or-later " -e 3 -e later -e +" " -e '1 ' -e 2  -e library -e lesser "
 
@@ -171,19 +177,20 @@ check_presence Bootloader-exception " -i bootloader" ""
 check_presence BSL-1.0                            " -e BSL-1 -e BSL1 -e 1 " " -i -e original "
 
 
+check_presence LicenseRef-scancode-khronos " -i -e khronos" ""
 check_presence LicenseRef-scancode-openssl-exception-lgpl " -i -e openssl" ""
 check_presence LicenseRef-scancode-openssl-exception-gpl-2.0-plus " -i -e openssl" ""
 check_presence LicenseRef-scancode-openssl-exception-lgpl2.0plus " -i -e openssl" ""
-
 check_presence LicenseRef-scancode-boost-original " -i -e original "        " -e BSL-1 -e BSL1 -e 1 "  
 check_presence LicenseRef-scancode-ssleay " -i -e leay "        " -e openssl"  
 
 check_presence 0BSD "$ZERO_BSD_PRESENT" "$BSD3_PRESENT $BSD2_PRESENT "
 check_presence BSD-1-Clause " -i BSD" " -e 2 -e 3 -e 4 "
-check_presence BSD-2-Clause "$BSD2_PRESENT" "$ZERO_BSD_PRESENT $BSD3_PRESENT "
+check_presence BSD-2-Clause "$BSD2_PRESENT" " -e 3 "
 check_presence BSD-2-Clause-Patent "$BSD2_PATENT_PRESENT" "$ZERO_BSD_PRESENT $BSD3_PRESENT "
 check_presence BSD-2-Clause-Views " -i -e view"  " -e 0 -e 1 -e 3 -e 4"
 check_presence BSD-3-Clause "$BSD3_PRESENT" "$ZERO_BSD_PRESENT  -i -e two -e simplified -e freebsd "
+check_presence BSD-3-Clause-Attribution " -i -e ack -e attribution" " -e 0 -e 1 -e 2 -e 4"
 check_presence BSD-3-Clause-Clear " -i -e clear" " -e 0 -e 1 -e 2 -e 4"
 check_presence BSD-3-Clause-Modification " -i -e modification -e repoze " " -e 0 -e 1 -e 2 -e 4"
 check_presence BSD-3-Clause-No-Nuclear-Warranty " -i -e nuclear" " -e 0 -e 1 -e 2 -e 4"
@@ -331,6 +338,7 @@ check_presence Plexus " -i -e plexus -e classworlds " ""
 check_presence PostgreSQL " -i -e postgresql " ""
 check_presence Python-2.0.1 " -i -e Python " ""
 
+check_presence romic-exception " -i -e romic " ""
 check_presence RSA-MD " -i -e RSA " ""
 check_presence RSCPL " -i -e RSCPL -e Ricoh " ""
 
@@ -371,7 +379,7 @@ check_presence xpp " -i -e xpp -e indiana " ""
 check_presence LicenseRef-scancode-xfree86-1.0 " -i -e 1.0 " " -e  X/MIT -e 1.1 " 
 check_presence XFree86-1.1 " -i -e 1.1 " " -e  X/MIT -e 1.0 " 
 
-check_presence Zlib " -i -e libz -e zlib" " -i bsd "
+check_presence Zlib " -i -e libz -e zlib -e z-lib" " -i bsd "
 check_presence ZPL-1.1 " -e 1.1" " -e 2"
 check_presence ZPL-2.0 " -e 2.0" " -e 1 -e 2.1"
 check_presence ZPL-2.1 " -e 2.1" " -e 1.1 -e 2.0"

var/ambiguities.json

@@ -15,7 +15,8 @@
         },
         "GNU Affero General Public License": {
             "aliases": [
-                "AGPL"
+              "AGPL",
+              " Affero General Public License"
             ],
             "problem": "This license has different versions (1.0, 2.0 and 3.0) and different names (version 1.0 does not have GNU in the name). Without a version number it is not possible to determine which of the versions is meant."
         },
@@ -37,7 +38,9 @@
                 "License :: OSI Approved :: Apache Software License",
               "OSI Approved Apache Software License",
               "apache",
-              "OSI-Approved-::-Apache-Software-License"
+              "OSI-Approved-::-Apache-Software-License",
+              "LICENSE-APACHE",
+              "Apache other"
             ],
             "problem": "This license has different version (1.0, 1.1, and 2.0). Without a version number it is not possible to determine which of the versions is meant."
         },
@@ -90,7 +93,11 @@
                 "BSD license",
                 "License :: OSI Approved :: BSD License",
               "BSD licensed code",
-              "BSD Software License"
+              "BSD Software License",
+              "BSD_License",
+              "BSD_License_",
+              "BSD like",
+              "BSD-LIKE"
             ],
             "problem": "There are a couple of variants or versions of the BSD license (0BSD, BSD-1-Clause, BSD-2-Clause, BSD-3-Clause and BSD-4-Clause). Without the version/variant of the license it is not possible to determine which of the versions is meant."
         },
@@ -185,7 +192,7 @@
                 "GNU GENERAL PUBLIC LICENSE",
                 "License :: OSI Approved :: GNU General Public License",
                 "License :: OSI Approved :: GNU General Public License (GPL)",
-                "GNU General Public License (GPL)",
+              "GNU General Public License (GPL)",
               "GNU-GPL",
               "GPL license"
             ],
@@ -205,7 +212,9 @@
             "GNU Library/LGPL",
             "GNU Library",
             "GNU Library or GNU Lesser General Public License",
-            "GNU Lesser General Public License v1.0"
+            "GNU Lesser General Public License v1.0",
+            "LGPL license",
+            "GNU Lesser Public License"
           ],
           "problem": "This license has different versions (2.0, 2.1 and 3.0). Without a version number it is not possible to determine which of the versions is meant."
         },
@@ -219,7 +228,9 @@
                 "MIT Like",
                 "MIT-style License.",
                 "MIT-license",
-                "MIT-Licences"
+              "MIT-Licences",
+              "MIT-like License",
+              "MIT Style License"
             ],
             "problem": "This is not a license identifier. It is most likely a license similar to MIT, but without more information no assumptions can be made."
         },
@@ -228,7 +239,8 @@
                 "MPL",
                 "MPL-1",
                 "MPLv1",
-                "Mozilla-permissive"
+              "Mozilla-permissive",
+              "Mozilla"
             ],
             "problem": "This license has different version (1.0, 1.1 and 2.0). Without a version number clearly distinguishing the version it is not possible to determine which of the versions is meant."
         },
@@ -276,7 +288,11 @@
                 "Python Software Foundation",
               "Python Software Foundation License (PSFL)",
               "The Python Software Foundation License",
-              "PSF-License"
+              "PSF-License",
+              "psf-license",
+              "PSF LICENSE",
+              "Python Open Source GPL Compatible License Agreement",
+              "Software Foundation License"
             ],
             "problem": "This license has different versions (2.0 and 2.0.1). Without a version number clearly distinguishing the version it is not possible to determine which of the versions is meant."
         },

var/compounds.json

@@ -4,6 +4,13 @@
         "comment": ""
     },
     "compounds": [
+      {
+        "spdxid": "AGPL 3.0 WITH romic-exception",
+        "aliases": [
+          "linking-exception-agpl-3.0",
+          "AGPL-3.0-only WITH romic-exception"
+        ]
+      },
         {
             "spdxid": "Apache-2.0 WITH LLVM-exception",
             "aliases": [
@@ -32,7 +39,8 @@
                 "GPL v2.0 w/ CPE",
               "GPL2 w CPE",
               "GPL-2.0-only WITH the Classpath Exception",
-              "GPL-2.0-only WITH the classpath exception"
+              "GPL-2.0-only WITH the classpath exception",
+              "GPLv2+CE"
             ]
         },
         {
@@ -90,7 +98,12 @@
                 "GNU General Public License v3.0 w/GCC Runtime Library exception",
                 "GPLv3 + GCC Runtime Library Exception version 3.1",
               "GPL 3.0 w/RTE",
-              "GPL-3 w/ GCC exception"
+              "GPL-3 w/ GCC exception",
+              "GPL-3.0-only WITH GCC exception",
+              "GPL-3.0-only WITH GCC Runtime Library exception",
+              "GPL-3.0+-with-GCC-exception",
+              "GPL-2.0-only WITH GCC exception",
+              "GPL-2.0-only WITH GCC Runtime Library exception"
             ],
             "compatibility_as": "0BSD"
         },

var/licenses/0BSD.json

@@ -24,6 +24,7 @@
     "License :: OSI Approved :: Zero-Clause BSD (0BSD)",
     "BSD 0C",
     "Free Public License 1.0.0",
-    "free-public-license-1-0-0"
+    "free-public-license-1-0-0",
+    "bsd-0-clause"
   ]
 }