From 56930d3a90309595c37b02ea1a34e017acf25163 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 2 Feb 2024 17:11:46 -0500 Subject: [PATCH 1/2] dev: update license copyright date and owners - update the formatting so it's recognized by licensee - remove LICENSE-DEPENDENCIES which was confusing licensee - update README to link to SQLite's copyright --- LICENSE | 40 ++++++++++++++++++---------------------- LICENSE-DEPENDENCIES | 20 -------------------- README.md | 4 ++-- sqlite3.gemspec | 1 - 4 files changed, 20 insertions(+), 45 deletions(-) delete mode 100644 LICENSE-DEPENDENCIES diff --git a/LICENSE b/LICENSE index 75c06824..de36eafb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,27 +1,23 @@ -Copyright (c) 2004, Jamis Buck (jamis@jamisbuck.org) -All rights reserved. +Copyright (c) 2004-2024, Jamis Buck, Luis Lavena, Aaron Patterson, Mike Dalessio, et al. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without modification, are permitted +provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, this list of conditions + and the following disclaimer. - * 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. + 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. - * The names of its contributors may not be used to endorse or promote - products derived from this software without specific prior written - permission. + 3. Neither the name of the copyright holder nor the names of its contributors may be used to + endorse or promote products derived from this software without specific prior written permission. -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 OWNER 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. +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. diff --git a/LICENSE-DEPENDENCIES b/LICENSE-DEPENDENCIES deleted file mode 100644 index a79a03fa..00000000 --- a/LICENSE-DEPENDENCIES +++ /dev/null @@ -1,20 +0,0 @@ -# Vendored Dependency Licenses - -The library `sqlite3-ruby` (which lives at https://github.com/sparklemotion/sqlite3-ruby) may include the source code for `sqlite` (which lives at https://www.sqlite.org/) - -`sqlite` source code is licensed under the public domain: - -> https://www.sqlite.org/copyright.html - -The license terms shipped with `sqlite` are included here for your convenience: - -``` -The author disclaims copyright to this source code. In place of -a legal notice, here is a blessing: - - May you do good and not evil. - May you find forgiveness for yourself and forgive others. - May you share freely, never taking more than you give. -``` - -Note that these license terms do not apply to the `sqlite3-ruby` library itself. diff --git a/README.md b/README.md index 5e1cbdb9..be332c20 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ See [`CONTRIBUTING.md`](./CONTRIBUTING.md). This library is licensed under `BSD-3-Clause`, see [`LICENSE`](./LICENSE). - ### Dependencies -The source code of `sqlite` is distributed in the "ruby platform" gem. This code is public domain, see [`LICENSE-DEPENDENCIES`](./LICENSE-DEPENDENCIES) for details. +The source code of `sqlite` is distributed in the "ruby platform" gem. This code is public domain, +see https://www.sqlite.org/copyright.html for details. diff --git a/sqlite3.gemspec b/sqlite3.gemspec index ff1a410c..57f5d61b 100644 --- a/sqlite3.gemspec +++ b/sqlite3.gemspec @@ -42,7 +42,6 @@ Gem::Specification.new do |s| "FAQ.md", "INSTALLATION.md", "LICENSE", - "LICENSE-DEPENDENCIES", "README.md", "dependencies.yml", "ext/sqlite3/aggregator.c", From 8044ad292909b5a25f817cc15d739c8a33feba59 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 2 Feb 2024 19:21:35 -0500 Subject: [PATCH 2/2] dev: manifest ignore .ruby-lsp/ --- rakelib/check-manifest.rake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rakelib/check-manifest.rake b/rakelib/check-manifest.rake index 813d7274..bb87aa16 100644 --- a/rakelib/check-manifest.rake +++ b/rakelib/check-manifest.rake @@ -5,10 +5,11 @@ desc "Perform a sanity check on the gemspec file list" task :check_manifest do ignore_directories = %w{ - .bundle .DS_Store + .bundle .git .github + .ruby-lsp bin doc gems