From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Linus Torvalds" <torvalds@linux-foundation.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Mauro Carvalho Chehab" <mchehab@s-opensource.com>,
"Han-Wen Nienhuys" <hanwen@google.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 3/5] COPYING: remove mention of GPLv3, clarify sub-project COPYING
Date: Sat, 2 Oct 2021 11:19:18 +0200 [thread overview]
Message-ID: <patch-3.5-e91f8ce6984-20211002T091212Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.5-00000000000-20211002T091212Z-avarab@gmail.com>
The COPYING file added in [1] is a product of its era, at the time
discussions around the GPLv3 were quite active. Since then we have had
almost on "GPL v2 or later" notices anywhere.
Since then[2][3] linux.git has replaced its version of almost the
identical wording with something that's a bit more formal, and which
isn't mostly addressing a hypothetical future GPL v3 migratin. Let's
do the same. Now we:
A. Let it suffice to say that things are licensed under GPL v2 unless
explicitly otherwise stated. The new wording is an amalgamation of
the start of Linux's "COPYING" file[4] and the end of our pre-image
first paragraph added in[1].
B. Add some brief wording about how the licenses of subdirectories
such as "sha1dc/" and "compat/regex/" should be discovered. This is
also intended to cover future in-tree additions such as the
"reftable" directory[5][6].
C. Include the same "subject to this COPYING file" wording as
linux.git has used since[7].
1. 075b845a857 (Add a COPYING notice, making it explicit that the
license is GPLv2., 2005-04-11)
2. torvalds/linux@bf02d491237e (COPYING: use the new text with points
to the license files, 2018-03-23)
3. torvalds/linux@74835c7db032 (COPYING: state that all contributions
really are covered by this file, 2020-02-06)
4. torvalds/linux@88de995ccf48 (COPYING: create a new file with points
to the Kernel license files, 2018-03-23)
5. https://lore.kernel.org/git/2597ddfeae1d9da8695151f62379c85621ad0fcb.1632841817.git.gitgitgadget@gmail.com/
6. https://lore.kernel.org/git/xmqqtui4k1j5.fsf@gitster.g/
7. torvalds/linux@74835c7db032 (COPYING: state that all contributions
really are covered by this file, 2020-02-06)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
COPYING | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/COPYING b/COPYING
index 536e55524db..19de8f2ea1b 100644
--- a/COPYING
+++ b/COPYING
@@ -1,21 +1,20 @@
-
- Note that the only valid version of the GPL as far as this project
- is concerned is _this_ particular version of the license (ie v2, not
- v2.2 or v3.x or whatever), unless explicitly otherwise stated.
-
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
- a good idea, I also ask that people involved with the project make
- their preferences known. In particular, if you trust me to make that
- decision, you might note so in your copyright message, ie something
- like
-
- This file is licensed under the GPL v2, or a later version
- at the discretion of Linus.
-
- might avoid issues. But we can also just decide to synchronize and
- contact all copyright holders on record if/when the occasion arises.
-
- Linus Torvalds
+Git is provided under the terms of the GNU General Public License
+version 2 only (GPL-2.0), unless explicitly otherwise stated.
+
+The license described in this COPYING file applies to Git's source as
+a whole, though individual source files can have a different license
+which is required to be compatible with the GPL-2.0. All contributions
+to Git are subject to this COPYING file.
+
+Different but compatible licenses may apply to individual files or
+directories. Defer to files matching "*COPYING*" or "*LICENSE*" in
+subdirectories for the license of files therein, or to copyright
+notices at the top of individual files.
+
+Examples include "sha1dc/LICENSE.txt" covering the imported "sha1dc/"
+directory (and optional "sha1collisiondetection/" submodule), the
+"xdiff/" directory licensed under the LGPL v2.1 (see the "LGPL-2.1"
+file), and imported external code such as "compat/regex/".
----------------------------------------
--
2.33.0.1380.g193143c62ce
next prev parent reply other threads:[~2021-10-02 9:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-02 9:19 [PATCH 0/5] COPYING: modernize, steal boilerplate from linux.git Ævar Arnfjörð Bjarmason
2021-10-02 9:19 ` [PATCH 1/5] "lib-diff" tests: make "README" and "COPYING" test data smaller Ævar Arnfjörð Bjarmason
2021-10-04 16:46 ` Han-Wen Nienhuys
2021-10-04 17:59 ` Ævar Arnfjörð Bjarmason
2021-10-02 9:19 ` [PATCH 2/5] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
2021-10-02 9:19 ` Ævar Arnfjörð Bjarmason [this message]
2021-10-04 6:21 ` [PATCH 3/5] COPYING: remove mention of GPLv3, clarify sub-project COPYING Junio C Hamano
2021-10-02 9:19 ` [PATCH 4/5] COPYING: move GPL text to a "GPL-2.0" file Ævar Arnfjörð Bjarmason
2021-10-02 9:19 ` [PATCH 5/5] GPL-2.0: update to byte-for-byte match the FSF's version Ævar Arnfjörð Bjarmason
2021-10-04 17:28 ` [PATCH 0/5] COPYING: modernize, steal boilerplate from linux.git Han-Wen Nienhuys
2021-10-05 17:01 ` [PATCH v2 " Ævar Arnfjörð Bjarmason
2021-10-05 17:01 ` [PATCH v2 1/5] "lib-diff" tests: make "README" and "COPYING" test data smaller Ævar Arnfjörð Bjarmason
2021-10-05 17:01 ` [PATCH v2 2/5] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
2021-10-05 17:01 ` [PATCH v2 3/5] COPYING: remove mention of GPLv3, clarify sub-project COPYING Ævar Arnfjörð Bjarmason
2021-10-05 17:01 ` [PATCH v2 4/5] COPYING: move GPL text to a "GPL-2.0" file Ævar Arnfjörð Bjarmason
2021-10-05 17:01 ` [PATCH v2 5/5] GPL-2.0: update to byte-for-byte match the FSF's version Ævar Arnfjörð Bjarmason
2021-10-15 9:30 ` [PATCH v3 0/2] tests: stop relying on top-level COPYING and README Ævar Arnfjörð Bjarmason
2021-10-15 9:30 ` [PATCH v3 1/2] "lib-diff" tests: make "README" and "COPYING" test data smaller Ævar Arnfjörð Bjarmason
2021-10-15 16:36 ` Junio C Hamano
2021-10-15 9:30 ` [PATCH v3 2/2] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=patch-3.5-e91f8ce6984-20211002T091212Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=gregkh@linuxfoundation.org \
--cc=hanwen@google.com \
--cc=mchehab@s-opensource.com \
--cc=peff@peff.net \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).