From 5c8b222faafd422b48d6257096c239376505326e Mon Sep 17 00:00:00 2001 From: Sami Vaarala Date: Tue, 10 Nov 2015 10:44:52 +0200 Subject: [PATCH] License changes for string hashing (Lua, djb2) --- dist-files/README.rst | 9 +++++---- licenses/lua.txt | 1 + util/create_spdx_license.py | 5 +++-- util/make_dist.sh | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 licenses/lua.txt diff --git a/dist-files/README.rst b/dist-files/README.rst index f8058aa3..a20b74a6 100644 --- a/dist-files/README.rst +++ b/dist-files/README.rst @@ -97,10 +97,11 @@ This distributable contains Duktape version @DUK_VERSION_FORMATTED@, created fro commit @GIT_COMMIT@ (@GIT_DESCRIBE@). Duktape is copyrighted by its authors (see ``AUTHORS.rst``) and licensed -under the MIT license (see ``LICENSE.txt``). MurmurHash2 is used internally, -it is also under the MIT license. Duktape module loader is based on the -CommonJS module loading specification (without sharing any code), CommonJS -is under the MIT license. +under the MIT license (see ``LICENSE.txt``). String hashing algorithms are +based on the algorithm from Lua (MIT license), djb2 hash, and Murmurhash2 +(MIT license). Duktape module loader is based on the CommonJS module +loading specification (without sharing any code), CommonJS is under the +MIT license. Have fun! diff --git a/licenses/lua.txt b/licenses/lua.txt new file mode 100644 index 00000000..24e65f1c --- /dev/null +++ b/licenses/lua.txt @@ -0,0 +1 @@ +Lua is under the MIT license: http://www.lua.org/license.html. diff --git a/util/create_spdx_license.py b/util/create_spdx_license.py index 39f36f25..b8532899 100644 --- a/util/create_spdx_license.py +++ b/util/create_spdx_license.py @@ -169,8 +169,9 @@ def main(): # SPDX.checksum: omitted because license is inside the package g.add((pkg_node, SPDX.sourceInfo, Literal('Official duktape.org release built from GitHub repo https://github.com/svaarala/duktape.'))) - # NOTE: MIT license alone is sufficient fornow, because Duktape, MurmurHash2 and - # CommonJS (though probably not even relevant for licensing) are all MIT. + # NOTE: MIT license alone is sufficient for now, because Duktape, Lua, + # Murmurhash2, and CommonJS (though probably not even relevant for + # licensing) are all MIT. g.add((pkg_node, SPDX.licenseConcluded, mit_license)) g.add((pkg_node, SPDX.licenseInfoFromFiles, mit_license)) g.add((pkg_node, SPDX.licenseDeclared, mit_license)) diff --git a/util/make_dist.sh b/util/make_dist.sh index a4bcb0b5..c12e6d8a 100644 --- a/util/make_dist.sh +++ b/util/make_dist.sh @@ -431,6 +431,7 @@ cp AUTHORS.rst $DIST/AUTHORS.rst for i in \ murmurhash2.txt \ + lua.txt \ commonjs.txt \ ; do cp licenses/$i $DIST/licenses/