From f6336a60562758ce1100ec35b62b8c1e136b03f6 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Sat, 20 Mar 2021 00:01:29 +0200 Subject: [PATCH] Clarify that the license is GPLv2+ Regarding this license clarification there are 3 commits of interest (commits A, B, C). Before commit A the COPYING file contained only the text of the GPLv2 license, while all source files had a license block at the top saying that they are under the terms of "GPLv2 or later". With commit A there was a temporary change to GPLv3. The COPYING file contained only the text of the GPLv3 license, while all source files had a license block at the top saying that they are under the terms of "GPLv3 or later". Then with commit B the COPYING file and the license block of the source files was reverted to their state before commit A. Afterwards, with commit C a license summary(or clarification) block was put at the top of the COPYING file. This block indicated that the license was GPLv2 without having the "or later" clause and it also included the OpenSSL exception. However, the license block of each source file continued to contain the "or later" clause which was not removed. The same license block continues to exist in all current source files. Thus it is concluded that the ommision of the "or later" clause with commit C in the COPYING file was accidental. OR ALTERNATIVELY (OR IN ADDITION) At the time commit C was made Christophe Dumez was not the sole contributor. There is no record that the other contributors agreed with the supposed GPLv2 only change or that there was a Contributor License Agreement, transfering their rights to him. Thus making his license change decision invalid/void/illegal. Commit A: 54f9375b325cc03f8d5da9abbf6c4e25e8ee698f Commit B: 8df61db644a7fcb19170d60da3b7b5297215439c Commit C: 9835af49627e65d314668387b6ec9d029707c186 --- AUTHORS | 16 ++++++++++------ COPYING | 7 +++++-- src/gui/gpl.html | 4 ++-- src/webui/www/private/views/about.html | 4 ++-- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/AUTHORS b/AUTHORS index 21107440e..cd070caba 100644 --- a/AUTHORS +++ b/AUTHORS @@ -17,19 +17,23 @@ Contributors: * Nick Tiskov Code from other projects: -* files src/qtsingleapplication/* src/lineedit/* +* files src/app/qtlocalpeer/* copyright: Nokia Corporation - license: LGPL + license: mixed -* files src/ico.cpp src/ico.h - copyright: Malte Starostik - license: LGPL +* files src/gui/lineedit.* + copyright: Trolltech ASA + license: custom * files src/search_engine/socks.py copyright: Dan Haim license: BSD -* file src/stacktrace_win.h +* file src/app/stacktrace.h + copyright: Timo Bingmann from http://idlebox.net/ + license: WTFPL v2.0 + +* file src/app/stacktrace_win.h copyright: Quassel Project license: GPLv2/3 diff --git a/COPYING b/COPYING index 3a486c265..0afd58567 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,6 @@ -qBittorrent is licensed under the GNU General Public License version 2 with the -addition of the following special exception: +qBittorrent is licensed under the GNU General Public License either version 2, +or (at your option) any later version with the addition of the following +special exception: In addition, as a special exception, the copyright holders give permission to link this program with the OpenSSL project's "OpenSSL" library (or with @@ -10,6 +11,8 @@ modify file(s), you may extend this exception to your version of the file(s), but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. +See also the AUTHORS file + ---------- GNU GENERAL PUBLIC LICENSE diff --git a/src/gui/gpl.html b/src/gui/gpl.html index 4c9c80da2..6ad30e852 100644 --- a/src/gui/gpl.html +++ b/src/gui/gpl.html @@ -5,8 +5,8 @@ License -

qBittorrent is licensed under the GNU General Public License version 2 with the -addition of the following special exception:

+

qBittorrent is licensed under the GNU General Public License either version 2, +or (at your option) any later version with the addition of the following special exception:

In addition, as a special exception, the copyright holders give permission to link this program with the OpenSSL project's "OpenSSL" library (or with diff --git a/src/webui/www/private/views/about.html b/src/webui/www/private/views/about.html index 06572b5ea..9d6bc91fd 100644 --- a/src/webui/www/private/views/about.html +++ b/src/webui/www/private/views/about.html @@ -130,8 +130,8 @@