Merge branch 'master' into CAL-1.0

CONTRIBUTING.md

@@ -17,6 +17,6 @@ Compiling the master list
 
 Run the `compile.py` script, which will import all the JSON, merge documents
 on the `id` key (merging lists, and only allowing each non-list key to be set
-once), and print the resuslting data to stdout.
+once), and print the resulting data to stdout.
 
 Please run the `compile.py` script before sending in any patches.

licenses/autogenerated/EUPL-1.1.json

@@ -9,6 +9,8 @@
         ],
         "name": "European Union Public License, Version 1.1",
         "keywords": [
+            "discouraged",
+            "obsolete",
             "osi-approved"
         ],
         "text": [

licenses/manual/BSD-1-Clause.json

@@ -0,0 +1,27 @@
+[
+    {
+        "id": "BSD-1-Clause",
+        "identifiers": [],
+        "keywords": [
+            "osi-approved"
+        ],
+        "links": [
+            {
+                "note": "OSI Page",
+                "url": "https://opensource.org/licenses/BSD-1-Clause"
+            },
+            {
+                "note": "SPDX page",
+                "url": "https://spdx.org/licenses/BSD-1-Clause"
+            }
+        ],
+        "name": "1-clause BSD License",
+        "text": [
+            {
+                "media_type": "text/html",
+                "title": "HTML",
+                "url": "https://opensource.org/licenses/BSD-1-Clause"
+            }
+        ]
+    }
+]

licenses/manual/BSD-3-Clause-LBNL.json

@@ -0,0 +1,27 @@
+[
+    {
+        "id": "BSD-3-Clause-LBNL",
+        "identifiers": [],
+        "keywords": [
+            "osi-approved"
+        ],
+        "links": [
+            {
+                "note": "OSI Page",
+                "url": "https://opensource.org/licenses/BSD-3-Clause-LBNL"
+            },
+            {
+                "note": "SPDX page",
+                "url": "https://spdx.org/licenses/BSD-3-Clause-LBNL"
+            }
+        ],
+        "name": "Lawrence Berkeley National Labs BSD variant license",
+        "text": [
+            {
+                "media_type": "text/html",
+                "title": "HTML",
+                "url": "https://opensource.org/licenses/BSD-3-Clause-LBNL"
+            }
+        ]
+    }
+]

licenses/manual/EPL-2.0.json

@@ -0,0 +1,27 @@
+[
+    {
+        "id": "EPL-2.0",
+        "identifiers": [],
+        "keywords": [
+            "osi-approved"
+        ],
+        "links": [
+            {
+                "note": "OSI Page",
+                "url": "https://opensource.org/licenses/EPL-2.0"
+            },
+            {
+                "note": "SPDX page",
+                "url": "https://spdx.org/licenses/EPL-2.0"
+            }
+        ],
+        "name": "Eclipse Public License Version 2.0",
+        "text": [
+            {
+                "media_type": "text/html",
+                "title": "HTML",
+                "url": "https://www.eclipse.org/legal/epl-2.0"
+            }
+        ]
+    }
+]

licenses/manual/MIT-0.json

@@ -0,0 +1,27 @@
+[
+    {
+        "id": "MIT-0",
+        "identifiers": [],
+        "keywords": [
+            "osi-approved"
+        ],
+        "links": [
+            {
+                "note": "OSI Page",
+                "url": "https://opensource.org/licenses/MIT-0"
+            },
+            {
+                "note": "SPDX page",
+                "url": "https://spdx.org/licenses/MIT-0"
+            }
+        ],
+        "name": "MIT No Attribution",
+        "text": [
+            {
+                "media_type": "text/html",
+                "title": "HTML",
+                "url": "https://github.com/aws/mit-0"
+            }
+        ]
+    }
+]

licenses/manual/OLDAP-2.8.json

@@ -0,0 +1,27 @@
+[
+    {
+        "id": "OLDAP-2.8",
+        "identifiers": [],
+        "keywords": [
+            "osi-approved"
+        ],
+        "links": [
+            {
+                "note": "OSI Page",
+                "url": "https://opensource.org/licenses/OLDAP-2.8"
+            },
+            {
+                "note": "SPDX page",
+                "url": "https://spdx.org/licenses/OLDAP-2.8"
+            }
+        ],
+        "name": "OpenLDAP Public License Version 2.8",
+        "text": [
+            {
+                "media_type": "text/html",
+                "title": "HTML",
+                "url": "http://www.openldap.org/software/release/license.html"
+            }
+        ]
+    }
+]

licenses/manual/PHP-3.01.json

@@ -0,0 +1,27 @@
+[
+    {
+        "id": "PHP-3.01",
+        "identifiers": [],
+        "keywords": [
+            "osi-approved"
+        ],
+        "links": [
+            {
+                "note": "OSI Page",
+                "url": "https://opensource.org/licenses/PHP-3.01"
+            },
+            {
+                "note": "SPDX page",
+                "url": "https://spdx.org/licenses/PHP-3.01"
+            }
+        ],
+        "name": "PHP License 3.01",
+        "text": [
+            {
+                "media_type": "text/html",
+                "title": "HTML",
+                "url": "https://opensource.org/licenses/PHP-3.01"
+            }
+        ]
+    }
+]

licenses/autogenerated/miros.json → licenses/manual/eupl.json

@@ -1,21 +1,21 @@
 [
     {
-        "id": "MirOS",
+        "id": "EUPL-1.2",
         "links": [
             {
                 "note": "OSI Page",
-                "url": "https://opensource.org/licenses/MirOS"
+                "url": "https://opensource.org/licenses/EUPL-1.2"
             }
         ],
-        "name": "The MirOS Licence (MirOS)",
+        "name": "European Union Public License, Version 1.2",
         "keywords": [
             "osi-approved"
         ],
         "text": [
             {
                 "media_type": "text/html",
                 "title": "HTML",
-                "url": "https://opensource.org/licenses/MirOS"
+                "url": "https://opensource.org/licenses/EUPL-1.2"
             }
         ]
     }

licenses/manual/miros.json

@@ -0,0 +1,42 @@
+[
+    {
+        "id": "MirOS",
+        "identifiers": [
+            {
+                "identifier": "MirBSD",
+                "scheme": "upstream short name"
+            },
+            {
+                "identifier": "The MirOS Licence",
+                "scheme": "upstream full name"
+            }
+        ],
+        "links": [
+            {
+                "note": "OSI Page",
+                "url": "https://opensource.org/licenses/MirOS"
+            }
+        ],
+        "name": "The MirOS Licence (MirBSD)",
+        "keywords": [
+            "osi-approved"
+        ],
+        "text": [
+            {
+                "media_type": "text/plain; charset=UTF-8",
+                "title": "Plain Text (UTF-8)",
+                "url": "http://www.mirbsd.org/MirOS-Licence"
+            },
+            {
+                "media_type": "text/plain; charset=ISO_646.irv:1991",
+                "title": "Plain Text (ASCII)",
+                "url": "http://www.mirbsd.org/MirOS-Licence.asc"
+            },
+            {
+                "media_type": "text/html",
+                "title": "HTML",
+                "url": "http://www.mirbsd.org/MirOS-Licence.htm"
+            }
+        ]
+    }
+]

licenses/spdx/importedSpdxFiles.json

@@ -25,5 +25,59 @@
                 "scheme": "SPDX"
             }
         ]
