From 09c215a5aea9ec189815170f6566695027eb2b50 Mon Sep 17 00:00:00 2001 From: johnnyshields <27655+johnnyshields@users.noreply.github.com> Date: Wed, 8 Nov 2023 18:38:33 +0900 Subject: [PATCH 1/5] Clarify license terms and add provision that future contributions must be made under the MIT license --- .yardopts | 1 - COPYING | 2 - LICENSE | 86 +++++++++++++++--------------------------- GPLv2 => LICENSE-GPLv2 | 0 GPLv3 => LICENSE-GPLv3 | 0 LICENSE-MIT | 21 +++++++++++ LICENSE-PRAWN | 51 +++++++++++++++++++++++++ prawn.gemspec | 33 ++++++++-------- 8 files changed, 120 insertions(+), 74 deletions(-) delete mode 100644 COPYING rename GPLv2 => LICENSE-GPLv2 (100%) rename GPLv3 => LICENSE-GPLv3 (100%) create mode 100644 LICENSE-MIT create mode 100644 LICENSE-PRAWN diff --git a/.yardopts b/.yardopts index e3fcddd6c..1865455c2 100644 --- a/.yardopts +++ b/.yardopts @@ -4,7 +4,6 @@ --no-private - CONTRIBUTING.md -COPYING LICENSE README.md CHANGELOG.md diff --git a/COPYING b/COPYING deleted file mode 100644 index 44cfccdf3..000000000 --- a/COPYING +++ /dev/null @@ -1,2 +0,0 @@ -Prawn may be used under Matz's original licensing terms for Ruby, or GPLv2 or GPLv3. -See LICENSE for Matz's terms, or GPLv2 and GPLv3 files. diff --git a/LICENSE b/LICENSE index d59681bd7..4d67cac72 100644 --- a/LICENSE +++ b/LICENSE @@ -1,56 +1,30 @@ -Prawn is copyrighted free software produced by Gregory Brown along with -community contributions. See git log for authorship information. - -Licensing terms follow: - -You can redistribute Prawn and/or modify it under either the terms of the GPLv2 -or GPLv3 (see GPLv2 and GPLv3 files), or the conditions below: - - 1. You may make and give away verbatim copies of the source form of the - software without restriction, provided that you duplicate all of the - original copyright notices and associated disclaimers. - - 2. You may modify your copy of the software in any way, provided that - you do at least ONE of the following: - - a) place your modifications in the Public Domain or otherwise - make them Freely Available, such as by posting said - modifications to Usenet or an equivalent medium, or by allowing - the author to include your modifications in the software. - - b) use the modified software only within your corporation or - organization. - - c) rename any non-standard executables so the names do not conflict - with standard executables, which must also be provided. - - d) make other distribution arrangements with the author. - - 3. You may distribute the software in object code or executable - form, provided that you do at least ONE of the following: - - a) distribute the executables and library files of the software, - together with instructions (in the manual page or equivalent) - on where to get the original distribution. - - b) accompany the distribution with the machine-readable source of - the software. - - c) give non-standard executables non-standard names, with - instructions on where to get the original software distribution. - - d) make other distribution arrangements with the author. - - 4. You may modify and include the part of the software into any other - software (possibly commercial). - - 5. The scripts and library files supplied as input to or produced as - output from the software do not automatically fall under the - copyright of the software, but belong to whomever generated them, - and may be sold commercially, and may be aggregated with this - software. - - 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE. +Prawn may be used under any of the following licenses: + +1. The Prawn License (see: LICENSE-PRAWN), which is similar to + Matz's original licensing terms for Ruby. +2. GPLv2 (see: LICENSE-GPLv2) +3. GPLv3 (see: LICENSE-GPLv2) + +The maintainers of this repository plan to migrate to the MIT License +(see: LICENSE-MIT) in the future. Effective November 8, 2023, by +contributing to this repository, you consent to license under the MIT License +your contribution together with any past contributions to this repository, +its forks, and other repositories in the "prawnpdf" GitHub organization, +in addition to the existing license(s). This includes without limitation: + +* https://github.com/tablecheck/prawn-continued +* https://github.com/tablecheck/prawn-table-continued +* https://github.com/prawnpdf/prawn +* https://github.com/prawnpdf/prawn-component +* https://github.com/prawnpdf/prawn-templates +* https://github.com/prawnpdf/prawn-table +* https://github.com/prawnpdf/prawn-dev +* https://github.com/prawnpdf/prawn-manual_builder +* https://github.com/prawnpdf/pdf-core +* https://github.com/prawnpdf/pdf-inspector +* https://github.com/prawnpdf/ttfunk +* https://github.com/prawnpdf/demo + +For clarity, the MIT License has not yet been adopted for use in this +repository. Refer to the following issue for migration status: +https://github.com/tablecheck/prawn-continued/issues/4 diff --git a/GPLv2 b/LICENSE-GPLv2 similarity index 100% rename from GPLv2 rename to LICENSE-GPLv2 diff --git a/GPLv3 b/LICENSE-GPLv3 similarity index 100% rename from GPLv3 rename to LICENSE-GPLv3 diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 000000000..0f7a479fa --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,21 @@ +Copyright (c) 2008-2023 Gregory Brown +Copyright (c) 2023 onwards John Shields + +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-PRAWN b/LICENSE-PRAWN new file mode 100644 index 000000000..85da5ad44 --- /dev/null +++ b/LICENSE-PRAWN @@ -0,0 +1,51 @@ +You can redistribute Prawn and/or modify it under either the terms of the GPLv2 +or GPLv3 (see GPLv2 and GPLv3 files), or the conditions below: + + 1. You may make and give away verbatim copies of the source form of the + software without restriction, provided that you duplicate all of the + original copyright notices and associated disclaimers. + + 2. You may modify your copy of the software in any way, provided that + you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise + make them Freely Available, such as by posting said + modifications to Usenet or an equivalent medium, or by allowing + the author to include your modifications in the software. + + b) use the modified software only within your corporation or + organization. + + c) rename any non-standard executables so the names do not conflict + with standard executables, which must also be provided. + + d) make other distribution arrangements with the author. + + 3. You may distribute the software in object code or executable + form, provided that you do at least ONE of the following: + + a) distribute the executables and library files of the software, + together with instructions (in the manual page or equivalent) + on where to get the original distribution. + + b) accompany the distribution with the machine-readable source of + the software. + + c) give non-standard executables non-standard names, with + instructions on where to get the original software distribution. + + d) make other distribution arrangements with the author. + + 4. You may modify and include the part of the software into any other + software (possibly commercial). + + 5. The scripts and library files supplied as input to or produced as + output from the software do not automatically fall under the + copyright of the software, but belong to whomever generated them, + and may be sold commercially, and may be aggregated with this + software. + + 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. diff --git a/prawn.gemspec b/prawn.gemspec index 692902a13..ade2f0b1e 100644 --- a/prawn.gemspec +++ b/prawn.gemspec @@ -9,30 +9,35 @@ Gem::Specification.new do |spec| spec.version = Prawn::VERSION spec.platform = Gem::Platform::RUBY spec.summary = 'A fast and nimble PDF generator for Ruby' - - # spec.cert_chain = ['certs/pointlessone.pem'] - # if $PROGRAM_NAME.end_with? 'gem' - # spec.signing_key = File.expand_path('~/.gem/gem-private_key.pem') - # end - spec.files = Dir.glob('{examples,lib,spec,manual}/**/**/*') + Dir.glob('data/fonts/{MustRead.html,*.afm}') + [ - 'Rakefile', 'prawn.gemspec', 'Gemfile', - 'COPYING', 'LICENSE', 'GPLv2', 'GPLv3', + 'Rakefile', + 'prawn.gemspec', + 'Gemfile', + 'LICENSE', + 'LICENSE-GPLv2', + 'LICENSE-GPLv3', + 'LICENSE-MIT', + 'LICENSE-PRAWN', '.yardopts' ] spec.require_path = 'lib' spec.required_ruby_version = '>= 2.6' spec.required_rubygems_version = '>= 1.3.6' - spec.authors = [ - 'Gregory Brown', 'Brad Ediger', 'Daniel Nelson', 'Jonathan Greenberg', + 'Gregory Brown', + 'Brad Ediger', + 'Daniel Nelson', + 'Jonathan Greenberg', 'James Healy' ] spec.email = [ - 'gregory.t.brown@gmail.com', 'brad@bradediger.com', 'dnelson@bluejade.com', - 'greenberg@entryway.net', 'jimmy@deefa.com' + 'gregory.t.brown@gmail.com', + 'brad@bradediger.com', + 'dnelson@bluejade.com', + 'greenberg@entryway.net', + 'jimmy@deefa.com' ] spec.licenses = %w[PRAWN GPL-2.0 GPL-3.0] @@ -46,7 +51,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency('prawn-manual_builder', '>= 0.3.0') spec.homepage = 'http://prawnpdf.org' - spec.description = < Date: Wed, 8 Nov 2023 18:42:07 +0900 Subject: [PATCH 2/5] Add back section from original license --- LICENSE-PRAWN | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/LICENSE-PRAWN b/LICENSE-PRAWN index 85da5ad44..419882c3a 100644 --- a/LICENSE-PRAWN +++ b/LICENSE-PRAWN @@ -1,3 +1,8 @@ +Prawn is copyrighted free software produced by Gregory Brown along with +community contributions. See git log for authorship information. + +Licensing terms follow: + You can redistribute Prawn and/or modify it under either the terms of the GPLv2 or GPLv3 (see GPLv2 and GPLv3 files), or the conditions below: From 389f2cc6629776be72afb882d4dbb0ee7e0831e2 Mon Sep 17 00:00:00 2001 From: johnnyshields <27655+johnnyshields@users.noreply.github.com> Date: Wed, 8 Nov 2023 18:44:37 +0900 Subject: [PATCH 3/5] Clarify language --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 4d67cac72..f85086200 100644 --- a/LICENSE +++ b/LICENSE @@ -8,7 +8,7 @@ Prawn may be used under any of the following licenses: The maintainers of this repository plan to migrate to the MIT License (see: LICENSE-MIT) in the future. Effective November 8, 2023, by contributing to this repository, you consent to license under the MIT License -your contribution together with any past contributions to this repository, +your contribution together with any other contributions to this repository, its forks, and other repositories in the "prawnpdf" GitHub organization, in addition to the existing license(s). This includes without limitation: From eeacf3977a597f3643a37a8244369932cf6e74db Mon Sep 17 00:00:00 2001 From: johnnyshields <27655+johnnyshields@users.noreply.github.com> Date: Wed, 8 Nov 2023 18:52:56 +0900 Subject: [PATCH 4/5] Fix typo --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index f85086200..807a36007 100644 --- a/LICENSE +++ b/LICENSE @@ -3,7 +3,7 @@ Prawn may be used under any of the following licenses: 1. The Prawn License (see: LICENSE-PRAWN), which is similar to Matz's original licensing terms for Ruby. 2. GPLv2 (see: LICENSE-GPLv2) -3. GPLv3 (see: LICENSE-GPLv2) +3. GPLv3 (see: LICENSE-GPLv3) The maintainers of this repository plan to migrate to the MIT License (see: LICENSE-MIT) in the future. Effective November 8, 2023, by From 9a953953cf2c0091bfe6d7008be8e6ed57208528 Mon Sep 17 00:00:00 2001 From: Johnny Shields <27655+johnnyshields@users.noreply.github.com> Date: Thu, 9 Nov 2023 13:44:46 +0900 Subject: [PATCH 5/5] Update LICENSE --- LICENSE | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 807a36007..29514e535 100644 --- a/LICENSE +++ b/LICENSE @@ -7,23 +7,8 @@ Prawn may be used under any of the following licenses: The maintainers of this repository plan to migrate to the MIT License (see: LICENSE-MIT) in the future. Effective November 8, 2023, by -contributing to this repository, you consent to license under the MIT License -your contribution together with any other contributions to this repository, -its forks, and other repositories in the "prawnpdf" GitHub organization, -in addition to the existing license(s). This includes without limitation: - -* https://github.com/tablecheck/prawn-continued -* https://github.com/tablecheck/prawn-table-continued -* https://github.com/prawnpdf/prawn -* https://github.com/prawnpdf/prawn-component -* https://github.com/prawnpdf/prawn-templates -* https://github.com/prawnpdf/prawn-table -* https://github.com/prawnpdf/prawn-dev -* https://github.com/prawnpdf/prawn-manual_builder -* https://github.com/prawnpdf/pdf-core -* https://github.com/prawnpdf/pdf-inspector -* https://github.com/prawnpdf/ttfunk -* https://github.com/prawnpdf/demo +contributing to this repository, you consent to license your contribution +under the MIT License. For clarity, the MIT License has not yet been adopted for use in this repository. Refer to the following issue for migration status: