From 8633463353b33c6ed1fd5b5460c9dc431ac17886 Mon Sep 17 00:00:00 2001 From: Josh Habdas Date: Thu, 14 Feb 2019 17:35:03 +0800 Subject: [PATCH 1/8] Add Zero Clause BSD license close #642 --- _licenses/0bsd.txt | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 _licenses/0bsd.txt diff --git a/_licenses/0bsd.txt b/_licenses/0bsd.txt new file mode 100644 index 0000000..2278614 --- /dev/null +++ b/_licenses/0bsd.txt @@ -0,0 +1,41 @@ +--- +title: Zero Clause BSD +spdx-id: 0BSD + +description: The Zero Clause BSD license goes further than the BSD 2-Clause license to allow you unlimited freedom with the software _without_ the requirements to include the copyright notice, license text, or disclaimer in either source or binary forms. + +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] [email] with the name and contact email address of each copyright holder. You may take the additional step of removing the copyright notice, license text, or disclaimer. + +using: + - Toybox: https://github.com/landley/toybox/blob/master/LICENSE + - smoltcp: https://github.com/m-labs/smoltcp/blob/master/LICENSE-0BSD.txt + - PickMeUp: https://github.com/nazar-pc/PickMeUp/blob/master/copying.md + +permissions: + - commercial-use + - modifications + - distribution + - private-use + +conditions: [] + +limitations: + - liability + - warranty + +--- + +Zero Clause BSD + +Copyright (C) [year] by [fullname] <[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 baf09f6bd909685e2f9a8aaa2af3f5b6d028854e Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 15 Feb 2019 12:27:51 -0800 Subject: [PATCH 2/8] (c) notice and instruction tweaks Make consistent with BSD-2- and 3-Clause. Don't encourage people to add email without thinking. Someone choosing the license shouldn't remove the license text or disclaimer, or they won't be offering the license at all or in a way that makes sense. :) --- _licenses/0bsd.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/0bsd.txt b/_licenses/0bsd.txt index 2278614..ff018bf 100644 --- a/_licenses/0bsd.txt +++ b/_licenses/0bsd.txt @@ -4,7 +4,7 @@ spdx-id: 0BSD description: The Zero Clause BSD license goes further than the BSD 2-Clause license to allow you unlimited freedom with the software _without_ the requirements to include the copyright notice, license text, or disclaimer in either source or binary forms. -how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] [email] with the name and contact email address of each copyright holder. You may take the additional step of removing the copyright notice, license text, or disclaimer. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. You may take the additional step of removing the copyright notice. using: - Toybox: https://github.com/landley/toybox/blob/master/LICENSE @@ -27,7 +27,7 @@ limitations: Zero Clause BSD -Copyright (C) [year] by [fullname] <[email]> +Copyright (c) [year] [fullname] Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. From f8df70d9fa691ebce8d944b9153ab4c71ff95fbf Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 15 Feb 2019 13:27:38 -0800 Subject: [PATCH 3/8] use spdx name in title --- _licenses/0bsd.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/0bsd.txt b/_licenses/0bsd.txt index ff018bf..17baeae 100644 --- a/_licenses/0bsd.txt +++ b/_licenses/0bsd.txt @@ -1,8 +1,8 @@ --- -title: Zero Clause BSD +title: BSD Zero Clause License spdx-id: 0BSD -description: The Zero Clause BSD license goes further than the BSD 2-Clause license to allow you unlimited freedom with the software _without_ the requirements to include the copyright notice, license text, or disclaimer in either source or binary forms. +description: The BSD Zero Clause license goes further than the BSD 2-Clause license to allow you unlimited freedom with the software _without_ the requirements to include the copyright notice, license text, or disclaimer in either source or binary forms. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. You may take the additional step of removing the copyright notice. @@ -25,7 +25,7 @@ limitations: --- -Zero Clause BSD +BSD Zero Clause License Copyright (c) [year] [fullname] From bab9f14fa93405fead73948946c8ca9c2b62c1c5 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 15 Feb 2019 13:32:29 -0800 Subject: [PATCH 4/8] rm license title in text not present in SPDX version --- _licenses/0bsd.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/_licenses/0bsd.txt b/_licenses/0bsd.txt index 17baeae..72d2348 100644 --- a/_licenses/0bsd.txt +++ b/_licenses/0bsd.txt @@ -25,8 +25,6 @@ limitations: --- -BSD Zero Clause License - Copyright (c) [year] [fullname] Permission to use, copy, modify, and/or distribute this software for any From 2d8591605cfff007f906709b414c899843cc2eb3 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 15 Feb 2019 13:58:25 -0800 Subject: [PATCH 5/8] don't test edit link links --- Rakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Rakefile b/Rakefile index 01d885c..45c207c 100644 --- a/Rakefile +++ b/Rakefile @@ -17,6 +17,7 @@ task :test do enforce_https: true, validation: { ignore_script_embeds: true }, url_swap: { %r{https://choosealicense.com} => '' }, + url_ignore: [%r{https://github.com/github/choosealicense.com/edit/gh-pages/_licenses/}], hydra: { max_concurrency: 10 }, check_img_http: true).run end From 370fd1451769f53a4d7cb85053c63558d3fd6ef7 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 15 Feb 2019 14:02:02 -0800 Subject: [PATCH 6/8] use same url when linking to same content --- about.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about.md b/about.md index f782480..779115e 100644 --- a/about.md +++ b/about.md @@ -19,7 +19,7 @@ See our [appendix](/appendix/) for a table of all of the licenses cataloged in t {: .bullets} * Open Source Initiative's FAQ on [Which Open Source license should I choose to release my software under?](https://opensource.org/faq#which-license) -* Free Software Foundation's [advice on how to choose a license](https://www.gnu.org/licenses/license-recommendations.en.html) +* Free Software Foundation's [advice on how to choose a license](https://www.gnu.org/licenses/license-recommendations.html) * [The Legal Side of Open Source](https://opensource.guide/legal/), an Open Source Guide covering licensing and related issues ## Help us improve it From 30256010e8b82c358b599f83d9449eab968dd8e2 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 15 Feb 2019 14:52:33 -0800 Subject: [PATCH 7/8] sort fields --- _licenses/0bsd.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/0bsd.txt b/_licenses/0bsd.txt index 72d2348..c1f1359 100644 --- a/_licenses/0bsd.txt +++ b/_licenses/0bsd.txt @@ -7,14 +7,14 @@ description: The BSD Zero Clause license goes further than the BSD 2-Clause lice how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. You may take the additional step of removing the copyright notice. using: - - Toybox: https://github.com/landley/toybox/blob/master/LICENSE - - smoltcp: https://github.com/m-labs/smoltcp/blob/master/LICENSE-0BSD.txt - PickMeUp: https://github.com/nazar-pc/PickMeUp/blob/master/copying.md + - smoltcp: https://github.com/m-labs/smoltcp/blob/master/LICENSE-0BSD.txt + - Toybox: https://github.com/landley/toybox/blob/master/LICENSE permissions: - commercial-use - - modifications - distribution + - modifications - private-use conditions: [] From 791e3fe05accab0e941a9086c8086c7f42152cc7 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 15 Feb 2019 15:05:40 -0800 Subject: [PATCH 8/8] no md in license fields --- _licenses/0bsd.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/0bsd.txt b/_licenses/0bsd.txt index c1f1359..d778c9a 100644 --- a/_licenses/0bsd.txt +++ b/_licenses/0bsd.txt @@ -2,7 +2,7 @@ title: BSD Zero Clause License spdx-id: 0BSD -description: The BSD Zero Clause license goes further than the BSD 2-Clause license to allow you unlimited freedom with the software _without_ the requirements to include the copyright notice, license text, or disclaimer in either source or binary forms. +description: The BSD Zero Clause license goes further than the BSD 2-Clause license to allow you unlimited freedom with the software without requirements to include the copyright notice, license text, or disclaimer in either source or binary forms. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. You may take the additional step of removing the copyright notice.