+    },
+    {
+        "id": "BSD-3-Clause-LBNL",
+        "identifiers": [
+            {
+                "identifier": "BSD-3-Clause-LBNL",
+                "scheme": "SPDX"
+            }
+        ]
+    },
+    {
+        "id": "EPL-2.0",
+        "identifiers": [
+            {
+                "identifier": "EPL-2.0",
+                "scheme": "SPDX"
+            }
+        ]
+    },
+    {
+        "id": "OLDAP-2.8",
+        "identifiers": [
+            {
+                "identifier": "OLDAP-2.8",
+                "scheme": "SPDX"
+            }
+        ]
+    },
+    {
+        "id": "PHP-3.01",
+        "identifiers": [
+            {
+                "identifier": "PHP-3.01",
+                "scheme": "SPDX"
+            }
+        ]
+    },
+    {
+        "id": "MIT-0",
+        "identifiers": [
+            {
+                "identifier": "MIT-0",
+                 "scheme": "SPDX"
+            }
+        ]
+    },
+    {
+        "id": "BSD-1-Clause",
+        "identifiers": [
+            {
+                "identifier": "BSD-1-Clause",
+                "scheme": "SPDX"
+            }
+        ]
     }
 ]

licenses/tldr/tldr.json

@@ -34,5 +34,14 @@
                 "url": "https://tldrlegal.com/license/mit-license"
             }
         ]
+    },
+    {
+        "id": "MirOS",
+        "links": [
+            {
+                "note": "tl;dr legal",
+                "url": "https://tldrlegal.com/license/miros-license-%28miros%29"
+            }
+        ]
     }
 ]

texts/plain/BSD-1-Clause

@@ -0,0 +1,7 @@
+Copyright (c) [Year]
+[Name of Organization] [All rights reserved].
+
+    1. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+THIS SOFTWARE IS PROVIDED BY [Name of Organization] “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 [Name of Organisation] 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.

texts/plain/BSD-3-Clause-LBNL

@@ -0,0 +1,12 @@
+Copyright (c) 2003, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+(1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+(2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+(3) Neither the name of the University of California, Lawrence Berkeley National Laboratory, U.S. Dept. of Energy nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER 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.
+
+You are under no obligation whatsoever to provide any bug fixes, patches, or upgrades to the features, functionality or performance of the source code ("Enhancements") to anyone; however, if you choose to make your Enhancements available either publicly, or directly to Lawrence Berkeley National Laboratory, without imposing a separate written license agreement for such Enhancements, then you hereby grant the following license: a non-exclusive, royalty-free perpetual license to install, use, modify, prepare derivative works, incorporate into other computer software, distribute, and sublicense such Enhancements or derivative works thereof, in binary and source code form.