diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 19cad54..4d53181 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,7 +80,7 @@ jobs: } const files = entry.files.map(f => f.path); - const needed = ['index.js', 'binding.gyp', 'src/luastate.cc', 'src/nodelua.cc', 'src/utils.cc', 'vendor/lfs/lfs.c', 'README.md', 'LICENSE', 'LICENSE.md']; + const needed = ['index.js', 'binding.gyp', 'src/luastate.cc', 'src/nodelua.cc', 'src/utils.cc', 'vendor/lfs/lfs.c', 'README.md', 'LICENSE', 'THIRD-PARTY-NOTICES.md']; const missing = needed.filter(n => !files.includes(n)); if (missing.length) { console.error('missing from tarball:', missing.join(', ')); diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 37f3ecf..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,58 +0,0 @@ - -## License & Copyrights - -This project is ISC licensed. The canonical licence text lives in [LICENSE](LICENSE); -this file repeats it and adds the notices for the third-party sources compiled into -the addon. - -#### The ISC Licence (ISC) - -Copyright (c) 2017, Medaeus245 -Copyright (c) 2023, Maurice Schmicking (previously credited as 0x7878) - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - ---- - -## Bundled third-party software - -This package compiles the following third-party sources into the addon. Both are -distributed under the MIT license; their full notices ship alongside the code. - -### Lua 5.1.5 — `vendor/lua/` (see `vendor/lua/COPYRIGHT`) - -Copyright (C) 1994-2012 Lua.org, PUC-Rio. - -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. - -### LuaFileSystem 1.8.0 — `vendor/lfs/` (see `vendor/lfs/LICENSE`) - -Copyright (c) 2003-2020 Kepler Project. - -Distributed under the MIT license, on the same terms as above. diff --git a/README.md b/README.md index 6edebe3..07ed53b 100644 --- a/README.md +++ b/README.md @@ -350,4 +350,5 @@ there is no npm token stored in this repository. ## License -ISC — see [LICENSE.md](LICENSE.md), which also covers the vendored Lua and LuaFileSystem sources. +ISC — see [LICENSE](LICENSE). The vendored Lua and LuaFileSystem sources are MIT; their +notices are in [THIRD-PARTY-NOTICES.md](THIRD-PARTY-NOTICES.md). diff --git a/THIRD-PARTY-NOTICES.md b/THIRD-PARTY-NOTICES.md new file mode 100644 index 0000000..c0057f3 --- /dev/null +++ b/THIRD-PARTY-NOTICES.md @@ -0,0 +1,56 @@ +# Third-party notices + +This package compiles third-party sources directly into the addon. Both are MIT +licensed, and MIT requires their copyright notices to travel with any copy — which is +why this file exists and ships in the npm tarball. + +**This project's own licence is ISC and lives in [LICENSE](LICENSE).** Nothing below +changes it. + +## Lua 5.1.5 — `vendor/lua/` + +Verbatim copy of the upstream release; see also `vendor/lua/COPYRIGHT`. + +Copyright (C) 1994-2012 Lua.org, PUC-Rio. + +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. + +## LuaFileSystem 1.8.0 — `vendor/lfs/` + +Verbatim copy of the upstream release; see also `vendor/lfs/LICENSE`. + +Copyright (c) 2003-2020 Kepler Project. + +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/package.json b/package.json index 8dcbb07..f19877e 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "vendor/", "README.md", "LICENSE", - "LICENSE.md" + "THIRD-PARTY-NOTICES.md" ], "scripts": { "install": "node-gyp rebuild",