From 258507870f123e58cd60810446458ee5e3de1a4e Mon Sep 17 00:00:00 2001 From: Ryan Butler Date: Thu, 26 Sep 2024 02:40:50 -0400 Subject: [PATCH] Relicense to MIT-0/Apache-2.0 --- Cargo.toml | 2 +- LICENSE-BSD | 47 ----------------------------------------------- LICENSE-MIT | 19 ------------------- LICENSE-MIT-0 | 14 ++++++++++++++ README.md | 5 ++--- 5 files changed, 17 insertions(+), 70 deletions(-) delete mode 100644 LICENSE-BSD delete mode 100644 LICENSE-MIT create mode 100644 LICENSE-MIT-0 diff --git a/Cargo.toml b/Cargo.toml index 820d718..73f5e59 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ members = [ # These settings will apply to all members of the workspace that opt in to them [workspace.package] version = "0.0.0" -license = "MIT OR BSD-2-Clause-Patent OR Apache-2.0" +license = "MIT-0 OR OR Apache-2.0" repository = "https://github.com/NexusSocial/skilltree" edition = "2021" rust-version = "1.73.0" diff --git a/LICENSE-BSD b/LICENSE-BSD deleted file mode 100644 index 40ffad5..0000000 --- a/LICENSE-BSD +++ /dev/null @@ -1,47 +0,0 @@ -BSD 2-Clause Plus Patent License - -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. - diff --git a/LICENSE-MIT b/LICENSE-MIT deleted file mode 100644 index 9cf1062..0000000 --- a/LICENSE-MIT +++ /dev/null @@ -1,19 +0,0 @@ -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/LICENSE-MIT-0 b/LICENSE-MIT-0 new file mode 100644 index 0000000..fc06cc4 --- /dev/null +++ b/LICENSE-MIT-0 @@ -0,0 +1,14 @@ +MIT No Attribution + +Permission is hereby granted, free of charge, to any person obtaining a copy of this +software and associated documentation files (the "Software"), to deal in the Software +without restriction, including without limitation the rights to use, copy, modify, +merge, publish, distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 989544c..a74e7d6 100644 --- a/README.md +++ b/README.md @@ -131,12 +131,11 @@ See [CONTRIBUTING.md](CONTRIBUTING.md). ## License -Unless otherwise specified, all code in this repository is triple-licensed under +Unless otherwise specified, all code in this repository is dual-licensed under either: -- MIT License ([LICENSE-MIT](LICENSE-MIT)) +- MIT-0 License ([LICENSE-MIT-0](LICENSE-MIT-0)) - Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE)) -- BSD 2-Clause Plus Patent License ([LICENSE-BSD](LICENSE-BSD)) at your option. This means you can select the license you prefer!