From: Eric Wong Date: Sat, 26 Oct 2013 07:05:10 +0000 (+0000) Subject: license: allow all future versions of the GNU GPL X-Git-Tag: v4.7.0~4 X-Git-Url: https://repo.or.cz/w/unicorn.git/commitdiff_plain/f078eb93d343bb27cf5c6dc84efbe7c598d572fb license: allow all future versions of the GNU GPL There is currently no GPLv4, so this change has no effect at the moment. In case the GPLv4 arrives and I am not alive to approve/review it, the lesser of evils is have give blanket approval of all future GPL versions (as published by the FSF). The worse evil is to be stuck with a license which cannot guarantee the Free-ness of this project in the future. This unfortunately means the FSF can theoretically come out with license terms I do not agree with, but the GPLv2 and GPLv3 will always be an option to all users. --- diff --git a/LICENSE b/LICENSE index 099110a5..5b6458ed 100644 --- a/LICENSE +++ b/LICENSE @@ -3,15 +3,18 @@ revision control for names and email addresses of all of them. You can redistribute it and/or modify it under either the terms of the GNU General Public License (GPL) as published by the Free Software -Foundation (FSF), version {3.0}[http://www.gnu.org/licenses/gpl-3.0.txt] -or version {2.0}[http://www.gnu.org/licenses/gpl-2.0.txt] -or the Ruby-specific license terms (see below). +Foundation (FSF), either version 2 of the License, or (at your option) +any later version. We currently prefer the GPLv3 or later for +derivative works, but the GPLv2 is fine. -The unicorn project leader (Eric Wong) reserves the right to add future -versions of the GPL (and no other licenses) as published by the FSF to -the licensing terms. +The complete texts of the GPLv2 and GPLv3 are below: +GPLv2 - http://www.gnu.org/licenses/gpl-2.0.txt +GPLv3 - http://www.gnu.org/licenses/gpl-3.0.txt -=== Ruby-specific terms (if you're not using the GPLv2 or GPLv3) +You may (against our _preference_) also use the Ruby 1.8 license terms +which we inherited from the original Mongrel project when we forked it: + +=== Ruby 1.8-specific terms (if you're not using the GPL) 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 diff --git a/README b/README index 5dde0d76..42167c85 100644 --- a/README +++ b/README @@ -63,8 +63,9 @@ both the the request and response in between \Unicorn and slow clients. It is based on Mongrel 1.1.5. Mongrel is copyright 2007 Zed A. Shaw and contributors. -\Unicorn is tri-licensed under (your choice) of the GPLv3, GPLv2 or -Ruby (1.8)-specific terms. See the included LICENSE file for details. +\Unicorn is licensed under (your choice) of the GPLv2 or later +(GPLv3+ preferred), or Ruby (1.8)-specific terms. +See the included LICENSE file for details. \Unicorn is 100% Free Software. diff --git a/ext/unicorn_http/unicorn_http.rl b/ext/unicorn_http/unicorn_http.rl index 3529740c..6293033b 100644 --- a/ext/unicorn_http/unicorn_http.rl +++ b/ext/unicorn_http/unicorn_http.rl @@ -2,7 +2,7 @@ * Copyright (c) 2009 Eric Wong (all bugs are Eric's fault) * Copyright (c) 2005 Zed A. Shaw * You can redistribute it and/or modify it under the same terms as Ruby 1.8 or - * the GPLv3 + * the GPLv2+ (GPLv3+ preferred) */ #include "ruby.h" #include "ext_help.h" diff --git a/lib/unicorn/app/inetd.rb b/lib/unicorn/app/inetd.rb index b8512144..13b66240 100644 --- a/lib/unicorn/app/inetd.rb +++ b/lib/unicorn/app/inetd.rb @@ -2,7 +2,7 @@ # :enddoc: # Copyright (c) 2009 Eric Wong # You can redistribute it and/or modify it under the same terms as Ruby 1.8 or -# the GPLv3 +# the GPLv2+ (GPLv3+ preferred) # this class *must* be used with Rack::Chunked module Unicorn::App diff --git a/lib/unicorn/app/old_rails.rb b/lib/unicorn/app/old_rails.rb index ad1ca8e8..1e8c41ae 100644 --- a/lib/unicorn/app/old_rails.rb +++ b/lib/unicorn/app/old_rails.rb @@ -5,7 +5,7 @@ # Copyright (c) 2005 Zed A. Shaw # Copyright (c) 2009 Eric Wong # You can redistribute it and/or modify it under the same terms as Ruby 1.8 or -# the GPLv3 +# the GPLv2+ (GPLv3+ preferred) # Additional work donated by contributors. See CONTRIBUTORS for more info. require 'unicorn/cgi_wrapper' require 'dispatcher' diff --git a/lib/unicorn/cgi_wrapper.rb b/lib/unicorn/cgi_wrapper.rb index d0175d0b..d9b7fe59 100644 --- a/lib/unicorn/cgi_wrapper.rb +++ b/lib/unicorn/cgi_wrapper.rb @@ -5,7 +5,7 @@ # Copyright (c) 2005 Zed A. Shaw # Copyright (c) 2009 Eric Wong # You can redistribute it and/or modify it under the same terms as Ruby 1.8 or -# the GPLv3 +# the GPLv2+ (GPLv3+ preferred) # # Additional work donated by contributors. See CONTRIBUTORS for more info. diff --git a/test/test_helper.rb b/test/test_helper.rb index cf98996e..c65f2f31 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,7 +2,7 @@ # Copyright (c) 2005 Zed A. Shaw # You can redistribute it and/or modify it under the same terms as Ruby 1.8 or -# the GPLv3 +# the GPLv2+ (GPLv3+ preferred) # # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. diff --git a/test/unit/test_http_parser.rb b/test/unit/test_http_parser.rb index 64146e73..8d5b2512 100644 --- a/test/unit/test_http_parser.rb +++ b/test/unit/test_http_parser.rb @@ -2,7 +2,7 @@ # Copyright (c) 2005 Zed A. Shaw # You can redistribute it and/or modify it under the same terms as Ruby 1.8 or -# the GPLv3 +# the GPLv2+ (GPLv3+ preferred) # # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. diff --git a/test/unit/test_request.rb b/test/unit/test_request.rb index a57cbcd2..fbda1a2e 100644 --- a/test/unit/test_request.rb +++ b/test/unit/test_request.rb @@ -2,7 +2,7 @@ # Copyright (c) 2009 Eric Wong # You can redistribute it and/or modify it under the same terms as Ruby 1.8 or -# the GPLv3 +# the GPLv2+ (GPLv3+ preferred) require 'test/test_helper' diff --git a/test/unit/test_response.rb b/test/unit/test_response.rb index 054c3dd5..85ac085c 100644 --- a/test/unit/test_response.rb +++ b/test/unit/test_response.rb @@ -2,7 +2,7 @@ # Copyright (c) 2005 Zed A. Shaw # You can redistribute it and/or modify it under the same terms as Ruby 1.8 or -# the GPLv3 +# the GPLv2+ (GPLv3+ preferred) # # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. diff --git a/test/unit/test_server.rb b/test/unit/test_server.rb index a821790b..e5b335f6 100644 --- a/test/unit/test_server.rb +++ b/test/unit/test_server.rb @@ -2,7 +2,7 @@ # Copyright (c) 2005 Zed A. Shaw # You can redistribute it and/or modify it under the same terms as Ruby 1.8 or -# the GPLv3 +# the GPLv2+ (GPLv3+ preferred) # # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. diff --git a/test/unit/test_signals.rb b/test/unit/test_signals.rb index f1d8bb3d..443c7369 100644 --- a/test/unit/test_signals.rb +++ b/test/unit/test_signals.rb @@ -2,7 +2,7 @@ # Copyright (c) 2009 Eric Wong # You can redistribute it and/or modify it under the same terms as Ruby 1.8 or -# the GPLv3 +# the GPLv2+ (GPLv3+ preferred) # # Ensure we stay sane in the face of signals being sent to us diff --git a/unicorn.gemspec b/unicorn.gemspec index 0453eb0a..4619a896 100644 --- a/unicorn.gemspec +++ b/unicorn.gemspec @@ -40,5 +40,5 @@ Gem::Specification.new do |s| s.add_development_dependency('isolate', '~> 3.2') s.add_development_dependency('wrongdoc', '~> 1.6.1') - s.licenses = ["GPLv2", "GPLv3", "Ruby 1.8"] + s.licenses = ["GPLv2+", "Ruby 1.8"] end