From 9e6528c68f8886da6b977d0ad28107113a7666db Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Mon, 22 Aug 2016 18:25:24 +0100 Subject: [PATCH] sort license properties in the order permissions > conditions > limitations (fixes #387) --- _data/rules.yml | 34 ++++++++++++++++---------------- _licenses/afl-3.0.txt | 9 +++++---- _licenses/agpl-3.0.txt | 15 +++++++------- _licenses/apache-2.0.txt | 9 +++++---- _licenses/artistic-2.0.txt | 9 +++++---- _licenses/bsd-2-clause.txt | 7 ++++--- _licenses/bsd-3-clause-clear.txt | 10 +++++----- _licenses/bsd-3-clause.txt | 7 ++++--- _licenses/cc-by-4.0.txt | 9 +++++---- _licenses/cc-by-sa-4.0.txt | 11 ++++++----- _licenses/cc0-1.0.txt | 1 + _licenses/epl-1.0.txt | 11 ++++++----- _licenses/eupl-1.1.txt | 15 +++++++------- _licenses/gpl-2.0.txt | 13 ++++++------ _licenses/gpl-3.0.txt | 13 ++++++------ _licenses/isc.txt | 7 ++++--- _licenses/lgpl-2.1.txt | 13 ++++++------ _licenses/lgpl-3.0.txt | 14 ++++++------- _licenses/lppl-1.3c.txt | 11 ++++++----- _licenses/mit.txt | 7 ++++--- _licenses/mpl-2.0.txt | 11 ++++++----- _licenses/ms-pl.txt | 8 ++++---- _licenses/ms-rl.txt | 12 +++++------ _licenses/ofl-1.1.txt | 8 ++++---- _licenses/osl-3.0.txt | 14 ++++++------- _licenses/unlicense.txt | 1 + _licenses/wtfpl.txt | 4 ++-- _licenses/zlib.txt | 9 +++++---- 28 files changed, 156 insertions(+), 136 deletions(-) diff --git a/_data/rules.yml b/_data/rules.yml index 3cf3145..738fd5f 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -1,20 +1,3 @@ -conditions: -- description: Include a copy of the license and copyright notice with the code. - label: License and Copyright Notice - tag: include-copyright -- description: Indicate changes made to the code. - label: State Changes - tag: document-changes -- description: Source code must be made available when distributing the software. - label: Disclose Source - tag: disclose-source -- description: Users who interact with the software via network are given the right to receive a copy of the corresponding source code. - label: Network Use is Distribution - tag: network-use-disclose -- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. - label: Same License - tag: same-license - permissions: - description: This software and derivatives may be used for commercial purposes. label: Commercial Use @@ -32,6 +15,23 @@ permissions: label: Patent Use tag: patent-use +conditions: +- description: Include a copy of the license and copyright notice with the code. + label: License and Copyright Notice + tag: include-copyright +- description: Indicate changes made to the code. + label: State Changes + tag: document-changes +- description: Source code must be made available when distributing the software. + label: Disclose Source + tag: disclose-source +- description: Users who interact with the software via network are given the right to receive a copy of the corresponding source code. + label: Network Use is Distribution + tag: network-use-disclose +- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. + label: Same License + tag: same-license + limitations: - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. label: Trademark Use diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index abb76e3..e1bf41c 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -7,10 +7,6 @@ description: The Academic Free License is a variant of the Open Software License how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Files licensed under AFL 3.0 must also include the notice "Licensed under the Academic Free License version 3.0" adjacent to the copyright notice. -conditions: - - include-copyright - - document-changes - permissions: - commercial-use - modifications @@ -18,11 +14,16 @@ permissions: - private-use - patent-use +conditions: + - include-copyright + - document-changes + limitations: - trademark-use - no-liability --- + Academic Free License (“AFL”) v. 3.0 This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index 584c35f..0fe30ed 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -12,13 +12,6 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license. -conditions: - - include-copyright - - document-changes - - disclose-source - - network-use-disclose - - same-license - permissions: - commercial-use - modifications @@ -26,8 +19,16 @@ permissions: - patent-use - private-use +conditions: + - include-copyright + - document-changes + - disclose-source + - network-use-disclose + - same-license + limitations: - no-liability + --- GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index fdbb554..19aa398 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -17,10 +17,6 @@ using: - Apache: https://svn.apache.org/viewvc/httpd/httpd/trunk/LICENSE?view=markup - Swift: https://github.com/apple/swift/blob/master/LICENSE.txt -conditions: - - include-copyright - - document-changes - permissions: - commercial-use - modifications @@ -28,9 +24,14 @@ permissions: - patent-use - private-use +conditions: + - include-copyright + - document-changes + limitations: - trademark-use - no-liability + --- Apache License diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt index 0b4ddda..6bfd6ea 100644 --- a/_licenses/artistic-2.0.txt +++ b/_licenses/artistic-2.0.txt @@ -8,10 +8,6 @@ description: Heavily favored by the Perl community, the Artistic license require how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code, and copy the text of the license into the file. Do not replace the copyright notice (year, author), which refers to the license itself, not the licensed project. -conditions: - - include-copyright - - document-changes - permissions: - commercial-use - modifications @@ -19,9 +15,14 @@ permissions: - patent-use - private-use +conditions: + - include-copyright + - document-changes + limitations: - no-liability - trademark-use + --- The Artistic License 2.0 diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index 42eb9af..8cc23e1 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -8,17 +8,18 @@ description: A permissive license that comes in two variants, the BSD 3-Clause License that explicitly does not grant any patent rights. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work. -source: https://spdx.org/licenses/BSD-3-Clause-Clear.html - -conditions: - - include-copyright - permissions: - commercial-use - modifications - distribution - private-use +conditions: + - include-copyright + limitations: - no-liability - patent-use + --- The Clear BSD License diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index caf6a7c..a744acd 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -7,17 +7,18 @@ description: A permissive license similar to the GNU GPLv3 license. Insert the word “Lesser” before “General” in all three places in the boilerplate notice to make sure that you refer to the GNU LGPLv3 and not the GNU GPLv3. -conditions: - - include-copyright - - disclose-source - - document-changes - - same-license - - permissions: - commercial-use - modifications @@ -26,8 +19,15 @@ permissions: - patent-use - private-use +conditions: + - include-copyright + - disclose-source + - document-changes + - same-license + limitations: - no-liability + --- GNU LESSER GENERAL PUBLIC LICENSE diff --git a/_licenses/lppl-1.3c.txt b/_licenses/lppl-1.3c.txt index 98b945a..7d2ee84 100644 --- a/_licenses/lppl-1.3c.txt +++ b/_licenses/lppl-1.3c.txt @@ -9,19 +9,20 @@ how: To use this license, place in each of the components of your work both an e note: An example boilerplate and more information about how to use the license can be found at the end of the license. -conditions: - - include-copyright - - document-changes - - disclose-source - permissions: - commercial-use - modifications - distribution - private-use +conditions: + - include-copyright + - document-changes + - disclose-source + limitations: - no-liability + --- The LaTeX Project Public License diff --git a/_licenses/mit.txt b/_licenses/mit.txt index df9713a..7fefea5 100644 --- a/_licenses/mit.txt +++ b/_licenses/mit.txt @@ -14,17 +14,18 @@ using: - .NET Core: https://github.com/dotnet/corefx/blob/master/LICENSE - Rails: https://github.com/rails/rails/blob/master/activerecord/MIT-LICENSE -conditions: - - include-copyright - permissions: - commercial-use - modifications - distribution - private-use +conditions: + - include-copyright + limitations: - no-liability + --- MIT License diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index c637032..22d075b 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -16,11 +16,6 @@ using: - TimelineJS3: https://github.com/NUKnightLab/TimelineJS3/blob/master/LICENSE - LibreOffice: https://cgit.freedesktop.org/libreoffice/core/tree/COPYING.MPL -conditions: - - disclose-source - - include-copyright - - same-license - permissions: - commercial-use - modifications @@ -28,9 +23,15 @@ permissions: - patent-use - private-use +conditions: + - disclose-source + - include-copyright + - same-license + limitations: - no-liability - trademark-use + --- Mozilla Public License Version 2.0 diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt index 6111486..8505a1b 100644 --- a/_licenses/ms-pl.txt +++ b/_licenses/ms-pl.txt @@ -1,16 +1,12 @@ --- title: Microsoft Public License spdx-id: MS-PL - source: http://opensource.org/licenses/ms-pl description: An open source license with a patent grant. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -conditions: - - include-copyright - permissions: - commercial-use - modifications @@ -18,9 +14,13 @@ permissions: - patent-use - private-use +conditions: + - include-copyright + limitations: - no-liability - trademark-use + --- Microsoft Public License (MS-PL) diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index f3e610a..8619ffc 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -1,18 +1,12 @@ --- title: Microsoft Reciprocal License spdx-id: MS-RL - source: http://opensource.org/licenses/ms-rl description: An open source license with a patent grant similar to the Microsoft Public License, with the additional condition that any source code for any derived file be provided under this license. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -conditions: - - disclose-source - - include-copyright - - same-license - permissions: - commercial-use - modifications @@ -20,9 +14,15 @@ permissions: - patent-use - private-use +conditions: + - disclose-source + - include-copyright + - same-license + limitations: - no-liability - trademark-use + --- Microsoft Reciprocal License (MS-RL) diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.txt index 1ab2d8d..9b22a4a 100644 --- a/_licenses/ofl-1.1.txt +++ b/_licenses/ofl-1.1.txt @@ -10,16 +10,16 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: This license doesn't require source provision, but recommends it. All files derived from OFL files must remain licensed under the OFL. -conditions: - - include-copyright - - same-license - permissions: - private-use - commercial-use - modifications - distribution +conditions: + - include-copyright + - same-license + limitations: - no-liability diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index 5393101..a47570b 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -14,13 +14,6 @@ using: - Magento 2: https://github.com/magento/magento2/blob/develop/LICENSE.txt - Restyaboard: https://github.com/RestyaPlatform/board/blob/master/LICENSE.txt -conditions: - - include-copyright - - disclose-source - - document-changes - - network-use-disclose - - same-license - permissions: - commercial-use - distribution @@ -28,6 +21,13 @@ permissions: - patent-use - private-use +conditions: + - include-copyright + - disclose-source + - document-changes + - network-use-disclose + - same-license + limitations: - trademark-use - no-liability diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 9cccaa3..c8a0563 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -23,6 +23,7 @@ conditions: [] limitations: - no-liability + --- This is free and unencumbered software released into the public domain. diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.txt index e47419e..854bdb6 100644 --- a/_licenses/wtfpl.txt +++ b/_licenses/wtfpl.txt @@ -7,14 +7,14 @@ description: The easiest license out there. It gives the user permissions to do how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. -conditions: [] - permissions: - commercial-use - modifications - distribution - private-use +conditions: [] + limitations: [] --- diff --git a/_licenses/zlib.txt b/_licenses/zlib.txt index b8fd11e..01ba76e 100644 --- a/_licenses/zlib.txt +++ b/_licenses/zlib.txt @@ -7,18 +7,19 @@ description: A short permissive license, compatible with GPL. Requires altered s how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. -conditions: - - include-copyright - - document-changes - permissions: - commercial-use - modifications - distribution - private-use +conditions: + - include-copyright + - document-changes + limitations: - no-liability + --- zlib License