New GNU identifiers #553

zvr · 2017-12-23T14:41:21Z

Here are the new GNU licenses, taking care of #542 and #543.

reformatted (pretty-printed) the 10 GNU licenses
copies of the 10 GNU licenses as -only and -or-later
added deprecation attrs and note to 10 GNU licenses
updated licenseId and name for 10 GNU -only licenses
updated licenseId and name for the 10 GNU -or-later licenses
fixing standardLicenseHeader in GNU -only licenses
fixing StandardLicenseHeader and note for the -or-later licenses

goneall

A few requested changes - the most important in the AGPL-3.0-or-later - updating the license header.

We could add the license headers for LGPL 3.0 - or it could be done next release.

Other comments are more style nits. For the notes in the deprecated licenses, I would suggest changing the wording to "lieu of the more explicit license identifier ...". I added that comment to the first 2 deprecated licenses, but not to all of the deprecated licenses.

goneall · 2017-12-24T00:46:25Z

src/AGPL-3.0-or-later.xml

+      Copyright (C)<alt name="copyright" match=".+">[year] [name of author]</alt>
+      This program is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, version 3. This program is distributed


The standard license header should have a version 3 or later.

Here is the text for the second paragraph in the license header from https://www.gnu.org/licenses/gpl-3.0.en.html:

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.

Can we have <optional> in standardLicenseHeader? If yes, I would put the "(at your option)" as optional.

Since this license ID is only associated with the "or-later", I think it should just be in the license header, not enclosed by optional.

BTW - optional and alt tags are allowed in the license header.

I agree that "or later" should be in the header.
I was talking about "(at your option)" which is not always there: "either version 3 of the License, or any later version." e.g. https://bat.mpp.mpg.de/?page=license

Ahhh - agree we should wrap the "(at your option)" in optional tags.

Added a pull request with the optional tags - once approved, we can merge it into this PR.

goneall · 2017-12-24T00:48:28Z

src/AGPL-3.0.xml

+    </crossRefs>
+    <notes>
+      DEPRECATED: Deprecated in lieu of more
+      explicit license identifier of AGPL-3.0-only


Nit - suggest minor wording change: " Deprecated in lieu of the more
explicit license identifier AGPL-3.0-only

I simply copied verbatim the text @jlovejoy used in #545.
Of course I'm fine with changing it.

BTW, there are a couple of licenses now with two distinct <notes> elements. I hope this is allowed...

The 2 notes element is allowed by the schema. I just verified the tools includes all notes in the license HTML files (and other output file formats).

@jlovejoy Feel free to update or ignore the comment on the notes wording change.

BTW, there are a couple of licenses now with two distinct <notes> elements. I hope this is allowed...

I think this is an XSD typo, because the intention with:

<element name="notes" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1"/>

seems to be to only allow a single entry. I'll file an XSD patch. I'm fine allowing multiple entries if we use <note>, but I think having multiple <notes> is strange.

I'll file an XSD patch

Ah, looks like I already covered this with the <choice> → <all> change in #452.

goneall · 2017-12-24T00:50:37Z

src/GFDL-1.1.xml

+    </crossRefs>
+    <notes>
+      DEPRECATED: Deprecated in lieu of more
+      explicit license identifier of GFDL-1.1-only


Same suggested wording change "lieu fo the more explicit license identifier ...

goneall · 2017-12-24T00:54:19Z

src/GPL-1.0-only.xml

+    <notes>
+      DEPRECATED: Deprecated in lieu of more
+      explicit license identifier of GPL-1.0-only
+    </notes>


This note should be replaced or removed

Of course. Sorry about that... too many files and variants at some point.

goneall · 2017-12-24T01:01:20Z

src/LGPL-2.0-only.xml

