Skip to content
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

*GPL-3.0: Optional HTTPS for outgoing link #450

Merged
merged 3 commits into from
Dec 21, 2017

Conversation

wking
Copy link
Contributor

@wking wking commented Oct 19, 2017

The FSF seems to have bumped their outgoing links from HTTP to HTTPS between 2017-09-28 and 2017-09-30 (detail for each license in the commit messages). With this PR, I use <alt> tags to prefer the new canonical https://, but this will continue to match the old http://.

Spun off from github/choosealicense.com#543.

@wking
Copy link
Contributor Author

wking commented Oct 22, 2017

I've pushed a84bcf4268c89d changing from <alt> to the simpler <optional>, since <optional> is sufficient for these cases.

The FSF seems to have updated these between [1] and [2] (good catch
Mike [3]).  With the <optional> tags, I've preferred their new
canonical text, but this will continue to match the old HTTP form.

[1]: https://web.archive.org/web/20170908053542/https://www.gnu.org/licenses/gpl-3.0.txt
[2]: https://web.archive.org/web/20170930072152/https://www.gnu.org/licenses/gpl-3.0.txt
[3]: github/choosealicense.com#543 (comment)

Reported-by: Mike Linksvayer <[email protected]>
The FSF seems to have updated these between [1] and the present [2]
(good catch Mike [3]).  With the <optional> tags, I've preferred their
new canonical text, but this will continue to match the old HTTP form.

[1]: https://web.archive.org/web/20170711081959/https://www.gnu.org/licenses/agpl-3.0.txt
[2]: $ curl -si https://www.gnu.org/licenses/agpl-3.0.txt | grep -i '^date\|http'
     HTTP/1.1 200 OK
     Date: Thu, 19 Oct 2017 21:22:10 GMT
      Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
         along with this program.  If not, see <https://www.gnu.org/licenses/>.
     <https://www.gnu.org/licenses/>.
[3]: github/choosealicense.com#543 (comment)

Reported-by: Mike Linksvayer <[email protected]>
The FSF seems to have updated this between [1] and the present [2]
(good catch Mike [3]).  With the <optional> tags, I've preferred their
new canonical text, but this will continue to match the old HTTP form.

[1]: https://web.archive.org/web/20170928062729/https://www.gnu.org/licenses/lgpl-3.0.txt
[2]: $ curl -si https://www.gnu.org/licenses/lgpl-3.0.txt | grep -i '^date\|http'
     HTTP/1.1 200 OK
     Date: Thu, 19 Oct 2017 21:28:15 GMT
      Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
[3]: github/choosealicense.com#543 (comment)

Reported-by: Mike Linksvayer <[email protected]>
@goneall
Copy link
Member

goneall commented Nov 1, 2017

@wking Never mind - found a somewhat reasonable fix for the tooling - we can leave this as is.

@jlovejoy jlovejoy merged commit 8e98b20 into spdx:master Dec 21, 2017
@wking wking deleted the gpl-3.0-optional-https branch December 26, 2017 18:10
wking added a commit to wking/license-list-XML that referenced this pull request Dec 29, 2017
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.
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.

3 participants