From 0d6b75537bd6b63b0e142830fd74e3f256ff2d28 Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Mon, 10 Dec 2018 12:23:11 +0100 Subject: [PATCH] chg: [licensing] 2-clause BSD added in addition to CC0 To remove ambiguity of licensing and allowing users to select the license they would like to use CC0 or 2-clause BSD. Fix #126 --- LICENSE.md | 36 ++++++++++++++++++++++++++++++++++++ README.md | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..6d55c94 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,36 @@ +The MISP taxonomies (JSON files) are dual-licensed under: + +- [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode) (CC0 1.0) - Public Domain Dedication. + +or + +~~~~ + Copyright (c) 2015-2018 Alexandre Dulaunoy - a@foo.be + Copyright (c) 2015-2018 CIRCL - Computer Incident Response Center Luxembourg + Copyright (c) 2015-2018 Andras Iklody + Copyright (c) 2015-2018 Raphael Vinot + Copyright (c) 2016-2018 Various contributors to MISP Project + + 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. + + 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 HOLDER 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. +~~~~~ + +If a specific author of a taxonomy wants to license it under a different license, a pull request can be requested. + diff --git a/README.md b/README.md index 5a786d1..953efe3 100644 --- a/README.md +++ b/README.md @@ -236,4 +236,39 @@ Once you are happy with your file go to MISP Web GUI taxonomies/index and update # License -The MISP taxonomies are licensed under [CC0 1.0 Universal (CC0 1.0)](https://creativecommons.org/publicdomain/zero/1.0/) - Public Domain Dedication. If a specific author of a taxonomy wants to license it under a different license, a pull request can be requested. +The MISP taxonomies (JSON files) are dual-licensed under: + +- [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode) (CC0 1.0) - Public Domain Dedication. + +or + +~~~~ + Copyright (c) 2015-2018 Alexandre Dulaunoy - a@foo.be + Copyright (c) 2015-2018 CIRCL - Computer Incident Response Center Luxembourg + Copyright (c) 2015-2018 Andras Iklody + Copyright (c) 2015-2018 Raphael Vinot + Copyright (c) 2016-2018 Various contributors to MISP Project + + 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. + + 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 HOLDER 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. +~~~~~ + +If a specific author of a taxonomy wants to license it under a different license, a pull request can be requested. +