Le Wed, Jan 12, 2011 at 09:09:09PM +0200, Lars Wirzenius a écrit : > > I think I agree with your proposal to link to SPDX. Alternatively, we > could collect the licenses as attachments to the spec, or point at the > ones on the OSI site. I'd rather avoid attaching things, but otherwise > I'm fine with anything. > > Charles, would you be willing to provide a patch to link to SPDX and fix > the FreeBSD shortname issue? I seem to have shown myself to be a bit > careless with this license thing, and I make sloppy edits (this is > probably because I find this part to be the least interesting one, and > one that I've dreaded for months).
I just realised that the SPDX site is not yet ready as their license links point to empty pages: http://spdx.org/licenses/ I attached three patches. The first removes the FreeBSD license, the second adds missing links to upstream pages, and the last points all the links to SPDX instead. I think that we should wait before applying the third and use the second in the meantime. In addition I noticed a minor mismatch between the SPDX license list page and the SPDX license spreadsheet: in the first the Apache license is ‘ASL’, and in the second it is ‘Apache’. The third patch may therefore need some adjustment, depending on how SPDX resolves this. Have a nice day, -- Charles Plessy Tsurumi, Kanagawa, Japan
>From 6150c9326af07608917643949cf19f2d45a994ad Mon Sep 17 00:00:00 2001 From: Charles Plessy <[email protected]> Date: Thu, 13 Jan 2011 08:38:05 +0900 Subject: [PATCH 1/3] Removed FreeBSD license, identical to BSD-2-clause in SPDX. --- dep5.mdwn | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dep5.mdwn b/dep5.mdwn index 2006864..5c65cc9 100644 --- a/dep5.mdwn +++ b/dep5.mdwn @@ -388,7 +388,6 @@ to plainer version (e.g., "2.0.0" is considered equal to "2.0" and "2"). `BSD-2-clause` | Berkeley software distribution license, 2-clause version `BSD-3-clause` | Berkeley software distribution license, 3-clause version `BSD-4-clause` | Berkeley software distribution license, 4-clause version -`FreeBSD` | FreeBSD Project license `ISC` | [Internet Software Consortium](http://opensource.org/licenses/isc-license.txt)'s license, sometimes also known as the OpenBSD License `CC-BY` | Creative Commons Attribution license `CC-BY-SA` | Creative Commons Attribution Share Alike license -- 1.7.2.3
>From 43a94c2c81bcf1053f405084b3e42b17f2e37ab2 Mon Sep 17 00:00:00 2001 From: Charles Plessy <[email protected]> Date: Thu, 13 Jan 2011 08:39:06 +0900 Subject: [PATCH 2/3] Added missing links to licences. --- dep5.mdwn | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dep5.mdwn b/dep5.mdwn index 5c65cc9..e3f0f2f 100644 --- a/dep5.mdwn +++ b/dep5.mdwn @@ -385,31 +385,31 @@ to plainer version (e.g., "2.0.0" is considered equal to "2.0" and "2"). **keyword** | **meaning** `Apache` | Apache license. For versions, consult the [Apache Software Foundation](http://www.apache.org/licenses/). `Artistic` | Artistic license. For versions, consult the [Perl Foundation](http://www.perlfoundation.org/legal) -`BSD-2-clause` | Berkeley software distribution license, 2-clause version -`BSD-3-clause` | Berkeley software distribution license, 3-clause version -`BSD-4-clause` | Berkeley software distribution license, 4-clause version +`BSD-2-clause` | Berkeley software distribution license, [2-clause version](http://www.freebsd.org/copyright/freebsd-license.html) +`BSD-3-clause` | Berkeley software distribution license, [3-clause version](http://www.opensource.org/licenses/bsd-license.php) +`BSD-4-clause` | Berkeley software distribution license, [4-clause version](http://www.freebsd.org/copyright/license.html) `ISC` | [Internet Software Consortium](http://opensource.org/licenses/isc-license.txt)'s license, sometimes also known as the OpenBSD License -`CC-BY` | Creative Commons Attribution license -`CC-BY-SA` | Creative Commons Attribution Share Alike license -`CC-BY-ND` | Creative Commons Attribution No Derivatives -`CC-BY-NC` | Creative Commons Attribution Non-Commercial -`CC-BY-NC-SA` | Creative Commons Attribution Non-Commercial Share Alike -`CC-BY-NC-ND` | Creative Commons Attribution Non-Commercial No Derivatives -`CC0` | Creative Commons Universal waiver -`CDDL` | Common Development and Distribution License. For versions, consult [Sun Microsystems](http://www.sun.com/cddl/). -`CPL` | IBM Common Public License. For versions, consult the [IBM Common Public License (CPL) Frequently asked questions](http://www.ibm.com/developerworks/library/os-cplfaq.html). +`CC-BY` | Creative Commons [Attribution](http://creativecommons.org/licenses/by/3.0/) license +`CC-BY-SA` | Creative Commons [Attribution Share Alike](http://creativecommons.org/licenses/by-sa/3.0/) license +`CC-BY-ND` | Creative Commons [Attribution No Derivatives](http://creativecommons.org/licenses/by-nd/3.0/) license +`CC-BY-NC` | Creative Commons [Attribution Non-Commercial](http://creativecommons.org/licenses/by-nc/3.0/) license +`CC-BY-NC-SA` | Creative Commons [Attribution Non-Commercial Share Alike](http://creativecommons.org/licenses/by-nc-sa/3.0/) license +`CC-BY-NC-ND` | Creative Commons [Attribution Non-Commercial No Derivatives](http://creativecommons.org/licenses/by-nc-nd/3.0/) license +`CC0` | Creative Commons [Universal waiver](http://creativecommons.org/license/zero/) +`CDDL` | Common Development and Distribution License. For versions, consult [Sun Microsystems](http://www.sun.com/cddl/) +`CPL` | IBM Common Public License. For versions, consult the [IBM Common Public License (CPL) Frequently asked questions](http://www.ibm.com/developerworks/library/os-cplfaq.html) `EFL` | The Eiffel Forum License. For versions, consult the [Open Source Initiative](http://www.opensource.org/licenses/eiffel.html) -`Expat` | The Expat license -`GPL` | GNU General Public License -`LGPL` | GNU Lesser General Public License, (GNU Library General Public License for versions lower than 2.1) -`GFDL` | GNU Free Documentation License +`Expat` | The [Expat](http://www.jclark.com/xml/copying.txt) license +`GPL` | GNU [General Public License](http://www.gnu.org/copyleft/gpl.html) +`LGPL` | GNU [Lesser General Public License](http://www.gnu.org/licenses/lgpl.html) (GNU Library General Public License for versions lower than 2.1) +`GFDL` | [GNU Free Documentation License](http://www.gnu.org/licenses/fdl.html) `GFDL-NIV` | GNU Free Documentation License, with no invariant sections -`LPPL` | LaTeX Project Public License +`LPPL` | [LaTeX Project Public License](http://www.latex-project.org/lppl/) `MPL` | Mozilla Public License. For versions, consult [Mozilla.org](http://www.mozilla.org/MPL) -`Perl` | Perl license (use "GPL-1+ or Artistic-1" instead) +`Perl` | [Perl](http://dev.perl.org/licenses/) license (use "GPL-1+ or Artistic-1" instead) `Python-CNRI` | Python Software Foundation license. For versions, consult the [Python Software Foundation](http://www.python.org/psf/license/) -`QPL` | Q Public License -`W3C` | W3C Software License. For more information, consult the [W3C Intellectual Rights FAQ](http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620S) and the [20021231 W3C Software notice and license](http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231) +`QPL` | [Q Public License](http://doc.trolltech.com/3.0/license.html) +`W3C` | W3C Software License. For more information, consult the [W3C Intellectual Rights FAQ](http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620) and the [20021231 W3C Software notice and license](http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231) `Zlib` | [zlib/libpng license](http://www.opensource.org/licenses/zlib-license.php) `Zope` | Zope Public License. For versions, consult [Zope.org](http://www.zope.org/Resources/License/) """]] -- 1.7.2.3
>From 0731929e5f622df58a57ab6803f0e6ae532c67c3 Mon Sep 17 00:00:00 2001 From: Charles Plessy <[email protected]> Date: Thu, 13 Jan 2011 09:02:35 +0900 Subject: [PATCH 3/3] License links to SPDX, when available. --- dep5.mdwn | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dep5.mdwn b/dep5.mdwn index e3f0f2f..6b19856 100644 --- a/dep5.mdwn +++ b/dep5.mdwn @@ -383,35 +383,35 @@ to plainer version (e.g., "2.0.0" is considered equal to "2.0" and "2"). [[!table data=""" **keyword** | **meaning** -`Apache` | Apache license. For versions, consult the [Apache Software Foundation](http://www.apache.org/licenses/). -`Artistic` | Artistic license. For versions, consult the [Perl Foundation](http://www.perlfoundation.org/legal) -`BSD-2-clause` | Berkeley software distribution license, [2-clause version](http://www.freebsd.org/copyright/freebsd-license.html) -`BSD-3-clause` | Berkeley software distribution license, [3-clause version](http://www.opensource.org/licenses/bsd-license.php) -`BSD-4-clause` | Berkeley software distribution license, [4-clause version](http://www.freebsd.org/copyright/license.html) -`ISC` | [Internet Software Consortium](http://opensource.org/licenses/isc-license.txt)'s license, sometimes also known as the OpenBSD License -`CC-BY` | Creative Commons [Attribution](http://creativecommons.org/licenses/by/3.0/) license -`CC-BY-SA` | Creative Commons [Attribution Share Alike](http://creativecommons.org/licenses/by-sa/3.0/) license -`CC-BY-ND` | Creative Commons [Attribution No Derivatives](http://creativecommons.org/licenses/by-nd/3.0/) license -`CC-BY-NC` | Creative Commons [Attribution Non-Commercial](http://creativecommons.org/licenses/by-nc/3.0/) license -`CC-BY-NC-SA` | Creative Commons [Attribution Non-Commercial Share Alike](http://creativecommons.org/licenses/by-nc-sa/3.0/) license -`CC-BY-NC-ND` | Creative Commons [Attribution Non-Commercial No Derivatives](http://creativecommons.org/licenses/by-nc-nd/3.0/) license +`Apache` | Apache license [1.0](http://spdx.org/licenses/ASL-1.0), [2.0](http://spdx.org/licenses/ASL-2.0). +`Artistic` | Artistic license [1.0](http://spdx.org/licenses/Artistic-1.0), [2.0](http://spdx.org/licenses/Artistic-2.0). +`BSD-2-clause` | Berkeley software distribution license, [2-clause version](http://spdx.org/licenses/BSD-2-Clause). +`BSD-3-clause` | Berkeley software distribution license, [3-clause version](http://spdx.org/licenses/BSD-3-Clause). +`BSD-4-clause` | Berkeley software distribution license, [4-clause version](http://spdx.org/licenses/BSD-4-Clause). +`ISC` | [Internet Software Consortium](http://spdx.org/licenses/ISC)'s license, sometimes also known as the OpenBSD License. +`CC-BY` | Creative Commons Attribution license [1.0](http://spdx.org/licenses/CC-BY-1.0), [2.0](http://spdx.org/licenses/CC-BY-2.0), [2.5](http://spdx.org/licenses/CC-BY-2.5), [3.0](http://spdx.org/licenses/CC-BY-3.0). +`CC-BY-SA` | Creative Commons Attribution Share Alike license [1.0](http://spdx.org/licenses/CC-BY-SA-1.0), [2.0](http://spdx.org/licenses/CC-BY-SA-2.0), [2.5](http://spdx.org/licenses/CC-BY-SA-2.5), [3.0](http://spdx.org/licenses/CC-BY-SA-3.0). +`CC-BY-ND` | Creative Commons Attribution No Derivatives license [1.0](http://spdx.org/licenses/CC-BY-ND-1.0), [2.0](http://spdx.org/licenses/CC-BY-ND-2.0), [2.5](http://spdx.org/licenses/CC-BY-ND-2.5), [3.0](http://spdx.org/licenses/CC-BY-ND-3.0). +`CC-BY-NC` | Creative Commons Attribution Non-Commercial license [1.0](http://spdx.org/licenses/CC-BY-NC-1.0), [2.0](http://spdx.org/licenses/CC-BY-NC-2.0), [2.5](http://spdx.org/licenses/CC-BY-NC-2.5), [3.0](http://spdx.org/licenses/CC-BY-NC-3.0). +`CC-BY-NC-SA` | Creative Commons Attribution Non-Commercial Share Alike license [1.0](http://spdx.org/licenses/CC-BY-NC-SA-1.0), [2.0](http://spdx.org/licenses/CC-BY-NC-SA-2.0), [2.5](http://spdx.org/licenses/CC-BY-NC-SA-2.5), [3.0](http://spdx.org/licenses/CC-BY-NC-SA-3.0). +`CC-BY-NC-ND` | Creative Commons Attribution Non-Commercial No Derivatives license [1.0](http://spdx.org/licenses/CC-BY-NC-ND-1.0), [2.0](http://spdx.org/licenses/CC-BY-NC-ND-2.0), [2.5](http://spdx.org/licenses/CC-BY-NC-ND-2.5), [3.0](http://spdx.org/licenses/CC-BY-NC-ND-3.0). `CC0` | Creative Commons [Universal waiver](http://creativecommons.org/license/zero/) -`CDDL` | Common Development and Distribution License. For versions, consult [Sun Microsystems](http://www.sun.com/cddl/) -`CPL` | IBM Common Public License. For versions, consult the [IBM Common Public License (CPL) Frequently asked questions](http://www.ibm.com/developerworks/library/os-cplfaq.html) -`EFL` | The Eiffel Forum License. For versions, consult the [Open Source Initiative](http://www.opensource.org/licenses/eiffel.html) +`CDDL` | [Common Development and Distribution License](http://spdx.org/licenses/CDDL). +`CPL` | [IBM Common Public License](http://spdx.org/licenses/CPL-1.0). +`EFL` | The Eiffel Forum License [1.0](http://spdx.org/licenses/EPL-1.0). `Expat` | The [Expat](http://www.jclark.com/xml/copying.txt) license -`GPL` | GNU [General Public License](http://www.gnu.org/copyleft/gpl.html) -`LGPL` | GNU [Lesser General Public License](http://www.gnu.org/licenses/lgpl.html) (GNU Library General Public License for versions lower than 2.1) -`GFDL` | [GNU Free Documentation License](http://www.gnu.org/licenses/fdl.html) +`GPL` | GNU General Public License [1.0](http://spdx.org/licenses/GPL-1.0) [2.0](http://spdx.org/licenses/GPL-2.0) [3.0](http://spdx.org/licenses/GPL-3.0). +`LGPL` | GNU Lesser General Public License [2.1](http://spdx.org/licenses/LGPL-2.1), [3.0](http://spdx.org/licenses/LGPL-3.0) or GNU Library General Public License [1.0](http://spdx.org/licenses/LGPL-1.0) [2.0](http://spdx.org/licenses/LGPL-2.0). +`GFDL` | [GNU Free Documentation License](http://spdx.org/licenses/FDL-1.0). `GFDL-NIV` | GNU Free Documentation License, with no invariant sections -`LPPL` | [LaTeX Project Public License](http://www.latex-project.org/lppl/) -`MPL` | Mozilla Public License. For versions, consult [Mozilla.org](http://www.mozilla.org/MPL) +`LPPL` | [LaTeX Project Public License](http://www.latex-project.org/lppl/) [1.0](http://spdx.org/licenses/LPPL-1.0), [1.1](http://spdx.org/licenses/LPPL-1.1), [1.2](http://spdx.org/licenses/LPPL-1.2), [1.3c](http://spdx.org/licenses/LPPL-1.3c), +`MPL` | Mozilla Public License [1.1](http://spdx.org/licenses/MPL-1.1). `Perl` | [Perl](http://dev.perl.org/licenses/) license (use "GPL-1+ or Artistic-1" instead) -`Python-CNRI` | Python Software Foundation license. For versions, consult the [Python Software Foundation](http://www.python.org/psf/license/) -`QPL` | [Q Public License](http://doc.trolltech.com/3.0/license.html) -`W3C` | W3C Software License. For more information, consult the [W3C Intellectual Rights FAQ](http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620) and the [20021231 W3C Software notice and license](http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231) -`Zlib` | [zlib/libpng license](http://www.opensource.org/licenses/zlib-license.php) -`Zope` | Zope Public License. For versions, consult [Zope.org](http://www.zope.org/Resources/License/) +`Python-CNRI` | [Python license](http://spdx.org/licenses/Python-CNRI). +`QPL` | Q Public License [1.0](http://spdx.org/licenses/QPL-1.0). +`W3C` | [W3C Software License](http://spdx.org/licenses/W3C). For more information, consult the [W3C Intellectual Rights FAQ](http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620). +`Zlib` | [zlib/libpng license](http://spdx.org/licenses/Zlib). +`Zope` | Zope Public License [1.0](http://spdx.org/licenses/ZPL-1.0), [2.0](http://spdx.org/licenses/ZPL-2.0), [2.1](http://spdx.org/licenses/ZPL-2.1). """]] There are [many versions of the MIT -- 1.7.2.3
