From c132a6936dcdb0aaea6be1f4abe900b8f64e1e44 Mon Sep 17 00:00:00 2001 From: Remi Rampin Date: Mon, 18 Jun 2018 12:27:48 -0400 Subject: [PATCH 1/2] Include copyright notice from zlib --- LICENSE-ZLIB | 22 ++++++++++++++++++++++ README.md | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 LICENSE-ZLIB diff --git a/LICENSE-ZLIB b/LICENSE-ZLIB new file mode 100644 index 0000000..313ef42 --- /dev/null +++ b/LICENSE-ZLIB @@ -0,0 +1,22 @@ +Copyright notice: + + (C) 1995-2017 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu diff --git a/README.md b/README.md index 49c2512..3f96e74 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,6 @@ What is this? It is an implementation of the [Adler32 rolling hash algorithm](https://en.wikipedia.org/wiki/Adler-32) in the [Rust programming language](https://www.rust-lang.org/). +It is adapted from Jean-Loup Gailly's and Mark Adler's [original implementation in zlib](https://github.com/madler/zlib/blob/2fa463bacfff79181df1a5270fb67cc679a53e71/adler32.c). A copy of the zlib copyright and license can be found in LICENSE-ZLIB. + [Generated documentation](https://remram44.github.io/adler32-rs/index.html) From 41954a5ff50f0fdf58d712e00831606f165aa787 Mon Sep 17 00:00:00 2001 From: Remi Rampin Date: Mon, 18 Jun 2018 15:38:00 -0400 Subject: [PATCH 2/2] Add Zlib license to Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 9df0a4b..6b02dd7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ documentation = "https://remram44.github.io/adler32-rs/index.html" repository = "https://github.com/remram44/adler32-rs" readme = "README.md" keywords = ["adler32", "hash", "rolling"] -license = "BSD-3-Clause" +license = "BSD-3-Clause AND Zlib" [dev-dependencies] rand = "0.4"