Skip to content

add explanatory text re: -only and -or-later #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Mar 29, 2019
Merged

Conversation

jlovejoy
Copy link
Member

@jlovejoy jlovejoy commented Mar 8, 2019

add explanatory text re: -only and -or-later delineation in standard license header (versus default text in full copy of license). proposed solution to #617

jlovejoy added 2 commits March 7, 2019 19:45
add explanatory text re: -only and -or-later delineation in standard license header (versus default text in full copy of license). proposed solution to #617
@jlovejoy
Copy link
Member Author

jlovejoy commented Mar 8, 2019

@tieguy @theopenchainproject - want to have a look here?

@jlovejoy
Copy link
Member Author

jlovejoy commented Mar 8, 2019

if people think this explains thing well enough, then will add to other GNU licenses

@jlovejoy
Copy link
Member Author

jlovejoy commented Mar 8, 2019

have reached out to FSF to get their review as well

This license was released: June 1991 This refers to when this
GPL 2.0 only is being used (as opposed to GPLv2 or later).
This license was released: June 1991. This license identifier refers to when
GPL-2.0-only is being used as opposed to GPL-2.0-or-later. The option to use either that
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can I suggest replacing "The option to use... " with "The license header of individual files will indicate which of 'only' or 'later' applies to that particular file." I think that's the same intent, but if not, might want to clarify in a different way?

@shanecoughlan
Copy link

@tieguy @theopenchainproject - want to have a look here?

Looks like a good solution to me.

@jlovejoy
Copy link
Member Author

thanks @tieguy and @shanecoughlan - I've gotten some feedback from Donald at FSF as well, so just need to nail down that with him and make some edits here... hopefully soon!

update to Notes as per feedback from FSF
update Notes with feedback from FSF
@jlovejoy jlovejoy added this to the 3.5 release milestone Mar 27, 2019
@swinslow
Copy link
Member

Hi @jlovejoy, this looks good to me! Does this incorporate the changes to the notes that you were incorporating based on your discussion with FSF? If so, I'm glad to go ahead and push the merge button.

(i.e., GPL-2.0 or some later version such as GPL 3, a possible future GPL 4,
and so on). The license notice (usually at the head of the file) states which of these
applies to the code in the file.
<p>The example in the exhibit to the license shows the license notice for the "or later" approach.</p>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume there is no way for FSF to issue/approve an example that does not show the or-later approach?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not before we freeze the release for 3.5... which we're hoping to do today / Monday. =) But I haven't spoken with them, so maybe @jlovejoy can weigh in here.

@jlovejoy
Copy link
Member Author

@tieguy - note, on the SPDX license pages, we show the correct standard header (in terms of reflecting the only or or-later option) but the standard license text exhibit has the or-later language. This is what was confusing people.

I've now updated the language again to tighten up a bit and call out the above fact more explicitly. I've also added the rest of the licenses this applies to. I think we can go with this.

Also note: AGPL-1.0 and LGPL-3.0 don't have this issue, as they don't include the license notice exhibit

@jlovejoy jlovejoy self-assigned this Mar 29, 2019
@jlovejoy jlovejoy merged commit 23a7d33 into master Mar 29, 2019
@jlovejoy jlovejoy deleted the jlovejoy-or-later-only branch March 29, 2019 21:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants