Merge pull request #138 from hesa/hesa-add-licenses-VII

Add licenses bulk VII

tests/shell/sanity-check.sh

@@ -118,6 +118,7 @@ check_presence()
 
 ZERO_BSD_PRESENT=" -e 0BSD -i -e zero -e \"0-\""
 BSD2_PRESENT=" -e 2 -i -e two -e simplified -e freebsd "
+BSD2_PATENT_PRESENT=" -e -i patent" 
 BSD3_PRESENT=" -e 3 -i -e new -e modified -e revised -e three -e 'no advertising' "
 BSD4_PRESENT=" -e 4 -i -e 'BSD with advertising' -e original "
 
@@ -130,10 +131,12 @@ check_presence Artistic-2.0 " -e 2 -e 2.0 " "-e 1"
 
 check_presence 0BSD "$ZERO_BSD_PRESENT" "$BSD3_PRESENT $BSD2_PRESENT "
 check_presence BSD-2-Clause "$BSD2_PRESENT" "$ZERO_BSD_PRESENT $BSD3_PRESENT "
+check_presence BSD-2-Clause-Patent "$BSD2_PATENT_PRESENT" "$ZERO_BSD_PRESENT $BSD3_PRESENT "
 check_presence BSD-3-Clause "$BSD3_PRESENT" "$ZERO_BSD_PRESENT $BSD2_PRESENT"
 check_presence BSD-4-Clause "$BSD4_PRESENT" " $ZERO_BSD_PRESENT $BSD2_PRESENT $BSD3_PRESENT"
 
 check_presence CC0-1.0 " -e 1 -e 0 " " -e [2-9]"
+check_presence CC-PDDC " -i -e pd -e dedication  " " -e [1-9]"
 check_presence CC-BY-3.0 " -e 3 " " -e 4"
 check_presence CC-BY-4.0 " -e 4 " " -e 3"
 check_presence CC-BY-SA-2.5 " -e 2.5 " " -e 3 -e 4"
@@ -143,6 +146,8 @@ check_presence CC-BY-SA-4.0 " -e 4 " " -e 2 -e 3"
 check_presence CDDL-1.0 " -e 1.0 " " -e 1.1"
 check_presence CDDL-1.1 " -e 1.1" " -e 1.0"
 
+check_presence CPL-1.0 " -e 1.0  -e 1 " " -e 0.5 -e 2"
+
 check_presence EPL-1.0 " -e 1.0 -e 1" " -e 2"
 check_presence EPL-2.0 " -e 2.0 -e 2" " -e 1"
 

var/ambiguities.json

@@ -7,15 +7,24 @@
         "Artistic License": {
             "aliases": [
                 "License :: OSI Approved :: Artistic License",
-                "Artistic License"
+                "Artistic License",
+                "Artistic"
             ],
             "problem": "This license has different version (1.0, and 2.0). Without a version number it is not possible to determine which of the versions is meant."
         },
         "BSD": {
             "aliases": [
                 "BSD License (BSD License)"
             ],
-            "problem": "There 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."
+            "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."
+        },
+        "Common Public License": {
+            "aliases": [
+                "Common Public License",
+                "CPL",
+                "License :: OSI Approved :: Common Public License"
+            ],
+            "problem": "There are couple of versions of the CPL license (0.5 and 1). Without the version/variant of the license it is not possible to determine which of the versions is meant."
         },
         "GNU General Public License": {
             "aliases": [
@@ -32,7 +41,9 @@
                 "GNU Library General Public License v2 only",
                 "GNU Library General Public License v2 only",
                 "License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)",
-                "GNU Lesser General Public License v2 (LGPLv2)"
+                "GNU Lesser General Public License v2 (LGPLv2)",
+                "LGPLv2 or later",
+                "GNU General Public License, Version 2 or later"
             ],
             "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."
         },

var/licenses/BSD-3-Clause.json

@@ -11,7 +11,6 @@
         "BSD3",
         "3-BSD",
         "BSD 3-Clause \"New\" or \"Revised\" License",
-
         "BSD (3 clause)",
         "BSD License (no advertising)",
         "bsd-3-clause",
@@ -25,6 +24,7 @@
         "The BSD-3-clause License",
         "3-Clause BSD License",
         "3-clause BSD",
+        "3-Clause BSD",
         "Three-clause BSD-style",
         "bsd_3",
         "Modified BSD Licens",

var/licenses/Bitstream-Vera.LICENSE

@@ -0,0 +1,42 @@
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use,
+copy, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font
+Software without prior written authorization from the Gnome Foundation
+or Bitstream Inc., respectively. For further information, contact:
+fonts at gnome dot org.

var/licenses/Bitstream-Vera.json

@@ -0,0 +1,13 @@
+{
+    "meta": {
+        "disclaimer": "https://github.com/hesa/license-db/tree/main/var/disclamer.md",
+        "comment": ""
+    },
+    "name": "Bitstream Vera Font License",
+    "scancode_key": "bitstream",
+    "spdxid": "Bitstream-Vera",
+    "aliases": [
+        "Bitstream vera",
+        "Bitstream Vera"
+    ]
+}

var/licenses/GPL-2.0-or-later.json

@@ -52,6 +52,7 @@
         "scancode:gpl-2.0-plus",
         "GNU General Public License v2 or later (GPLv2+)",
         "GPLv2.0+",
-        "GPL version 2 or any later version"
+        "GPL version 2 or any later version",
+        "GPL (>= 2)"
     ]
 }

var/licenses/MPL-2.0.json

@@ -26,6 +26,7 @@
    "MPL-2",
    "scancode:mpl-2.0",
    "osi:MPL-2.0",
-   "MPLv2"
+      "MPLv2",
+      "MPL-2.0+"
   ]
 }