From c9cacc7353450b99b841f56f4ad0dcd5132d081a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81rni=20Dagur?= Date: Sat, 18 Aug 2018 15:33:59 +0000 Subject: [PATCH 1/9] Add "BSD 2-Clause + Patent" license --- _licenses/bsd-2-clause-patent.txt | 69 +++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 _licenses/bsd-2-clause-patent.txt diff --git a/_licenses/bsd-2-clause-patent.txt b/_licenses/bsd-2-clause-patent.txt new file mode 100644 index 0000000..746dc05 --- /dev/null +++ b/_licenses/bsd-2-clause-patent.txt @@ -0,0 +1,69 @@ +--- +title: BSD 2-Clause + Patent +spdx-id: BSD-2-Clause-Patent +source: https://opensource.org/licenses/BSDplusPatent + +description: This license is designed to provide: a) a simple permissive license; b) that is compatible with the GNU GPL-2.0; and c) which also has an express patent grant included. + +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. + +permissions: + - commercial-use + - modifications + - distribution + - patent-use + - private-use + +conditions: + - include-copyright + +limitations: + - liability + - warranty + +-- + +BSD 2-Clause + Patent + +Copyright (c) [year], [fullname] + +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. + +Subject to the terms and conditions of this license, each copyright holder and +contributor hereby grants to those receiving rights under this license a +perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except for failure to satisfy the conditions of this license) patent license to +make, have made, use, offer to sell, sell, import, and otherwise transfer this +software, where such license applies only to those patent claims, already +acquired or hereafter acquired, licensable by such copyright holder or +contributor that are necessarily infringed by: + +* (a) their Contribution(s) (the licensed copyrights of copyright holders and +non-copyrightable additions of contributors, in source or binary form) alone; or + +* (b) combination of their Contribution(s) with the work of authorship to which +such Contribution(s) was added by such copyright holder or contributor, if, at +the time the Contribution is added, such addition causes such combination to be +necessarily infringed. The patent license shall not apply to any other +combinations which include the Contribution. Except as expressly stated above, +no rights or licenses from any copyright holder or contributor is granted under +this license, whether expressly, by implication, estoppel or otherwise. + +DISCLAIMER 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 HOLDERS 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. From b4628ca48e01fe75dd6ab473cebc92e717804a6d Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 18 Aug 2018 10:43:30 -0700 Subject: [PATCH 2/9] quote yaml value that includes : --- _licenses/bsd-2-clause-patent.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/bsd-2-clause-patent.txt b/_licenses/bsd-2-clause-patent.txt index 746dc05..c664bbd 100644 --- a/_licenses/bsd-2-clause-patent.txt +++ b/_licenses/bsd-2-clause-patent.txt @@ -3,7 +3,7 @@ title: BSD 2-Clause + Patent spdx-id: BSD-2-Clause-Patent source: https://opensource.org/licenses/BSDplusPatent -description: This license is designed to provide: a) a simple permissive license; b) that is compatible with the GNU GPL-2.0; and c) which also has an express patent grant included. +description: "This license is designed to provide: a) a simple permissive license; b) that is compatible with the GNU GPL-2.0; and c) which also has an express patent grant included." 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. From fa25e38f0cb5c51fec63b2d7d2c779fb05d58ea6 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 18 Aug 2018 11:17:42 -0700 Subject: [PATCH 3/9] yaml, title match, take text from https://raw.githubusercontent.com/spdx/license-list-data/master/text/BSD-2-Clause-Patent.txt --- _licenses/bsd-2-clause-patent.txt | 69 ++++++++++++++++--------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/_licenses/bsd-2-clause-patent.txt b/_licenses/bsd-2-clause-patent.txt index c664bbd..c1dd1bb 100644 --- a/_licenses/bsd-2-clause-patent.txt +++ b/_licenses/bsd-2-clause-patent.txt @@ -1,5 +1,5 @@ --- -title: BSD 2-Clause + Patent +title: BSD-2-Clause Plus Patent License spdx-id: BSD-2-Clause-Patent source: https://opensource.org/licenses/BSDplusPatent @@ -21,49 +21,52 @@ limitations: - liability - warranty --- +--- -BSD 2-Clause + Patent - -Copyright (c) [year], [fullname] +Copyright (c) [year] [fullname] 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. +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. -Subject to the terms and conditions of this license, each copyright holder and -contributor hereby grants to those receiving rights under this license a -perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except for failure to satisfy the conditions of this license) patent license to -make, have made, use, offer to sell, sell, import, and otherwise transfer this -software, where such license applies only to those patent claims, already -acquired or hereafter acquired, licensable by such copyright holder or -contributor that are necessarily infringed by: +Subject to the terms and conditions of this license, each copyright holder +and contributor hereby grants to those receiving rights under this license +a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except for failure to satisfy the conditions of this license) patent license +to make, have made, use, offer to sell, sell, import, and otherwise transfer +this software, where such license applies only to those patent claims, already +acquired or hereafter acquired, licensable by such copyright holder or contributor +that are necessarily infringed by: -* (a) their Contribution(s) (the licensed copyrights of copyright holders and -non-copyrightable additions of contributors, in source or binary form) alone; or +(a) their Contribution(s) (the licensed copyrights of copyright holders and +non-copyrightable additions of contributors, in source or binary form) alone; +or -* (b) combination of their Contribution(s) with the work of authorship to which -such Contribution(s) was added by such copyright holder or contributor, if, at -the time the Contribution is added, such addition causes such combination to be -necessarily infringed. The patent license shall not apply to any other -combinations which include the Contribution. Except as expressly stated above, -no rights or licenses from any copyright holder or contributor is granted under -this license, whether expressly, by implication, estoppel or otherwise. +(b) combination of their Contribution(s) with the work of authorship to which +such Contribution(s) was added by such copyright holder or contributor, if, +at the time the Contribution is added, such addition causes such combination +to be necessarily infringed. The patent license shall not apply to any other +combinations which include the Contribution. -DISCLAIMER 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 +Except as expressly stated above, no rights or licenses from any copyright +holder or contributor is granted under this license, whether expressly, by +implication, estoppel or otherwise. + +DISCLAIMER + +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 HOLDERS 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. +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. From 6c0e5680efdd9e98712803a927c4e860649710e1 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 18 Aug 2018 11:23:42 -0700 Subject: [PATCH 4/9] wrap at 78 chars --- _licenses/bsd-2-clause-patent.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/_licenses/bsd-2-clause-patent.txt b/_licenses/bsd-2-clause-patent.txt index c1dd1bb..2547daf 100644 --- a/_licenses/bsd-2-clause-patent.txt +++ b/_licenses/bsd-2-clause-patent.txt @@ -25,8 +25,8 @@ limitations: Copyright (c) [year] [fullname] -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: +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. @@ -41,8 +41,8 @@ a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except for failure to satisfy the conditions of this license) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer this software, where such license applies only to those patent claims, already -acquired or hereafter acquired, licensable by such copyright holder or contributor -that are necessarily infringed by: +acquired or hereafter acquired, licensable by such copyright holder or +contributor that are necessarily infringed by: (a) their Contribution(s) (the licensed copyrights of copyright holders and non-copyrightable additions of contributors, in source or binary form) alone; @@ -62,11 +62,11 @@ DISCLAIMER 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 HOLDERS OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS 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. +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. From b2ebfffd4959951a8c32d33b2964116f326c1341 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 12 Aug 2021 10:07:02 -0700 Subject: [PATCH 5/9] Add example use suggested at https://github.com/github/choosealicense.com/pull/603#issuecomment-895709400 --- _licenses/bsd-2-clause-patent.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_licenses/bsd-2-clause-patent.txt b/_licenses/bsd-2-clause-patent.txt index 2547daf..acab1eb 100644 --- a/_licenses/bsd-2-clause-patent.txt +++ b/_licenses/bsd-2-clause-patent.txt @@ -7,6 +7,9 @@ description: "This license is designed to provide: a) a simple permissive licens 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. +using: + EDK II: https://github.com/tianocore/edk2/blob/master/License.txt + permissions: - commercial-use - modifications From 47980a78dd326e1742613d635eaaefa7bf3eb745 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 8 Jul 2023 12:58:08 -0700 Subject: [PATCH 6/9] rm source #601 --- _licenses/bsd-2-clause-patent.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/_licenses/bsd-2-clause-patent.txt b/_licenses/bsd-2-clause-patent.txt index acab1eb..2be2ae7 100644 --- a/_licenses/bsd-2-clause-patent.txt +++ b/_licenses/bsd-2-clause-patent.txt @@ -1,7 +1,6 @@ --- title: BSD-2-Clause Plus Patent License spdx-id: BSD-2-Clause-Patent -source: https://opensource.org/licenses/BSDplusPatent description: "This license is designed to provide: a) a simple permissive license; b) that is compatible with the GNU GPL-2.0; and c) which also has an express patent grant included." From 62304656a9ebb5aad1b2eca0cca468d337b58397 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 19 Feb 2024 16:16:46 -0800 Subject: [PATCH 7/9] add example --- _licenses/bsd-2-clause-patent.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/_licenses/bsd-2-clause-patent.txt b/_licenses/bsd-2-clause-patent.txt index 2be2ae7..9471198 100644 --- a/_licenses/bsd-2-clause-patent.txt +++ b/_licenses/bsd-2-clause-patent.txt @@ -8,6 +8,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: EDK II: https://github.com/tianocore/edk2/blob/master/License.txt + Manubot: https://github.com/manubot/manubot/blob/main/LICENSE.md permissions: - commercial-use From be05abb7f2155aacfc81583378dec24e29eb7803 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 19 Feb 2024 16:32:50 -0800 Subject: [PATCH 8/9] replace example with a detectable one --- _licenses/bsd-2-clause-patent.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/bsd-2-clause-patent.txt b/_licenses/bsd-2-clause-patent.txt index 9471198..0c94146 100644 --- a/_licenses/bsd-2-clause-patent.txt +++ b/_licenses/bsd-2-clause-patent.txt @@ -7,8 +7,8 @@ description: "This license is designed to provide: a) a simple permissive licens 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. using: - EDK II: https://github.com/tianocore/edk2/blob/master/License.txt Manubot: https://github.com/manubot/manubot/blob/main/LICENSE.md + Preprint Similarity Search: https://github.com/greenelab/preprint-similarity-search/blob/master/LICENSE.md permissions: - commercial-use From 87efde5afdf9ec15da25c1cb79f770564674c689 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 19 Feb 2024 16:42:52 -0800 Subject: [PATCH 9/9] third example --- _licenses/bsd-2-clause-patent.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/_licenses/bsd-2-clause-patent.txt b/_licenses/bsd-2-clause-patent.txt index 0c94146..ac49dd5 100644 --- a/_licenses/bsd-2-clause-patent.txt +++ b/_licenses/bsd-2-clause-patent.txt @@ -8,6 +8,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: Manubot: https://github.com/manubot/manubot/blob/main/LICENSE.md + obonet: https://github.com/dhimmel/obonet/blob/main/LICENSE.md Preprint Similarity Search: https://github.com/greenelab/preprint-similarity-search/blob/master/LICENSE.md permissions: