From cb3d2199c2e0dc8e69a3f0e230c6ca4ec48ba66d Mon Sep 17 00:00:00 2001 From: Jens Getreu Date: Sat, 23 Sep 2017 11:58:16 +0300 Subject: [PATCH] dual license stringsext: Apache 2.0 or MIT --- Cargo.lock | 2 +- Cargo.toml | 2 +- LICENSE => LICENSE-APACHE | 0 LICENSE-MIT | 25 +++++++++++++++++++++++++ LICENSE.md | 15 +++++++++++++++ doc/source/index.rst | 6 +----- doc/source/stringsext--man.rst | 32 ++++++++++++++++++++------------ 7 files changed, 63 insertions(+), 19 deletions(-) rename LICENSE => LICENSE-APACHE (100%) create mode 100644 LICENSE-MIT create mode 100644 LICENSE.md diff --git a/Cargo.lock b/Cargo.lock index dd97650..acce8a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ [root] name = "stringsext" -version = "1.4.4" +version = "1.4.5" dependencies = [ "docopt 0.6.86 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 84c2a7b..fc66561 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "stringsext" -version = "1.4.4" +version = "1.4.5" authors = ["Jens Getreu "] [dependencies] diff --git a/LICENSE b/LICENSE-APACHE similarity index 100% rename from LICENSE rename to LICENSE-APACHE diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 0000000..c782e31 --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,25 @@ +Copyright (c) 2017 Jens Getreu + +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.md b/LICENSE.md new file mode 100644 index 0000000..b939f95 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,15 @@ +# License + +Licensed under either of + +- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or + http://www.apache.org/licenses/LICENSE-2.0) +- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + +at your option. + +## Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall be +dual licensed as above, without any additional terms or conditions. diff --git a/doc/source/index.rst b/doc/source/index.rst index ad0cf7d..fc17c8b 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,10 +1,6 @@ .. Main project page for ``stringsext`` - - - - ************ stringsext ************ @@ -15,7 +11,7 @@ stringsext - search for multi-byte encoded strings in binary data. :Author: Jens Getreu -:Copyright: Apache 2 license +:Copyright: Apache 2 license or MIT license :Build status: .. image:: https://travis-ci.org/getreu/stringsext.svg?branch=master :target: https://travis-ci.org/getreu/stringsext diff --git a/doc/source/stringsext--man.rst b/doc/source/stringsext--man.rst index ae28a29..5813e25 100644 --- a/doc/source/stringsext--man.rst +++ b/doc/source/stringsext--man.rst @@ -39,10 +39,13 @@ search for multi-byte encoded strings in binary data. :Date: 2017-01-28 :Version: 1.4.3 + :Date: 2017-09-03 + :Version: 1.4.4 + :Author: Jens Getreu -:Date: 2017-09-03 -:Version: 1.4.4 -:Copyright: Apache License, Version 2.0 (for details see COPYING section) +:Date: 2017-09-23 +:Version: 1.4.5 +:Copyright: Apache License Version 2.0, or MIT license (for details see COPYING section) :Manual section: 1 :Manual group: Forensic Tools @@ -392,16 +395,21 @@ COPYING Copyright (C) 2016 Jens Getreu +Licensed under either of + +- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or + http://www.apache.org/licenses/LICENSE-2.0) +- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + +at your option. + +Contribution +------------ + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall be +dual licensed as above, without any additional terms or conditions. Licenced under the Apache Licence, Version 2.0 (the "Licence"); you may not use this file except in compliance with the Licence. You may obtain a copy of the Licence at -:: - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the Licence is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the Licence for the specific language governing permissions and -limitations under the Licence.