mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-11-22 01:06:03 +03:00
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:54f9375b32Commit B:8df61db644Commit C:9835af4962
This commit is contained in:
sledgehammer999
parent
6b3c6c12ff
commit
f6336a6056
4 changed files with 19 additions and 12 deletions
16
AUTHORS
16
AUTHORS
|
|
@ -17,19 +17,23 @@ Contributors:
|
||||||
* Nick Tiskov <daymansmail@gmail.com>
|
* Nick Tiskov <daymansmail@gmail.com>
|
||||||
|
|
||||||
Code from other projects:
|
Code from other projects:
|
||||||
* files src/qtsingleapplication/* src/lineedit/*
|
* files src/app/qtlocalpeer/*
|
||||||
copyright: Nokia Corporation
|
copyright: Nokia Corporation
|
||||||
license: LGPL
|
license: mixed
|
||||||
|
|
||||||
* files src/ico.cpp src/ico.h
|
* files src/gui/lineedit.*
|
||||||
copyright: Malte Starostik <malte@kde.org>
|
copyright: Trolltech ASA <info@trolltech.com>
|
||||||
license: LGPL
|
license: custom
|
||||||
|
|
||||||
* files src/search_engine/socks.py
|
* files src/search_engine/socks.py
|
||||||
copyright: Dan Haim <negativeiq@users.sourceforge.net>
|
copyright: Dan Haim <negativeiq@users.sourceforge.net>
|
||||||
license: BSD
|
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
|
copyright: Quassel Project
|
||||||
license: GPLv2/3
|
license: GPLv2/3
|
||||||
|
|
||||||
|
|
|
||||||
7
COPYING
7
COPYING
|
|
@ -1,5 +1,6 @@
|
||||||
qBittorrent is licensed under the GNU General Public License version 2 with the
|
qBittorrent is licensed under the GNU General Public License either version 2,
|
||||||
addition of the following special exception:
|
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
|
In addition, as a special exception, the copyright holders give permission to
|
||||||
link this program with the OpenSSL project's "OpenSSL" library (or with
|
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
|
but you are not obligated to do so. If you do not wish to do so, delete this
|
||||||
exception statement from your version.
|
exception statement from your version.
|
||||||
|
|
||||||
|
See also the AUTHORS file
|
||||||
|
|
||||||
----------
|
----------
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
||||||
<title>License</title>
|
<title>License</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<p>qBittorrent is licensed under the GNU General Public License version 2 with the
|
<p>qBittorrent is licensed under the GNU General Public License either version 2,
|
||||||
addition of the following special exception:</p>
|
or (at your option) any later version with the addition of the following special exception:</p>
|
||||||
<p>
|
<p>
|
||||||
In addition, as a special exception, the copyright holders give permission to
|
In addition, as a special exception, the copyright holders give permission to
|
||||||
link this program with the OpenSSL project's "OpenSSL" library (or with
|
link this program with the OpenSSL project's "OpenSSL" library (or with
|
||||||
|
|
|
||||||
|
|
@ -130,8 +130,8 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="aboutLicenseContent" class="aboutTabContent invisible">
|
<div id="aboutLicenseContent" class="aboutTabContent invisible">
|
||||||
<p>qBittorrent is licensed under the GNU General Public License version 2 with the
|
<p>qBittorrent is licensed under the GNU General Public License either version 2,
|
||||||
addition of the following special exception:</p>
|
or (at your option) any later version with the addition of the following special exception:</p>
|
||||||
<p>
|
<p>
|
||||||
In addition, as a special exception, the copyright holders give permission to
|
In addition, as a special exception, the copyright holders give permission to
|
||||||
link this program with the OpenSSL project's "OpenSSL" library (or with
|
link this program with the OpenSSL project's "OpenSSL" library (or with
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue