GPL-3.0*: Copy the standard header from the license body #578

wking · 2017-12-29T05:59:56Z

I've copy/pasted exactly from the license body, except for:

Some tab → space replacements for consistent indenting.
Adjusting the version text for the -only forms. I think the version text we use is pretty strange, but I'll deal with that in follow-up work.

Semantic changes due to this standardization:

GPL-3.0 gets “version.” → “version 3.”.
GPL-3.0+ gets “either version 3 of the License, or (at your option) any later” where it previously had nothing.
GPL-3.0-or-later gets “version 3 or any later version” → “either version 3 of the License, or (at your option) any later version”.
Every license I touch gets <…> around its URL, which has been in the license templates since f6c3453 (Automated PR for GPL-3.0 #85) and similar.
Every license I touch gets the optional HTTPS from df182a1 (*GPL-3.0: Optional HTTPS for outgoing link #450) and similar.

I haven't bothered adding alt/optional to support our old forms, because I'm expecting folks in the wild to be copy/pasting from the FSF license text instead of our <standardLicenseHeader>s. But I can work up alt/optional entries if folks feel they are needed.

I've copy/pasted exactly from the license body, except for: * Some tab -> space replacements for consistent indenting. * Adjusting the version text for the -only forms. I think the version text we use is pretty strange, but I'll deal with that in follow-up work. Semantic changes due to this standardization: * GPL-3.0 gets "version." -> "version 3.". * GPL-3.0+ gets "either version 3 of the License, or (at your option) any later" where it previously had nothing. * GPL-3.0-or-later gets "version 3 or any later version" -> "either version 3 of the License, or (at your option) any later version". * Every license I touch gets <...> around its URL, which has been in the license templates since f6c3453 (Automated, 2016-03-30, spdx#85) and similar. * Every license I touch gets the optional HTTPS from df182a1 (GPL-3.0: Optional HTTPS for outgoing links, 2017-10-19, spdx#450) and similar. I haven't bothered adding alt/optional to support our old forms, because I'm expecting folks in the wild to be copy/pasting from the FSF license text instead of our <standardLicenseHeader>s.

wking · 2017-12-29T06:01:34Z

src/GPL-3.0+.xml

@@ -9,12 +9,23 @@
 	  <notes>DEPRECATED: Use the license identifier GPL-3.0-or-later</notes>
      <standardLicenseHeader> Copyright (C) 
    <alt match=".+" name="copyright">&lt;year&gt; &lt;name of author&gt;</alt>
-    This program is free software:
-    you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the
-    Free Software Foundation, version. This program is distributed in the hope that it will be useful, but WITHOUT


This is the broken “, version.”.

wking · 2017-12-29T06:01:48Z

src/GPL-3.0+.xml

+        This program is free software: you can redistribute it and/or
+        modify it under the terms of the GNU General Public License
+        as published by the Free Software Foundation, either version
+        3 of the License, or (at your option) any later version.


This is the fixed version text.

wking · 2017-12-29T06:02:25Z

src/GPL-3.0-or-later.xml

@@ -9,15 +9,23 @@
    <standardLicenseHeader>
      Copyright (C)<alt name="copyright"
      match=".+">&lt;year&gt; &lt;name of author&gt;</alt>
-	<p>This program is free software: you can redistribute it and/or
-      	modify it under the terms of the GNU General Public License as
-	published by the Free Software Foundation, version 3 or any later version.</p>


This is the broken version text.

wking · 2017-12-29T06:02:35Z

src/GPL-3.0-or-later.xml

+        This program is free software: you can redistribute it and/or
+        modify it under the terms of the GNU General Public License
+        as published by the Free Software Foundation, either version
+        3 of the License, or (at your option) any later version.


This is the fixed version text.

wking · 2017-12-29T06:02:52Z

src/GPL-3.0.xml

@@ -14,14 +14,22 @@
    <standardLicenseHeader>
      Copyright (C)<alt name="copyright"
      match=".+">&lt;year&gt; &lt;name of author&gt;</alt>
-      This program is free software: you can redistribute it and/or
-      modify it under the terms of the GNU General Public License as
-      published by the Free Software Foundation, version. This program is


This is the broken version text.

wking · 2017-12-29T06:05:55Z

src/GPL-3.0.xml

+      <p>
+        This program is free software: you can redistribute it and/or
+        modify it under the terms of the GNU General Public License
+        as published by the Free Software Foundation, version 3.


This is the fixed-to-match GPL-3-only version text.

There are a number of forms of this grant in the Linux kernel, and we probably want to support more of them. But that is a bigger change than I wanted to bite off in this PR.

wking · 2017-12-29T17:31:08Z

And these header issues also affect the other GPL versions, but I thought I'd PR the 3.0 changes first. I'll follow up with 1.0 and 2.0 fixups if/when this PR lands.

jlovejoy · 2018-01-11T21:04:33Z

yikes, good catch! I'm not sure how no one noticed this all these years... I have seen the modified header that was included here, but it is not the standard one as recommended by the license!

jlovejoy · 2018-01-11T21:05:08Z

oh, I'm not really sure it matters if we fix deprecated licenses for this kind of thing? @goneall @bradleeedmondson - do you have opinions on that?
(will merge this shortly)

bradleeedmondson · 2018-01-11T21:44:44Z

I would say go ahead and fix. It will be wrong in everything before 3.1 and correct in 3.1, and consumers can draw their own conclusions from that (if they even notice).

wking · 2018-01-11T22:42:17Z

This same issue affects at least GPL-2.0-or-later as well (compare here and here). Should I file a similar PR for the 2.0 series, or do we want to wait for #581 (which will allow us to drop this copy/pasting entirely)? I think the trade offs are:

How much review time do we want to spend? A separate 2.0 PR would take more review time that would be wasted if we end up going with Allow standardLicenseHeader under text #581.
How quickly do we want the other headers fixed? Allow standardLicenseHeader under text #581 and its schema/ListedLicense: Punt license text into <text> #452 dependency are both WIP, and schema/ListedLicense: Punt license text into <text> #452 has been marinating for a few months. If we think those PRs are going to miss 3.1, we may want to spend the extra review time to handle a separate 2.0 PR.

goneall · 2018-01-12T17:37:47Z

Since the license is deprecated, I don't think we should spend too much time/effort. Since this PR is already created, I agree with @bradleeedmondson we should merge it. I wouldn't put in any additional effort until #581 is resolved.

wking · 2018-01-12T17:55:27Z

Since the license is deprecated…

GPL-2.0-or-later is not deprecated. Although I see I dropped GPL-3.0-or-later links by mistake. Compare:

license-list-XML/src/GPL-2.0-or-later.xml

Line 15 in 0e6a10d

or any later version.
license-list-XML/src/GPL-2.0-or-later.xml

Line 420 in 0e6a10d

2 of the License, or (at your option) any later version.

wking commented Dec 29, 2017

View reviewed changes

wking mentioned this pull request Dec 29, 2017

Allow standardLicenseHeader under text #581

Merged

jlovejoy self-assigned this Jan 11, 2018

jlovejoy added the legal issue label Jan 11, 2018

jlovejoy merged commit 4a48edb into spdx:master Jan 11, 2018

wking mentioned this pull request Jan 11, 2018

how to document errata #598

Closed

wking deleted the gpl-3.0-header branch January 11, 2018 22:34

wking mentioned this pull request Feb 8, 2018

GPL only issue raised by kernel maintainers on LKML #610

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GPL-3.0*: Copy the standard header from the license body #578

GPL-3.0*: Copy the standard header from the license body #578

wking commented Dec 29, 2017

wking Dec 29, 2017

wking Dec 29, 2017

wking Dec 29, 2017

wking Dec 29, 2017

wking Dec 29, 2017

wking Dec 29, 2017

wking commented Dec 29, 2017

jlovejoy commented Jan 11, 2018

jlovejoy commented Jan 11, 2018

bradleeedmondson commented Jan 11, 2018 via email

wking commented Jan 11, 2018

goneall commented Jan 12, 2018

wking commented Jan 12, 2018

GPL-3.0*: Copy the standard header from the license body #578

GPL-3.0*: Copy the standard header from the license body #578

Conversation

wking commented Dec 29, 2017

wking Dec 29, 2017

Choose a reason for hiding this comment

wking Dec 29, 2017

Choose a reason for hiding this comment

wking Dec 29, 2017

Choose a reason for hiding this comment

wking Dec 29, 2017

Choose a reason for hiding this comment

wking Dec 29, 2017

Choose a reason for hiding this comment

wking Dec 29, 2017

Choose a reason for hiding this comment

wking commented Dec 29, 2017

jlovejoy commented Jan 11, 2018

jlovejoy commented Jan 11, 2018

bradleeedmondson commented Jan 11, 2018 via email

wking commented Jan 11, 2018

goneall commented Jan 12, 2018

wking commented Jan 12, 2018