+    <notes>
+      This license was released: June 1991. This license has
+      been superseded by LGPL v2.1 This refers to when this
+      LGPL 2.0 only is being used (as opposed to "or later).


Missing end " after later

Note - this was an issue with the original text unrelated to the changes for the new license ID's

goneall · 2017-12-24T01:05:19Z

src/LGPL-3.0-only.xml

+    </crossRefs>
+    <notes>
+      This license was released: 29 June 2007. This refers to when
+      this LGPL 3.0 only is being used (as opposed to "or later).


Missing end " after later

goneall · 2017-12-24T01:06:21Z

src/LGPL-3.0-or-later.xml

+    <notes>
+      This license was released: 29 June 2007.
+    </notes>
+    <titleText>


Do we need the license header for LGPL 3.0 or later?

goneall · 2017-12-24T01:07:01Z

src/LGPL-3.0-only.xml

+        GNU LESSER GENERAL PUBLIC LICENSE<br></br>
+        Version 3, 29 June 2007
+      </p>
+    </titleText>


Do we need to add the standard license header?

wking · 2017-12-26T18:37:21Z

src/AGPL-3.0.xml

+      <crossRef>http://www.opensource.org/licenses/AGPL-3.0</crossRef>
+    </crossRefs>
+    <standardLicenseHeader>
+      Copyright (C)<alt name="copyright" match=".+">[year] [name of author]</alt>


Removing the space between (C) and <alt is a bug in your pretty-printer (see 7af2b40, #526, fixing another instance of this issue).

Update standard header for AGPL-3.0-or-later

Update GPL-1.0-only.xml

Generated with: $ sed -i 's/$([cC])$<alt/\1 <alt/' $(git grep -l '[cC])<alt') Like 7af2b40 (BSD-1-Clause: Add a space between "(c)" and "<year>", 2017-12-19, spdx#526), but with more licenses. The ones I'm fixing here were mostly broken by a0879e6 (reformatted (pretty-printed) the 10 GNU licenses, 2017-12-23, spdx#553).

wking · 2017-12-27T21:05:25Z

With this PR merged, can someone with write access delete branch new_GPL_identifiers?

Recover from some whitespace which was accidentally introduced by a0879e6 (reformatted (pretty-printed) the 10 GNU licenses, 2017-12-23, spdx#553).

Generated with: $ sed -i 's/$([cC])$<alt/\1 <alt/' $(git grep -l '[cC])<alt') Like 7af2b40 (BSD-1-Clause: Add a space between "(c)" and "<year>", 2017-12-19, spdx#526), but with more licenses. The ones I'm fixing here were mostly broken by a0879e6 (reformatted (pretty-printed) the 10 GNU licenses, 2017-12-23, spdx#553).

Similar to 30cfeab (Merge pull request spdx#553 from spdx/new_GPL_identifiers, 2017-12-27). On Thu, Dec 28, 2017 at 09:56:54AM -0800, Jilayne Lovejoy wrote [1]: > I am conferring with the FSF as to AGPL-1.0 - I will make the > appropriate changes as needed when I get feedback there. No further > discussion needed at this point. On Thu, Jan 11, 2018 at 09:56:18PM +0000, Jilayne Lovejoy wrote [2]: > ... I have confirmed that we should treat AGPL-1.0 that same) as we > suspected. I asked about adding an identifier for the AGPL-2.0, and Jilayne replied: On Thu, Jan 11, 2018 at 03:59:28PM -0800, Jilayne Lovejoy wrote [3]: > no need to add AGPLv2 - we vetted that conversation way back with > key folks who knew the history and it was decided not to add it > then. So, no need to revisit now! :) There's some list discussion around the AGPL-2.0 starting with [4]. My main concern would be preserving the bridge in case affero.org goes down and someone wants to transition an AGPL-1.0-or-later project to AGPL-3.0-or-later. To mitigate my concerns (and avoid surprising folks using AGPL-1.0-or-later), I've discussed the licenses available in a <notes> entry. And just to be safe, here's the whole license text from [5] in a form that will be available in the Git history: AFFERO GENERAL PUBLIC LICENSE Version 2, November 2007 Copyright © 2007 Affero Inc. 510 Third Street - Suite 225, San Francisco, CA 94107, USA This is version 2 of the Affero General Public License. It gives each licensee permission to distribute the Program or a work based on the Program (as defined in version 1 of the Affero GPL) under the GNU Affero General Public License, version 3 or any later version. If the Program was licensed under version 1 of the Affero GPL "or any later version", no additional obligations are imposed on any author or copyright holder of the Program as a result of a licensee's choice to follow this version 2 of the Affero GPL. [1]: spdx#542 (comment) [2]: spdx#542 (comment) [3]: spdx#542 (comment) [4]: https://lists.spdx.org/pipermail/spdx-legal/2013-November/001033.html Subject: GNU [?] Affero General Public License v1.0 Date: Tue Nov 5 19:39:29 UTC 2013 [5]: http://www.affero.org/agpl2.html

Recover from some whitespace which was accidentally introduced by a0879e6 (reformatted (pretty-printed) the 10 GNU licenses, 2017-12-23, spdx#553).

zvr added 7 commits December 23, 2017 14:02

reformatted (pretty-printed) the 10 GNU licenses

a0879e6

copies of the 10 GNU licenses as -only and -or-later

a5d240c

added deprecation attrs and note to 10 GNU licenses

39b2fce

updated licenseId and name for 10 GNU -only licenses

ad73c5e

updated licenseId and name for the 10 GNU -or-later licenses

08d2cdd

fixing standardLicenseHeader in GNU -only licenses

356c6b8

fixing StandardLicenseHeader and note for the -or-later licenses

831479f

zvr requested review from jlovejoy and goneall December 23, 2017 14:41

This was referenced Dec 23, 2017

deprecate GNU licenses with current identifiers #543

Closed

add GNU licenses with new identifiers (*-only and *-or-later) #542

Closed

goneall requested changes Dec 24, 2017

View reviewed changes

Update AGPL-3.0-or-later.xml

9ee18b0

wking reviewed Dec 26, 2017

View reviewed changes

goneall and others added 3 commits December 27, 2017 10:02

Update GPL-1.0-only.xml

efc4310

Merge pull request #554 from spdx/goneall-patch-1

0341c1b

Update standard header for AGPL-3.0-or-later

Merge pull request #561 from spdx/goneall-patch-2

6ec86b4

Update GPL-1.0-only.xml

goneall approved these changes Dec 27, 2017

View reviewed changes

jlovejoy merged commit 30cfeab into master Dec 27, 2017

This was referenced Dec 27, 2017

*: Fix missing space between (c) and <alt> #565

Merged

*: Collapse to a single note entry #566

Merged

Licenses MPL-2.0 and MPL-2.0-no-copyleft-exception use the same license text #441

Closed

wking mentioned this pull request Dec 27, 2017

Remove GPL paragraph from LLVM-exception #563

Merged

goneall deleted the new_GPL_identifiers branch December 27, 2017 21:16

wking mentioned this pull request Dec 28, 2017

GPL-2.0*: Remove erroneous whitespace from around <optional> #571

Merged

wking mentioned this pull request Jan 2, 2018

Simplify license expression grammar in Appendix IV spdx/spdx-spec#62

Closed

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

New GNU identifiers #553

New GNU identifiers #553

zvr commented Dec 23, 2017 •

edited

Loading

goneall left a comment

goneall Dec 24, 2017

goneall Dec 24, 2017 •

edited

Loading

zvr Dec 24, 2017 •

edited

Loading

goneall Dec 24, 2017

zvr Dec 25, 2017

goneall Dec 26, 2017

goneall Dec 27, 2017

goneall Dec 24, 2017

zvr Dec 24, 2017 •

edited

Loading

goneall Dec 24, 2017 •

edited

Loading

goneall Dec 24, 2017

wking Dec 26, 2017

wking Dec 26, 2017

goneall Dec 24, 2017

goneall Dec 24, 2017

zvr Dec 24, 2017

goneall Dec 24, 2017

goneall Dec 24, 2017

goneall Dec 24, 2017

goneall Dec 24, 2017

goneall Dec 24, 2017

wking Dec 26, 2017

wking commented Dec 27, 2017

New GNU identifiers #553

New GNU identifiers #553

Conversation

zvr commented Dec 23, 2017 • edited Loading

goneall left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

goneall Dec 24, 2017 • edited Loading

Choose a reason for hiding this comment

zvr Dec 24, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zvr Dec 24, 2017 • edited Loading

Choose a reason for hiding this comment

goneall Dec 24, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wking commented Dec 27, 2017

zvr commented Dec 23, 2017 •

edited

Loading

goneall Dec 24, 2017 •

edited

Loading

zvr Dec 24, 2017 •

edited

Loading

zvr Dec 24, 2017 •

edited

Loading

goneall Dec 24, 2017 •

edited

Loading