From 3447328aef730359c98cc871c3ac20abeae8b110 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Tue, 14 Sep 2021 17:31:19 -0700 Subject: [PATCH 1/5] Add the 0BSD license Signed-off-by: Gary O'Neall --- licenses/manual/0BSD.json | 18 ++++++++++++++++++ licenses/spdx/importedSpdxFiles.json | 11 +++++++++++ texts/plain/0BSD | 5 +++++ 3 files changed, 34 insertions(+) create mode 100644 licenses/manual/0BSD.json create mode 100644 licenses/spdx/importedSpdxFiles.json create mode 100644 texts/plain/0BSD diff --git a/licenses/manual/0BSD.json b/licenses/manual/0BSD.json new file mode 100644 index 0000000..351de51 --- /dev/null +++ b/licenses/manual/0BSD.json @@ -0,0 +1,18 @@ +{ + "id": "0BSD", + "identifiers": [], + "keywords": [ + "osi-approved" + ], + "links": [ + { + "note": "OSI Page", + "url": "https://opensource.org/licenses/0BSD" + }, + { + "note": "SPDX page", + "url": "https://spdx.org/licenses/0BSD" + } + ], + "text": [] +} \ No newline at end of file diff --git a/licenses/spdx/importedSpdxFiles.json b/licenses/spdx/importedSpdxFiles.json new file mode 100644 index 0000000..b8e773f --- /dev/null +++ b/licenses/spdx/importedSpdxFiles.json @@ -0,0 +1,11 @@ +[ + { + "id": "0BSD", + "identifiers": [ + { + "identifier": "0BSD", + "scheme": "SPDX" + } + ] + } +] \ No newline at end of file diff --git a/texts/plain/0BSD b/texts/plain/0BSD new file mode 100644 index 0000000..0b8ae76 --- /dev/null +++ b/texts/plain/0BSD @@ -0,0 +1,5 @@ +Copyright (C) YEAR by AUTHOR EMAIL + +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. From c5f1a164c6764337ed745362324130304e0d2cfb Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Thu, 30 Sep 2021 11:28:27 -0700 Subject: [PATCH 2/5] Update 0BSD license text to match the OSI website exactly Signed-off-by: Gary O'Neall --- texts/plain/0BSD | 2 -- 1 file changed, 2 deletions(-) diff --git a/texts/plain/0BSD b/texts/plain/0BSD index 0b8ae76..14fb13d 100644 --- a/texts/plain/0BSD +++ b/texts/plain/0BSD @@ -1,5 +1,3 @@ -Copyright (C) YEAR by AUTHOR EMAIL - Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. From 59e1bb8e5fc119e1c69749c109c947f9c8a3880a Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Thu, 30 Sep 2021 13:53:26 -0700 Subject: [PATCH 3/5] Add required name Signed-off-by: Gary O'Neall --- licenses/manual/0BSD.json | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/licenses/manual/0BSD.json b/licenses/manual/0BSD.json index 351de51..19fcc4a 100644 --- a/licenses/manual/0BSD.json +++ b/licenses/manual/0BSD.json @@ -1,18 +1,21 @@ -{ - "id": "0BSD", - "identifiers": [], - "keywords": [ - "osi-approved" - ], - "links": [ - { - "note": "OSI Page", - "url": "https://opensource.org/licenses/0BSD" - }, - { - "note": "SPDX page", - "url": "https://spdx.org/licenses/0BSD" - } - ], - "text": [] -} \ No newline at end of file +[ + { + "id": "0BSD", + "identifiers": [], + "keywords": [ + "osi-approved" + ], + "links": [ + { + "note": "OSI Page", + "url": "https://opensource.org/licenses/0BSD" + }, + { + "note": "SPDX page", + "url": "https://spdx.org/licenses/0BSD" + } + ], + "name": "BSD Zero Clause License", + "text": [] + } +] \ No newline at end of file From 575dda24bcd863bbad99f6879c3b89e8f5cee2f7 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Thu, 30 Sep 2021 13:56:16 -0700 Subject: [PATCH 4/5] Update license name to the OSI license name Signed-off-by: Gary O'Neall --- licenses/manual/0BSD.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/manual/0BSD.json b/licenses/manual/0BSD.json index 19fcc4a..3dcda69 100644 --- a/licenses/manual/0BSD.json +++ b/licenses/manual/0BSD.json @@ -15,7 +15,7 @@ "url": "https://spdx.org/licenses/0BSD" } ], - "name": "BSD Zero Clause License", + "name": "Zero-Clause BSD", "text": [] } ] \ No newline at end of file From 9d980d389e6dd5cde0b08e533a0dceb6ae9d10c4 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Thu, 30 Sep 2021 15:18:10 -0700 Subject: [PATCH 5/5] Add text link pointing to the OSI website Signed-off-by: Gary O'Neall --- licenses/manual/0BSD.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/licenses/manual/0BSD.json b/licenses/manual/0BSD.json index 3dcda69..4b993d0 100644 --- a/licenses/manual/0BSD.json +++ b/licenses/manual/0BSD.json @@ -16,6 +16,12 @@ } ], "name": "Zero-Clause BSD", - "text": [] + "text": [ + { + "media_type": "text/html", + "title": "HTML", + "url": "https://opensource.org/licenses/0BSD" + } + ] } ] \ No newline at end of file