From 6fc9e6b8f255680c79666c695a47f6e318a354dc Mon Sep 17 00:00:00 2001 From: Mark Atwood Date: Fri, 11 Sep 2020 20:27:55 +0000 Subject: [PATCH 01/71] add mit-0 license --- _licenses/mit-0.txt | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 _licenses/mit-0.txt diff --git a/_licenses/mit-0.txt b/_licenses/mit-0.txt new file mode 100644 index 0000000..b65107d --- /dev/null +++ b/_licenses/mit-0.txt @@ -0,0 +1,47 @@ +--- +title: MIT No Attribution +spdx-id: MIT-0 +featured: true +hidden: false + +description: A short and simple permissive license with no conditions, not even requiring preservation of copyright and license notices. Licensed works, modifications, and larger works may be distributed under different terms and without source code. + +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. + +using: + - AWS: https://github.com/aws/mit-0/blob/master/MIT-0 + - AWS User Guides: https://github.com/awsdocs/amazon-ec2-user-guide/blob/master/LICENSE-SAMPLECODE + - AWS Docs: https://github.com/awsdocs/aws-cloud9-user-guide/blob/master/LICENSE-SAMPLECODE + +permissions: + - commercial-use + - modifications + - distribution + - private-use + +conditions: [] + +limitations: + - liability + - warranty + +--- + +MIT No Attribution + +Copyright [year] [fullname] + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 90657c60f5334842a14998699a033fbce65aa320 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 13 Sep 2020 15:52:07 -0700 Subject: [PATCH 02/71] defaults, examples --- _licenses/mit-0.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/_licenses/mit-0.txt b/_licenses/mit-0.txt index b65107d..17b13d5 100644 --- a/_licenses/mit-0.txt +++ b/_licenses/mit-0.txt @@ -1,17 +1,13 @@ --- title: MIT No Attribution spdx-id: MIT-0 -featured: true -hidden: false description: A short and simple permissive license with no conditions, not even requiring preservation of copyright and license notices. Licensed works, modifications, and larger works may be distributed under different terms and without source code. 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. using: - - AWS: https://github.com/aws/mit-0/blob/master/MIT-0 - - AWS User Guides: https://github.com/awsdocs/amazon-ec2-user-guide/blob/master/LICENSE-SAMPLECODE - - AWS Docs: https://github.com/awsdocs/aws-cloud9-user-guide/blob/master/LICENSE-SAMPLECODE + - SOIL2: https://github.com/SpartanJ/SOIL2/blob/master/LICENSE permissions: - commercial-use From 33a6799a1d9f98ed2b7951cc4fa1437463799634 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 13 Sep 2020 18:24:10 -0700 Subject: [PATCH 03/71] Don't trigger CI twice for PRs --- .github/workflows/test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e28c56f..c71740e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,10 @@ name: Build and Test -on: [push, pull_request] +on: + push: + branches: [gh-pages] + pull_request: + branches: [gh-pages] jobs: test: From a5e495914c0df227e0ecd641852788c54586a04c Mon Sep 17 00:00:00 2001 From: ObserverOfTime Date: Sat, 3 Oct 2020 11:34:50 +0300 Subject: [PATCH 04/71] Convert license `using` array to map --- README.md | 2 +- _licenses/0bsd.txt | 6 +++--- _licenses/apache-2.0.txt | 6 +++--- _licenses/bsd-2-clause.txt | 6 +++--- _licenses/bsd-3-clause.txt | 6 +++--- _licenses/bsd-4-clause.txt | 6 +++--- _licenses/bsl-1.0.txt | 6 +++--- _licenses/cc-by-4.0.txt | 6 +++--- _licenses/cc-by-sa-4.0.txt | 6 +++--- _licenses/cc0-1.0.txt | 6 +++--- _licenses/cecill-2.1.txt | 6 +++--- _licenses/ecl-2.0.txt | 6 +++--- _licenses/epl-1.0.txt | 6 +++--- _licenses/epl-2.0.txt | 6 +++--- _licenses/eupl-1.2.txt | 6 +++--- _licenses/gpl-2.0.txt | 6 +++--- _licenses/gpl-3.0.txt | 6 +++--- _licenses/isc.txt | 6 +++--- _licenses/mit.txt | 6 +++--- _licenses/mpl-2.0.txt | 6 +++--- _licenses/ncsa.txt | 6 +++--- _licenses/odbl-1.0.txt | 6 +++--- _licenses/ofl-1.1.txt | 6 +++--- _licenses/osl-3.0.txt | 6 +++--- _licenses/postgresql.txt | 6 +++--- _licenses/unlicense.txt | 6 +++--- _licenses/upl-1.0.txt | 6 +++--- _licenses/vim.txt | 6 +++--- _licenses/zlib.txt | 6 +++--- spec/license_meta_spec.rb | 6 ++---- 30 files changed, 87 insertions(+), 89 deletions(-) diff --git a/README.md b/README.md index 841d9d6..22b22cd 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc * `spdx-id` - Short identifier specified by https://spdx.org/licenses/ * `description` - A human-readable description of the license * `how` - Instructions on how to implement the license -* `using` - A list of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/licensee/licensee) in the form of `project_name: license_file_url` +* `using` - A map of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/licensee/licensee) in the form of `project_name: license_file_url` * `permissions` - Bulleted list of permission rules * `conditions` - Bulleted list of condition rules * `limitations` - Bulleted list of limitation rules diff --git a/_licenses/0bsd.txt b/_licenses/0bsd.txt index d778c9a..73f6107 100644 --- a/_licenses/0bsd.txt +++ b/_licenses/0bsd.txt @@ -7,9 +7,9 @@ description: The BSD Zero Clause license goes further than the BSD 2-Clause lice 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. You may take the additional step of removing the copyright notice. using: - - PickMeUp: https://github.com/nazar-pc/PickMeUp/blob/master/copying.md - - smoltcp: https://github.com/m-labs/smoltcp/blob/master/LICENSE-0BSD.txt - - Toybox: https://github.com/landley/toybox/blob/master/LICENSE + PickMeUp: https://github.com/nazar-pc/PickMeUp/blob/master/copying.md + smoltcp: https://github.com/m-labs/smoltcp/blob/master/LICENSE-0BSD.txt + Toybox: https://github.com/landley/toybox/blob/master/LICENSE permissions: - commercial-use diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index be04943..f2d5c87 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -12,9 +12,9 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: The Apache Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice in the appendix at the very end of the license text. using: - - Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE - - PDF.js: https://github.com/mozilla/pdf.js/blob/master/LICENSE - - Swift: https://github.com/apple/swift/blob/master/LICENSE.txt + Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE + PDF.js: https://github.com/mozilla/pdf.js/blob/master/LICENSE + Swift: https://github.com/apple/swift/blob/master/LICENSE.txt permissions: - commercial-use diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index d7b985a..9d72d20 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -9,9 +9,9 @@ description: A permissive license that comes in two variants, the found on their website. using: - - Awesome: https://github.com/sindresorhus/awesome/blob/main/license - - Shields.io: https://github.com/badges/shields/blob/master/LICENSE - - psdash: https://github.com/Jahaja/psdash/blob/master/LICENSE + Awesome: https://github.com/sindresorhus/awesome/blob/main/license + Shields.io: https://github.com/badges/shields/blob/master/LICENSE + psdash: https://github.com/Jahaja/psdash/blob/master/LICENSE permissions: - commercial-use diff --git a/_licenses/cecill-2.1.txt b/_licenses/cecill-2.1.txt index d1758d4..91b7c8f 100644 --- a/_licenses/cecill-2.1.txt +++ b/_licenses/cecill-2.1.txt @@ -7,9 +7,9 @@ description: Strong copyleft license made by three French public research organi how: Create a text file (typically named LICENSE or LICENCE) in the root of your source code and copy the text of the license into the file. using: - - BMC-Tools: https://github.com/ANSSI-FR/bmc-tools/blob/master/LICENCE.txt - - Taxe foncière: https://github.com/etalab/taxe-fonciere/blob/master/LICENSE - - VITAM: https://github.com/ProgrammeVitam/vitam/blob/master_0.15.x/Licence_CeCILL_V2.1-fr.txt + BMC-Tools: https://github.com/ANSSI-FR/bmc-tools/blob/master/LICENCE.txt + Taxe foncière: https://github.com/etalab/taxe-fonciere/blob/master/LICENSE + VITAM: https://github.com/ProgrammeVitam/vitam/blob/master_0.15.x/Licence_CeCILL_V2.1-fr.txt permissions: - commercial-use diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index e08adba..72c6b9d 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -9,9 +9,9 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: The Apereo Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice in the appendix at the very end of the license text. using: - - Sakai: https://github.com/sakaiproject/sakai/blob/master/LICENSE - - OAE: https://github.com/oaeproject/Hilary/blob/master/LICENSE - - Opencast: https://github.com/opencast/opencast/blob/develop/LICENSE + Sakai: https://github.com/sakaiproject/sakai/blob/master/LICENSE + OAE: https://github.com/oaeproject/Hilary/blob/master/LICENSE + Opencast: https://github.com/opencast/opencast/blob/develop/LICENSE permissions: - commercial-use diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 95f7411..429a83b 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -7,9 +7,9 @@ description: This commercially-friendly copyleft license provides the ability to 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. using: - - Eclipse hawkBit: https://github.com/eclipse/hawkbit/blob/master/LICENSE - - JUnit: https://github.com/junit-team/junit4/blob/main/LICENSE-junit.txt - - Quil: https://github.com/quil/quil/blob/master/LICENSE + Eclipse hawkBit: https://github.com/eclipse/hawkbit/blob/master/LICENSE + JUnit: https://github.com/junit-team/junit4/blob/main/LICENSE-junit.txt + Quil: https://github.com/quil/quil/blob/master/LICENSE permissions: - commercial-use diff --git a/_licenses/epl-2.0.txt b/_licenses/epl-2.0.txt index aacc042..753fb7c 100644 --- a/_licenses/epl-2.0.txt +++ b/_licenses/epl-2.0.txt @@ -9,9 +9,9 @@ description: This commercially-friendly copyleft license provides the ability to 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. using: - - Eclipse SmartHome: https://github.com/eclipse/smarthome/blob/master/LICENSE - - openHAB: https://github.com/openhab/openhab-distro/blob/master/LICENSE - - SUMO: https://github.com/eclipse/sumo/blob/master/LICENSE + Eclipse SmartHome: https://github.com/eclipse/smarthome/blob/master/LICENSE + openHAB: https://github.com/openhab/openhab-distro/blob/master/LICENSE + SUMO: https://github.com/eclipse/sumo/blob/master/LICENSE permissions: - commercial-use diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index 7413aef..3d75c17 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -7,9 +7,9 @@ description: The European Union Public Licence (EUPL) is a copyleft free/open so how: Indicate “Licensed under the EUPL” following the copyright notice of your source code, for example in a README file or directly in a source code file as a comment. using: - - AethysRotation: https://github.com/SimCMinMax/AethysRotation/blob/master/LICENSE - - WildDuck: https://github.com/nodemailer/wildduck/blob/master/LICENSE - - ZoneMTA: https://github.com/zone-eu/zone-mta/blob/master/LICENSE + AethysRotation: https://github.com/SimCMinMax/AethysRotation/blob/master/LICENSE + WildDuck: https://github.com/nodemailer/wildduck/blob/master/LICENSE + ZoneMTA: https://github.com/zone-eu/zone-mta/blob/master/LICENSE permissions: - commercial-use diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 36797f2..5ece9ee 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -12,9 +12,9 @@ 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. using: - - AliSQL: https://github.com/alibaba/AliSQL/blob/master/COPYING - - Discourse: https://github.com/discourse/discourse/blob/master/LICENSE.txt - - Joomla!: https://github.com/joomla/joomla-cms/blob/staging/LICENSE.txt + AliSQL: https://github.com/alibaba/AliSQL/blob/master/COPYING + Discourse: https://github.com/discourse/discourse/blob/master/LICENSE.txt + Joomla!: https://github.com/joomla/joomla-cms/blob/staging/LICENSE.txt permissions: - commercial-use diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index 910a12b..0fb3da3 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -13,9 +13,9 @@ how: Create a text file (typically named COPYING, as per GNU conventions) in the 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. using: - - Ansible: https://github.com/ansible/ansible/blob/devel/COPYING - - Bash: https://git.savannah.gnu.org/cgit/bash.git/tree/COPYING - - GIMP: https://git.gnome.org/browse/gimp/tree/COPYING + Ansible: https://github.com/ansible/ansible/blob/devel/COPYING + Bash: https://git.savannah.gnu.org/cgit/bash.git/tree/COPYING + GIMP: https://git.gnome.org/browse/gimp/tree/COPYING permissions: - commercial-use diff --git a/_licenses/isc.txt b/_licenses/isc.txt index 09299f4..f6cbbbb 100644 --- a/_licenses/isc.txt +++ b/_licenses/isc.txt @@ -7,9 +7,9 @@ description: A permissive license lets people do anything with your code with pr 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. using: - - Starship: https://github.com/starship/starship/blob/master/LICENSE - - Node.js semver: https://github.com/npm/node-semver/blob/master/LICENSE - - OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/develop/LICENSE.md + Starship: https://github.com/starship/starship/blob/master/LICENSE + Node.js semver: https://github.com/npm/node-semver/blob/master/LICENSE + OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/develop/LICENSE.md permissions: - commercial-use diff --git a/_licenses/mit.txt b/_licenses/mit.txt index 7aa6087..79d306c 100644 --- a/_licenses/mit.txt +++ b/_licenses/mit.txt @@ -9,9 +9,9 @@ description: A short and simple permissive license with conditions only requirin 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. using: - - Babel: https://github.com/babel/babel/blob/master/LICENSE - - .NET Core: https://github.com/dotnet/runtime/blob/master/LICENSE.TXT - - Rails: https://github.com/rails/rails/blob/master/MIT-LICENSE + Babel: https://github.com/babel/babel/blob/master/LICENSE + .NET Core: https://github.com/dotnet/runtime/blob/master/LICENSE.TXT + Rails: https://github.com/rails/rails/blob/master/MIT-LICENSE permissions: - commercial-use diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index 7dd0965..516c796 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -11,9 +11,9 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: The Mozilla 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 (Exhibit A). using: - - Servo: https://github.com/servo/servo/blob/master/LICENSE - - Syncthing: https://github.com/syncthing/syncthing/blob/main/LICENSE - - TimelineJS3: https://github.com/NUKnightLab/TimelineJS3/blob/master/LICENSE + Servo: https://github.com/servo/servo/blob/master/LICENSE + Syncthing: https://github.com/syncthing/syncthing/blob/main/LICENSE + TimelineJS3: https://github.com/NUKnightLab/TimelineJS3/blob/master/LICENSE permissions: - commercial-use diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 7a83fc9..9380cfa 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -8,9 +8,9 @@ description: The University of Illinois/NCSA Open Source License, or UIUC licens 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. using: - - ROCR-Runtime: https://github.com/RadeonOpenCompute/ROCR-Runtime/blob/master/LICENSE.txt - - RLTK: https://github.com/chriswailes/RLTK/blob/master/LICENSE - - ToaruOS: https://github.com/klange/toaruos/blob/master/LICENSE + ROCR-Runtime: https://github.com/RadeonOpenCompute/ROCR-Runtime/blob/master/LICENSE.txt + RLTK: https://github.com/chriswailes/RLTK/blob/master/LICENSE + ToaruOS: https://github.com/klange/toaruos/blob/master/LICENSE permissions: - commercial-use diff --git a/_licenses/odbl-1.0.txt b/_licenses/odbl-1.0.txt index 0f54618..c7621e0 100644 --- a/_licenses/odbl-1.0.txt +++ b/_licenses/odbl-1.0.txt @@ -8,9 +8,9 @@ description: The Open Database License (ODbL) is a license agreement intended to 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. using: - - World Countries: https://github.com/mledoze/countries/blob/master/LICENSE - - OpenFlights: https://github.com/jpatokal/openflights/blob/master/data/LICENSE - - Public Zone Database: https://github.com/zonedb/zonedb/blob/master/LICENSE.md + World Countries: https://github.com/mledoze/countries/blob/master/LICENSE + OpenFlights: https://github.com/jpatokal/openflights/blob/master/data/LICENSE + Public Zone Database: https://github.com/zonedb/zonedb/blob/master/LICENSE.md permissions: - commercial-use diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.txt index 20ad7ae..a31de6d 100644 --- a/_licenses/ofl-1.1.txt +++ b/_licenses/ofl-1.1.txt @@ -10,9 +10,9 @@ 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. using: - - FiraCode: https://github.com/tonsky/FiraCode/blob/master/LICENSE - - Noto fonts: https://github.com/googlefonts/noto-fonts/blob/master/LICENSE - - Fantasque Sans Mono: https://github.com/belluzj/fantasque-sans/blob/master/LICENSE.txt + FiraCode: https://github.com/tonsky/FiraCode/blob/master/LICENSE + Noto fonts: https://github.com/googlefonts/noto-fonts/blob/master/LICENSE + Fantasque Sans Mono: https://github.com/belluzj/fantasque-sans/blob/master/LICENSE.txt permissions: - private-use diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index 6457b2d..befdc77 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -9,9 +9,9 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: OSL 3.0's author has provided an explanation behind the creation of the license. using: - - appserver.io: https://github.com/appserver-io/appserver/blob/master/LICENSE.txt - - JsonMapper: https://github.com/cweiske/jsonmapper/blob/master/LICENSE - - Restyaboard: https://github.com/RestyaPlatform/board/blob/master/LICENSE.txt + appserver.io: https://github.com/appserver-io/appserver/blob/master/LICENSE.txt + JsonMapper: https://github.com/cweiske/jsonmapper/blob/master/LICENSE + Restyaboard: https://github.com/RestyaPlatform/board/blob/master/LICENSE.txt permissions: - commercial-use diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index 24176f6..b3834df 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -7,9 +7,9 @@ description: A very short, BSD-style license, used specifically for PostgreSQL. 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. using: - - pgBadger: https://github.com/darold/pgbadger/blob/master/LICENSE - - pgAdmin: https://github.com/postgres/pgadmin4/blob/master/LICENSE - - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE + pgBadger: https://github.com/darold/pgbadger/blob/master/LICENSE + pgAdmin: https://github.com/postgres/pgadmin4/blob/master/LICENSE + .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE permissions: - commercial-use diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index c42a257..1387de4 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -8,9 +8,9 @@ description: A license with no conditions whatsoever which dedicates works to th how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file. using: - - youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE - - kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE - - RDF.rb: https://github.com/ruby-rdf/rdf/blob/master/UNLICENSE + youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE + kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE + RDF.rb: https://github.com/ruby-rdf/rdf/blob/master/UNLICENSE permissions: - private-use diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index a6c11f8..6c53e79 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -9,9 +9,9 @@ how: Insert the license or a link to it along with a copyright notice into your note: It is recommended to add a link to the license and copyright notice at the top of each source file, example text can be found at https://oss.oracle.com/licenses/upl/. using: - - Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/master/LICENSE - - Skater: https://github.com/oracle/Skater/blob/master/LICENSE - - Soufflé: https://github.com/souffle-lang/souffle/blob/master/LICENSE + Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/master/LICENSE + Skater: https://github.com/oracle/Skater/blob/master/LICENSE + Soufflé: https://github.com/souffle-lang/souffle/blob/master/LICENSE permissions: - commercial-use diff --git a/_licenses/vim.txt b/_licenses/vim.txt index d850bd9..ca21d8a 100644 --- a/_licenses/vim.txt +++ b/_licenses/vim.txt @@ -7,9 +7,9 @@ description: There are no restrictions on using or distributing an unmodified co 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 [project] with the project name. using: - - Vim: https://github.com/vim/vim/blob/master/LICENSE - - Pathogen: https://github.com/tpope/vim-pathogen/blob/master/LICENSE - - vim-license-gen: https://github.com/othree/vim-license/blob/master/LICENSE + Vim: https://github.com/vim/vim/blob/master/LICENSE + Pathogen: https://github.com/tpope/vim-pathogen/blob/master/LICENSE + vim-license-gen: https://github.com/othree/vim-license/blob/master/LICENSE permissions: - commercial-use diff --git a/_licenses/zlib.txt b/_licenses/zlib.txt index 706b1b5..911d773 100644 --- a/_licenses/zlib.txt +++ b/_licenses/zlib.txt @@ -7,9 +7,9 @@ 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. using: - - GLFW: https://github.com/glfw/glfw/blob/master/LICENSE.md - - Portainer: https://github.com/portainer/portainer/blob/develop/LICENSE - - TinyXML-2: https://github.com/leethomason/tinyxml2/blob/master/LICENSE.txt + GLFW: https://github.com/glfw/glfw/blob/master/LICENSE.md + Portainer: https://github.com/portainer/portainer/blob/develop/LICENSE + TinyXML-2: https://github.com/leethomason/tinyxml2/blob/master/LICENSE.txt permissions: - commercial-use diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 858acfb..de1d55a 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -19,7 +19,7 @@ describe 'license meta' do expect(missing).to be_empty end - examples = raw_fields['using'] || [] + examples = raw_fields['using'] || {} it 'using contains 3 examples' do legacy = [ @@ -42,9 +42,7 @@ describe 'license meta' do context 'licensee detects using examples' do slug = license['slug'] - examples.each do |example| - example_url = example.values[0] - + examples.each_value do |example_url| context "the #{example_url} URL" do let(:content) { OpenURI.open_uri(example_url).read } let(:detected) { Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license } From 1ad3d204d553a2e0892f0821781f7d7589c63146 Mon Sep 17 00:00:00 2001 From: ObserverOfTime Date: Sat, 3 Oct 2020 11:47:04 +0300 Subject: [PATCH 05/71] Update npgsql license URL --- _licenses/postgresql.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index b3834df..897f1e8 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -9,7 +9,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: pgBadger: https://github.com/darold/pgbadger/blob/master/LICENSE pgAdmin: https://github.com/postgres/pgadmin4/blob/master/LICENSE - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE + .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/main/LICENSE permissions: - commercial-use From e655e40c3076442baf64624ee165dff445470967 Mon Sep 17 00:00:00 2001 From: ObserverOfTime Date: Sat, 3 Oct 2020 12:01:45 +0300 Subject: [PATCH 06/71] Fix linter warning --- spec/license_shown_spec.rb | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb index c9e199b..7f84611 100644 --- a/spec/license_shown_spec.rb +++ b/spec/license_shown_spec.rb @@ -2,25 +2,25 @@ require 'spec_helper' -describe 'shown licenses' do - # Whitelist of popular licenses that are shown (non-hidden) - # Note: most new licenses that are added should be hidden by default - SHOWN_LICENSES = %w[ - agpl-3.0 - apache-2.0 - bsd-2-clause - bsd-3-clause - bsl-1.0 - cc0-1.0 - epl-2.0 - gpl-2.0 - gpl-3.0 - lgpl-2.1 - mit - mpl-2.0 - unlicense - ].freeze +# Whitelist of popular licenses that are shown (non-hidden) +# Note: most new licenses that are added should be hidden by default +SHOWN_LICENSES = %w[ + agpl-3.0 + apache-2.0 + bsd-2-clause + bsd-3-clause + bsl-1.0 + cc0-1.0 + epl-2.0 + gpl-2.0 + gpl-3.0 + lgpl-2.1 + mit + mpl-2.0 + unlicense +].freeze +describe 'shown licenses' do it 'has the expected number of shown licenses' do expect(shown_licenses.count).to eql(13) expect(SHOWN_LICENSES.count).to eql(shown_licenses.count) From 0e344b67132e1a7409617a3407d71dd4e8352edd Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 3 Oct 2020 11:31:20 -0700 Subject: [PATCH 07/71] update templates to use using map --- _includes/sidebar.html | 4 +--- _includes/using-sentence.html | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 404a48c..02711c2 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -45,9 +45,7 @@

Who's using this license?

diff --git a/_includes/using-sentence.html b/_includes/using-sentence.html index 4ed2309..a609b5c 100644 --- a/_includes/using-sentence.html +++ b/_includes/using-sentence.html @@ -8,9 +8,7 @@ {% if last and using.size > 1 %} and {% endif %} - {% for hash in used %} - {{ hash[0] }}{% if last == false %},{% endif %} - {% endfor %} + {{ used[0] }}{% if last == false %},{% endif %} {% endfor %} use{% if using.size == 1 %}s{% endif %} the {% if license.nickname %}{{ license.nickname }}{% else %}{{ license.title }}{% endif %}. {% endif %} From 926d3eb55d359cf0aea73048e83c19eee9cbca36 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 3 Oct 2020 11:35:53 -0700 Subject: [PATCH 08/71] more concise comment --- spec/license_shown_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb index 7f84611..39f535e 100644 --- a/spec/license_shown_spec.rb +++ b/spec/license_shown_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -# Whitelist of popular licenses that are shown (non-hidden) +# Popular licenses that are shown (non-hidden) # Note: most new licenses that are added should be hidden by default SHOWN_LICENSES = %w[ agpl-3.0 From c915a5a8da2c8d978263c452f290525d30f51755 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Tue, 13 Oct 2020 17:47:00 +0100 Subject: [PATCH 09/71] Harmonize capitalization in section headings --- CONTRIBUTING.md | 6 +++--- README.md | 2 +- non-software.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 078d658..bcdc83f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# How to Contribute +# How to contribute We love Pull Requests! Your contributions help make ChooseALicense.com great. @@ -6,7 +6,7 @@ Contributions to this project are [released](https://help.github.com/articles/gi Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. -## Getting Started +## Getting started So you want to contribute to ChooseALicense. Great! We welcome any help we can get. But first, please make sure you understand what @@ -34,7 +34,7 @@ If your proposed license meets the above criteria, here's a few other things to * The text of the license should match the corresponding text found in [spdx/license-list-data](https://github.com/spdx/license-list-data/blob/master/text/). If there are errors there, please fix them in [spdx/license-list-XML](https://github.com/spdx/license-list-XML) (from which the plain text version is generated) so as to minimize license text variation and make it easier for choosealicense.com to eventually consume license texts directly from SPDX. * The body of the file should be the text of the license in plain text. -## Making Changes +## Making changes The easiest way to make a change is to simply edit a file from your browser. When you click the edit button, it will fork the repository under your account. diff --git a/README.md b/README.md index 22b22cd..5d38a18 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ We catalog [select](CONTRIBUTING.md#adding-a-license) open source licenses with * Collaborate with and reinforce other licensing best practices and standards projects. * Not comprehensive. Seems like an odd goal, but there are a bajillion licenses out there. We're going to have to filter that down to a small list of those that matter. -## Run It On Your Machine +## Run it on your machine ### Managing Dependencies diff --git a/non-software.md b/non-software.md index 3c312b8..0b3b745 100644 --- a/non-software.md +++ b/non-software.md @@ -18,6 +18,6 @@ Any open source software license or open license for media (see [above](#data-me The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open but allows them to be freely used in other works. -### Mixed Projects +### Mixed projects If your project contains a mix of software and other material, you can include multiple licenses, as long as you are explicit about which license applies to each part of the project. See [the license notice for this site](https://github.com/github/choosealicense.com#license) as an example. From 3e2b69c68a155c462658c2d28a90a2f00a4e6f5d Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Tue, 13 Oct 2020 17:48:35 +0100 Subject: [PATCH 10/71] Harmonize quotation marks and apostrophes Use straight marks in source files (txt, md) and curly marks in rendered files (html) --- CONTRIBUTING.md | 4 +- _includes/sidebar.html | 8 +-- _licenses/cc-by-4.0.txt | 2 +- _licenses/cc-by-sa-4.0.txt | 2 +- _licenses/eupl-1.1.txt | 18 +++---- _licenses/eupl-1.2.txt | 100 ++++++++++++++++++------------------- _licenses/lgpl-3.0.txt | 2 +- _licenses/upl-1.0.txt | 2 +- licenses.html | 4 +- no-permission.md | 2 +- 10 files changed, 72 insertions(+), 72 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bcdc83f..4c4f6c6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ Please note that this project is released with a [Contributor Code of Conduct](C So you want to contribute to ChooseALicense. Great! We welcome any help we can get. But first, please make sure you understand what -[this site is all about](https://choosealicense.com/about). It’s not a comprehensive list of all possible licenses. +[this site is all about](https://choosealicense.com/about). It's not a comprehensive list of all possible licenses. ## Adding a license @@ -43,7 +43,7 @@ Note what issue/issues your patch fixes in the commit message. For example, to [change this file](/CONTRIBUTING.md), find it in the GitHub repository. Then click the `Edit` button. Make your changes, type in a commit message, and click the `Propose File Change` button. -That’s it! +That's it! For more advanced changes, check out [the bootstrap instructions](https://github.com/github/choosealicense.com#run-it-on-your-machine) in the [project's readme](/README.md). diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 02711c2..1540756 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -4,7 +4,7 @@ {% unless page.spdx-id == 'LGPL-3.0' %}

Suggest this license

-

Make a pull request to suggest this license for a project that is not licensed. Please be polite: see if a license has already been suggested, try to suggest a license fitting for the project's community, and keep your communication with project maintainers friendly.

+

Make a pull request to suggest this license for a project that is not licensed. Please be polite: see if a license has already been suggested, try to suggest a license fitting for the project’s community, and keep your communication with project maintainers friendly.

@@ -26,9 +26,9 @@ {% endif %} {% assign xgpl = false %} {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %} -

Add {{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}{% if xgpl %} (or {{ page.spdx-id }}-only to disallow future versions){% endif %} to your project's package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.

+

Add {{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}{% if xgpl %} (or {{ page.spdx-id }}-only to disallow future versions){% endif %} to your project’s package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.

{% if page.spdx-id contains 'GPL-2' %} -

If you would like your project to adopt the GPL-3.0's cure provision, add the text of the GPL Cooperation Commitment to a file named COMMITMENT in the same directory as your {{ page.spdx-id }} license file.

+

If you would like your project to adopt the GPL-3.0’s cure provision, add the text of the GPL Cooperation Commitment to a file named COMMITMENT in the same directory as your {{ page.spdx-id }} license file.

{% endif %}
@@ -42,7 +42,7 @@ {% if page.using %}
-

Who's using this license?

+

Who’s using this license?

    {% for using in page.using %}
  • {{ using[0] }}
    • diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index baa5c9f..33e535d 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -409,7 +409,7 @@ Section 8 -- Interpretation. Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be -considered the “Licensor.” The text of the Creative Commons public +considered the "Licensor." The text of the Creative Commons public licenses is dedicated to the public domain under the CC0 Public Domain Dedication. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index b392785..3aec17e 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -442,7 +442,7 @@ Section 8 -- Interpretation. Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be -considered the “Licensor.” The text of the Creative Commons public +considered the "Licensor." The text of the Creative Commons public licenses is dedicated to the public domain under the CC0 Public Domain Dedication. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index b2512b7..c29f478 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -3,7 +3,7 @@ title: European Union Public License 1.1 spdx-id: EUPL-1.1 redirect_from: /licenses/eupl-v1.1/ -description: The “European Union Public Licence” (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. +description: The "European Union Public Licence" (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. how: Create a text file (typically named COPYING or LICENCE.txt) in the root of your source code and copy the text of the license into the file. @@ -39,7 +39,7 @@ V. 1.1 EUPL © the European Community 2007 -This European Union Public Licence (the “EUPL”) applies to the +This European Union Public Licence (the "EUPL") applies to the Work or Software (as defined below) which is provided under the terms of this Licence. Any use of the Work, other than as authorised under this Licence is prohibited (to the extent such use is covered by a right of the copyright @@ -86,7 +86,7 @@ communicates the Work under the Licence. - Contributor(s): any natural or legal person who modifies the Work under the Licence, or otherwise contributes to the creation of a Derivative Work. -- The Licensee or “You”: any natural or legal person who makes any usage of +- The Licensee or "You": any natural or legal person who makes any usage of the Software under the terms of the Licence. - Distribution and/or Communication: any act of selling, giving, lending, @@ -172,8 +172,8 @@ If the Licensee Distributes and/or Communicates Derivative Works or copies thereof based upon both the Original Work and another work licensed under a Compatible Licence, this Distribution and/or Communication can be done under the terms of this Compatible Licence. For the sake of this clause, -“Compatible Licence” refers to the licences listed in the appendix -attached to this Licence. Should the Licensee’s obligations under the +"Compatible Licence" refers to the licences listed in the appendix +attached to this Licence. Should the Licensee's obligations under the Compatible Licence conflict with his/her obligations under this Licence, the obligations of the Compatible Licence shall prevail. @@ -209,9 +209,9 @@ the terms of this Licence. The Work is a work in progress, which is continuously improved by numerous contributors. It is not a finished work and may therefore contain defects or -“bugs” inherent to this type of software development. +"bugs" inherent to this type of software development. -For the above reason, the Work is provided under the Licence on an “as is” +For the above reason, the Work is provided under the Licence on an "as is" basis and without warranties of any kind concerning the Work, including without limitation merchantability, fitness for a particular purpose, absence of defects or errors, accuracy, non-infringement of intellectual property @@ -250,7 +250,7 @@ liability. 10. Acceptance of the Licence The provisions of this Licence can be accepted by clicking on -an icon “I agree” placed under the bottom of a window displaying the text of +an icon "I agree" placed under the bottom of a window displaying the text of this Licence or by affirming consent in any other similar way, in accordance with the rules of applicable law. Clicking on that icon indicates your clear and irrevocable acceptance of this Licence and @@ -337,7 +337,7 @@ registered office inside a European Union country. Appendix -“Compatible Licences” according to article 5 EUPL are: +"Compatible Licences" according to article 5 EUPL are: - GNU General Public License (GNU GPL) v. 2 - Open Software License (OSL) v. 2.1, v. 3.0 - Common Public License v. 1.0 diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index 3d75c17..ac81a52 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -4,7 +4,7 @@ spdx-id: EUPL-1.2 description: The European Union Public Licence (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. -how: Indicate “Licensed under the EUPL” following the copyright notice of your source code, for example in a README file or directly in a source code file as a comment. +how: Indicate "Licensed under the EUPL" following the copyright notice of your source code, for example in a README file or directly in a source code file as a comment. using: AethysRotation: https://github.com/SimCMinMax/AethysRotation/blob/master/LICENSE @@ -37,42 +37,42 @@ V. 1.2 EUPL © the European Union 2007, 2016 -This European Union Public Licence (the ‘EUPL’) applies to the Work (as +This European Union Public Licence (the 'EUPL') applies to the Work (as defined below) which is provided under the terms of this Licence. Any use of the Work, other than as authorised under this Licence is prohibited (to the extent such use is covered by a right of the copyright holder of the Work). The Work is provided under the terms of this Licence when the Licensor (as defined below) has placed the following notice immediately following the -copyright notice for the Work: “Licensed under the EUPL”, or has expressed by +copyright notice for the Work: "Licensed under the EUPL", or has expressed by any other means his willingness to license under the EUPL. 1. Definitions In this Licence, the following terms have the following meaning: -— ‘The Licence’: this Licence. -— ‘The Original Work’: the work or software distributed or communicated by the - ‘Licensor under this Licence, available as Source Code and also as - ‘Executable Code as the case may be. -— ‘Derivative Works’: the works or software that could be created by the - ‘Licensee, based upon the Original Work or modifications thereof. This - ‘Licence does not define the extent of modification or dependence on the - ‘Original Work required in order to classify a work as a Derivative Work; - ‘this extent is determined by copyright law applicable in the country - ‘mentioned in Article 15. -— ‘The Work’: the Original Work or its Derivative Works. -— ‘The Source Code’: the human-readable form of the Work which is the most +- 'The Licence': this Licence. +- 'The Original Work': the work or software distributed or communicated by the + 'Licensor under this Licence, available as Source Code and also as + 'Executable Code as the case may be. +- 'Derivative Works': the works or software that could be created by the + 'Licensee, based upon the Original Work or modifications thereof. This + 'Licence does not define the extent of modification or dependence on the + 'Original Work required in order to classify a work as a Derivative Work; + 'this extent is determined by copyright law applicable in the country + 'mentioned in Article 15. +- 'The Work': the Original Work or its Derivative Works. +- 'The Source Code': the human-readable form of the Work which is the most convenient for people to study and modify. -— ‘The Executable Code’: any code which has generally been compiled and which +- 'The Executable Code': any code which has generally been compiled and which is meant to be interpreted by a computer as a program. -— ‘The Licensor’: the natural or legal person that distributes or communicates +- 'The Licensor': the natural or legal person that distributes or communicates the Work under the Licence. -— ‘Contributor(s)’: any natural or legal person who modifies the Work under +- 'Contributor(s)': any natural or legal person who modifies the Work under the Licence, or otherwise contributes to the creation of a Derivative Work. -— ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of +- 'The Licensee' or 'You': any natural or legal person who makes any usage of the Work under the terms of the Licence. -— ‘Distribution’ or ‘Communication’: any act of selling, giving, lending, +- 'Distribution' or 'Communication': any act of selling, giving, lending, renting, distributing, communicating, transmitting, or otherwise making available, online or offline, copies of the Work or providing access to its essential functionalities at the disposal of any other natural or legal @@ -84,15 +84,15 @@ The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, sublicensable licence to do the following, for the duration of copyright vested in the Original Work: -— use the Work in any circumstance and for all usage, -— reproduce the Work, -— modify the Work, and make Derivative Works based upon the Work, -— communicate to the public, including the right to make available or display +- use the Work in any circumstance and for all usage, +- reproduce the Work, +- modify the Work, and make Derivative Works based upon the Work, +- communicate to the public, including the right to make available or display the Work or copies thereof to the public and perform publicly, as the case may be, the Work, -— distribute the Work or copies thereof, -— lend and rent the Work or copies thereof, -— sublicense rights in the Work or copies thereof. +- distribute the Work or copies thereof, +- lend and rent the Work or copies thereof, +- sublicense rights in the Work or copies thereof. Those rights can be exercised on any media, supports and formats, whether now known or later invented, as far as the applicable law permits so. @@ -138,7 +138,7 @@ Copyleft clause: If the Licensee distributes or communicates copies of the Original Works or Derivative Works, this Distribution or Communication will be done under the terms of this Licence or of a later version of this Licence unless the Original Work is expressly distributed only under this version of -the Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee +the Licence - for example by communicating 'EUPL v. 1.2 only'. The Licensee (becoming Licensor) cannot offer or impose any additional terms or conditions on the Work or Derivative Work that alter or restrict the terms of the Licence. @@ -147,7 +147,7 @@ Compatibility clause: If the Licensee Distributes or Communicates Derivative Works or copies thereof based upon both the Work and another work licensed under a Compatible Licence, this Distribution or Communication can be done under the terms of this Compatible Licence. For the sake of this clause, -‘Compatible Licence’ refers to the licences listed in the appendix attached to +'Compatible Licence' refers to the licences listed in the appendix attached to this Licence. Should the Licensee's obligations under the Compatible Licence conflict with his/her obligations under this Licence, the obligations of the Compatible Licence shall prevail. @@ -180,9 +180,9 @@ terms of this Licence. The Work is a work in progress, which is continuously improved by numerous Contributors. It is not a finished work and may therefore contain defects or -‘bugs’ inherent to this type of development. +'bugs' inherent to this type of development. -For the above reason, the Work is provided under the Licence on an ‘as is’ +For the above reason, the Work is provided under the Licence on an 'as is' basis and without warranties of any kind concerning the Work, including without limitation merchantability, fitness for a particular purpose, absence of defects or errors, accuracy, non-infringement of intellectual property @@ -215,8 +215,8 @@ liability. 10. Acceptance of the Licence -The provisions of this Licence can be accepted by clicking on an icon ‘I -agree’ placed under the bottom of a window displaying the text of this Licence +The provisions of this Licence can be accepted by clicking on an icon 'I +agree' placed under the bottom of a window displaying the text of this Licence or by affirming consent in any other similar way, in accordance with the rules of applicable law. Clicking on that icon indicates your clear and irrevocable acceptance of this Licence and all of its terms and conditions. @@ -266,12 +266,12 @@ their choice. 14. Jurisdiction Without prejudice to specific agreement between parties, -— any litigation resulting from the interpretation of this License, arising +- any litigation resulting from the interpretation of this License, arising between the European Union institutions, bodies, offices or agencies, as a Licensor, and any Licensee, will be subject to the jurisdiction of the Court of Justice of the European Union, as laid down in article 272 of the Treaty on the Functioning of the European Union, -— any litigation arising between other parties and resulting from the +- any litigation arising between other parties and resulting from the interpretation of this License, will be subject to the exclusive jurisdiction of the competent court where the Licensor resides or conducts its primary business. @@ -279,30 +279,30 @@ Without prejudice to specific agreement between parties, 15. Applicable Law Without prejudice to specific agreement between parties, -— this Licence shall be governed by the law of the European Union Member State +- this Licence shall be governed by the law of the European Union Member State where the Licensor has his seat, resides or has his registered office, -— this licence shall be governed by Belgian law if the Licensor has no seat, +- this licence shall be governed by Belgian law if the Licensor has no seat, residence or registered office inside a European Union Member State. Appendix -‘Compatible Licences’ according to Article 5 EUPL are: -— GNU General Public License (GPL) v. 2, v. 3 -— GNU Affero General Public License (AGPL) v. 3 -— Open Software License (OSL) v. 2.1, v. 3.0 -— Eclipse Public License (EPL) v. 1.0 -— CeCILL v. 2.0, v. 2.1 -— Mozilla Public Licence (MPL) v. 2 -— GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 -— Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for +'Compatible Licences' according to Article 5 EUPL are: +- GNU General Public License (GPL) v. 2, v. 3 +- GNU Affero General Public License (AGPL) v. 3 +- Open Software License (OSL) v. 2.1, v. 3.0 +- Eclipse Public License (EPL) v. 1.0 +- CeCILL v. 2.0, v. 2.1 +- Mozilla Public Licence (MPL) v. 2 +- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 +- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for works other than software -— European Union Public Licence (EUPL) v. 1.1, v. 1.2 -— Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or +- European Union Public Licence (EUPL) v. 1.1, v. 1.2 +- Québec Free and Open-Source Licence - Reciprocity (LiLiQ-R) or Strong Reciprocity (LiLiQ-R+) -— The European Commission may update this Appendix to later versions of the +- The European Commission may update this Appendix to later versions of the above licences without producing a new version of the EUPL, as long as they provide the rights granted in Article 2 of this Licence and protect the covered Source Code from exclusive appropriation. -— All other changes or additions to this Appendix require the production of a +- All other changes or additions to this Appendix require the production of a new EUPL version. diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index 407ae1f..06cf8cf 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -8,7 +8,7 @@ description: Permissions of this copyleft license are conditioned on making avai how: This license is an additional set of permissions to the GNU GPLv3 license. Follow the instructions to apply the GNU GPLv3, in the root of your source code. Then add another file named COPYING.LESSER and copy the text. -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 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. +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 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. using: diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index 6c53e79..772858d 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -43,7 +43,7 @@ Works (as defined below), to deal in both (a) the Software, and (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if -one is included with the Software (each a “Larger Work” to which the Software +one is included with the Software (each a "Larger Work" to which the Software is contributed by such licensors), without restriction, including without limitation the rights to copy, create diff --git a/licenses.html b/licenses.html index 62cd60c..29e13ef 100644 --- a/licenses.html +++ b/licenses.html @@ -6,7 +6,7 @@ title: Licenses ---

    Open source licenses grant permission for anybody to use, modify, and share licensed software for any purpose, subject to conditions preserving the provenance and openness of the software. The following licenses are sorted by the number of conditions, from most (GNU AGPLv3) to none (Unlicense). Notice that the popular licenses featured on the home page (GNU GPLv3 and MIT) fall within this spectrum.

    -

    If you're looking for a reference table of every license on choosealicense.com, see the appendix.

    +

    If you’re looking for a reference table of every license on choosealicense.com, see the appendix.

    {% include license-overview.html license-id="agpl-3.0" %} {% include license-overview.html license-id="gpl-3.0" %} @@ -17,4 +17,4 @@ title: Licenses {% include license-overview.html license-id="bsl-1.0" %} {% include license-overview.html license-id="unlicense" %} -The above licenses represent the entire spectrum of open source licenses, from highly protective to unconditional. One of these should work for most new open source projects. Many other open source licenses exist, including older versions of and close substitutes for some of the above. See the resources listed on our about page if you'd like to read more. +The above licenses represent the entire spectrum of open source licenses, from highly protective to unconditional. One of these should work for most new open source projects. Many other open source licenses exist, including older versions of and close substitutes for some of the above. See the resources listed on our about page if you’d like to read more. diff --git a/no-permission.md b/no-permission.md index b17682b..d7e4a3f 100644 --- a/no-permission.md +++ b/no-permission.md @@ -8,7 +8,7 @@ title: No License description: "You're under no obligation to choose a license and it's your right not to include one with your code or project. But please note that opting out of open source licenses doesn't mean you're opting out of copyright law." --- -When you make a creative work (which includes code), the work is under exclusive copyright by default. Unless you include a license that specifies otherwise, nobody else can copy, distribute, or modify your work without being at risk of take-downs, shake-downs, or litigation. Once the work has other contributors (each a copyright holder), “nobody” starts including you. +When you make a creative work (which includes code), the work is under exclusive copyright by default. Unless you include a license that specifies otherwise, nobody else can copy, distribute, or modify your work without being at risk of take-downs, shake-downs, or litigation. Once the work has other contributors (each a copyright holder), "nobody" starts including you. Even in the absence of a license file, you may grant some rights in cases where you publish your source code to a site that requires accepting terms of service. For example, if you publish your source code in a public repository on GitHub, you have accepted the [Terms of Service](https://help.github.com/articles/github-terms-of-service), by which you allow others to view and fork your repository. Others may not need your permission if [limitations and exceptions to copyright](https://en.wikipedia.org/wiki/Limitations_and_exceptions_to_copyright) apply to their particular situation. Neither site terms nor jurisdiction-specific copyright limitations are sufficient for the kinds of collaboration that people usually seek on a public code host, such as experimentation, modification, and sharing as fostered by an open source license. From a86a42c06a6c4639bf2b0955b0e68a8281c59d58 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Tue, 13 Oct 2020 17:59:43 +0100 Subject: [PATCH 11/71] Fix a typo in the terms of service --- terms-of-service.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terms-of-service.md b/terms-of-service.md index 23074e2..4bafd9a 100644 --- a/terms-of-service.md +++ b/terms-of-service.md @@ -27,7 +27,7 @@ The next few sections of these Terms go into greater detail on these disclaimers ### 4. DISCLAIMER OF WARRANTIES -TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, GITHUB OFFERS THE SITE ON AN AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WEBSITES OR SERVICES, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. GITHUB DOES NOT WARRANT THAT THE FUNCTIONS OR CONTENT CONTAINED ON THE WEBSITE OR SERVICES WILL BE ERROR-FREE, THAT DEFECTS WILL BE CORRECTED, OR THAT GITHUB'S SERVERS ARE FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. GITHUB DOES NOT WARRANT OR MAKE ANY REPRESENTATION REGARDING USE OR THE RESULT OF USE OF THE CONTENT IN TERMS OF ACCURACY, RELIABILITY, OR OTHERWISE. +TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, GITHUB OFFERS THE SITE ON AN AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WEBSITES OR SERVICES, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. GITHUB DOES NOT WARRANT THAT THE FUNCTIONS OR CONTENT CONTAINED ON THE WEBSITE OR SERVICES WILL BE ERROR-FREE, THAT DEFECTS WILL BE CORRECTED, OR THAT GITHUB'S SERVERS ARE FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. GITHUB DOES NOT WARRANT OR MAKE ANY REPRESENTATION REGARDING USE OR THE RESULT OF USE OF THE CONTENT IN TERMS OF ACCURACY, RELIABILITY, OR OTHERWISE. ### 5. LIMITATION OF LIABILITY From 83f63facde4117e96ed36955fed50ccc5e10e23f Mon Sep 17 00:00:00 2001 From: viral32111 <19510403+viral32111@users.noreply.github.com> Date: Mon, 26 Oct 2020 23:36:30 +0000 Subject: [PATCH 12/71] Remove notable project youtube-dl The project received a DMCA takedown request so this can't serve as an example newcomers can follow. I'm not sure of any other notable projects using this licence that could replace it, sorry. --- _licenses/unlicense.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 1387de4..88675c1 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -8,7 +8,6 @@ description: A license with no conditions whatsoever which dedicates works to th how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file. using: - youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE RDF.rb: https://github.com/ruby-rdf/rdf/blob/master/UNLICENSE From 4e2d9d64b3f6e582b2b2f614c70f323ce18cf4a3 Mon Sep 17 00:00:00 2001 From: viral32111 <19510403+viral32111@users.noreply.github.com> Date: Tue, 27 Oct 2020 14:00:43 +0000 Subject: [PATCH 13/71] Add notable project scoop --- _licenses/unlicense.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 88675c1..deaac05 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -8,6 +8,7 @@ description: A license with no conditions whatsoever which dedicates works to th how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file. using: + scoop: https://github.com/lukesampson/scoop/blob/master/LICENSE kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE RDF.rb: https://github.com/ruby-rdf/rdf/blob/master/UNLICENSE From 0d43fb364d3207fd7cc368d6e5a9e913dc625011 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 29 Oct 2020 19:35:09 -0700 Subject: [PATCH 14/71] update using examples urls --- _licenses/apache-2.0.txt | 2 +- _licenses/bsl-1.0.txt | 2 +- _licenses/eupl-1.2.txt | 2 +- _licenses/odbl-1.0.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index f2d5c87..74eabb4 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -14,7 +14,7 @@ note: The Apache Foundation recommends taking the additional step of adding a bo using: Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE PDF.js: https://github.com/mozilla/pdf.js/blob/master/LICENSE - Swift: https://github.com/apple/swift/blob/master/LICENSE.txt + Swift: https://github.com/apple/swift/blob/main/LICENSE.txt permissions: - commercial-use diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt index c788852..8b79559 100644 --- a/_licenses/bsl-1.0.txt +++ b/_licenses/bsl-1.0.txt @@ -11,7 +11,7 @@ note: Boost recommends taking the additional step of adding a boilerplate notice using: Boost: https://github.com/boostorg/boost/blob/master/LICENSE_1_0.txt - Catch2: https://github.com/catchorg/Catch2/blob/master/LICENSE.txt + Catch2: https://github.com/catchorg/Catch2/blob/devel/LICENSE.txt DMD: https://github.com/dlang/dmd/blob/master/LICENSE.txt permissions: diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index 3d75c17..ee72e32 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -7,7 +7,7 @@ description: The European Union Public Licence (EUPL) is a copyleft free/open so how: Indicate “Licensed under the EUPL” following the copyright notice of your source code, for example in a README file or directly in a source code file as a comment. using: - AethysRotation: https://github.com/SimCMinMax/AethysRotation/blob/master/LICENSE + HeroRotation: https://github.com/herotc/hero-rotation/blob/shadowlands/LICENSE WildDuck: https://github.com/nodemailer/wildduck/blob/master/LICENSE ZoneMTA: https://github.com/zone-eu/zone-mta/blob/master/LICENSE diff --git a/_licenses/odbl-1.0.txt b/_licenses/odbl-1.0.txt index c7621e0..c960056 100644 --- a/_licenses/odbl-1.0.txt +++ b/_licenses/odbl-1.0.txt @@ -10,7 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: World Countries: https://github.com/mledoze/countries/blob/master/LICENSE OpenFlights: https://github.com/jpatokal/openflights/blob/master/data/LICENSE - Public Zone Database: https://github.com/zonedb/zonedb/blob/master/LICENSE.md + Public Zone Database: https://github.com/zonedb/zonedb/blob/main/LICENSE.md permissions: - commercial-use From 374541eebdfd74a633edb8f74364571fb967bc82 Mon Sep 17 00:00:00 2001 From: Apollo-Apostolos <53583068+Apollo-Apostolos@users.noreply.github.com> Date: Sun, 1 Nov 2020 16:07:20 +0000 Subject: [PATCH 15/71] Improve Language Comprehension These changes help non-English speakers to read along. Changing "but" to "and" suggests a correct continual pathos whilst adding clarity. "But" is used to suggest a hard shift in mindset. It was misused. Changing "them" to "those" clarified that the sentence is about fonts and not about people setting the license. "Them" is used as shorthand for humans. It will confuse the reader. --- non-software.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/non-software.md b/non-software.md index 3c312b8..ccaaa07 100644 --- a/non-software.md +++ b/non-software.md @@ -16,7 +16,7 @@ Any open source software license or open license for media (see [above](#data-me ### Fonts -The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open but allows them to be freely used in other works. +The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open and allows those to be freely used in other works. ### Mixed Projects From b15ba984a93f75aebcb299395757cd7d45d6d954 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Tue, 3 Nov 2020 10:45:15 -0800 Subject: [PATCH 16/71] more direct way to join the two clauses --- non-software.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/non-software.md b/non-software.md index ccaaa07..757141c 100644 --- a/non-software.md +++ b/non-software.md @@ -16,7 +16,7 @@ Any open source software license or open license for media (see [above](#data-me ### Fonts -The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open and allows those to be freely used in other works. +The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open, allowing them to be freely used in other works. ### Mixed Projects From 524ed15f823b4cb0f59c54696f095ce436d264b9 Mon Sep 17 00:00:00 2001 From: NotUnlikeTheWaves <15870306+NotUnlikeTheWaves@users.noreply.github.com> Date: Wed, 11 Nov 2020 15:37:58 +0100 Subject: [PATCH 17/71] Update language count, add link for EUPL 1.2 --- _licenses/eupl-1.2.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index ee72e32..8d7249b 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -2,7 +2,7 @@ title: European Union Public License 1.2 spdx-id: EUPL-1.2 -description: The European Union Public Licence (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. +description: The European Union Public Licence (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 23 official languages of the European Union. how: Indicate “Licensed under the EUPL” following the copyright notice of your source code, for example in a README file or directly in a source code file as a comment. From aedef9e369a9b92b0c6573a2626c493c640ade59 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 14 Nov 2020 14:38:58 -0800 Subject: [PATCH 18/71] Partially revert "Harmonize quotation marks and apostrophes" Partially reverts commit 3e2b69c68a155c462658c2d28a90a2f00a4e6f5d. --- CONTRIBUTING.md | 4 +- _licenses/cc-by-4.0.txt | 2 +- _licenses/cc-by-sa-4.0.txt | 2 +- _licenses/eupl-1.1.txt | 18 +++---- _licenses/eupl-1.2.txt | 100 ++++++++++++++++++------------------- _licenses/lgpl-3.0.txt | 2 +- _licenses/upl-1.0.txt | 2 +- no-permission.md | 2 +- 8 files changed, 66 insertions(+), 66 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c4f6c6..bcdc83f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ Please note that this project is released with a [Contributor Code of Conduct](C So you want to contribute to ChooseALicense. Great! We welcome any help we can get. But first, please make sure you understand what -[this site is all about](https://choosealicense.com/about). It's not a comprehensive list of all possible licenses. +[this site is all about](https://choosealicense.com/about). It’s not a comprehensive list of all possible licenses. ## Adding a license @@ -43,7 +43,7 @@ Note what issue/issues your patch fixes in the commit message. For example, to [change this file](/CONTRIBUTING.md), find it in the GitHub repository. Then click the `Edit` button. Make your changes, type in a commit message, and click the `Propose File Change` button. -That's it! +That’s it! For more advanced changes, check out [the bootstrap instructions](https://github.com/github/choosealicense.com#run-it-on-your-machine) in the [project's readme](/README.md). diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index 33e535d..baa5c9f 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -409,7 +409,7 @@ Section 8 -- Interpretation. Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be -considered the "Licensor." The text of the Creative Commons public +considered the “Licensor.” The text of the Creative Commons public licenses is dedicated to the public domain under the CC0 Public Domain Dedication. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index 3aec17e..b392785 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -442,7 +442,7 @@ Section 8 -- Interpretation. Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be -considered the "Licensor." The text of the Creative Commons public +considered the “Licensor.” The text of the Creative Commons public licenses is dedicated to the public domain under the CC0 Public Domain Dedication. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index c29f478..b2512b7 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -3,7 +3,7 @@ title: European Union Public License 1.1 spdx-id: EUPL-1.1 redirect_from: /licenses/eupl-v1.1/ -description: The "European Union Public Licence" (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. +description: The “European Union Public Licence” (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. how: Create a text file (typically named COPYING or LICENCE.txt) in the root of your source code and copy the text of the license into the file. @@ -39,7 +39,7 @@ V. 1.1 EUPL © the European Community 2007 -This European Union Public Licence (the "EUPL") applies to the +This European Union Public Licence (the “EUPL”) applies to the Work or Software (as defined below) which is provided under the terms of this Licence. Any use of the Work, other than as authorised under this Licence is prohibited (to the extent such use is covered by a right of the copyright @@ -86,7 +86,7 @@ communicates the Work under the Licence. - Contributor(s): any natural or legal person who modifies the Work under the Licence, or otherwise contributes to the creation of a Derivative Work. -- The Licensee or "You": any natural or legal person who makes any usage of +- The Licensee or “You”: any natural or legal person who makes any usage of the Software under the terms of the Licence. - Distribution and/or Communication: any act of selling, giving, lending, @@ -172,8 +172,8 @@ If the Licensee Distributes and/or Communicates Derivative Works or copies thereof based upon both the Original Work and another work licensed under a Compatible Licence, this Distribution and/or Communication can be done under the terms of this Compatible Licence. For the sake of this clause, -"Compatible Licence" refers to the licences listed in the appendix -attached to this Licence. Should the Licensee's obligations under the +“Compatible Licence” refers to the licences listed in the appendix +attached to this Licence. Should the Licensee’s obligations under the Compatible Licence conflict with his/her obligations under this Licence, the obligations of the Compatible Licence shall prevail. @@ -209,9 +209,9 @@ the terms of this Licence. The Work is a work in progress, which is continuously improved by numerous contributors. It is not a finished work and may therefore contain defects or -"bugs" inherent to this type of software development. +“bugs” inherent to this type of software development. -For the above reason, the Work is provided under the Licence on an "as is" +For the above reason, the Work is provided under the Licence on an “as is” basis and without warranties of any kind concerning the Work, including without limitation merchantability, fitness for a particular purpose, absence of defects or errors, accuracy, non-infringement of intellectual property @@ -250,7 +250,7 @@ liability. 10. Acceptance of the Licence The provisions of this Licence can be accepted by clicking on -an icon "I agree" placed under the bottom of a window displaying the text of +an icon “I agree” placed under the bottom of a window displaying the text of this Licence or by affirming consent in any other similar way, in accordance with the rules of applicable law. Clicking on that icon indicates your clear and irrevocable acceptance of this Licence and @@ -337,7 +337,7 @@ registered office inside a European Union country. Appendix -"Compatible Licences" according to article 5 EUPL are: +“Compatible Licences” according to article 5 EUPL are: - GNU General Public License (GNU GPL) v. 2 - Open Software License (OSL) v. 2.1, v. 3.0 - Common Public License v. 1.0 diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index ac81a52..3d75c17 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -4,7 +4,7 @@ spdx-id: EUPL-1.2 description: The European Union Public Licence (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. -how: Indicate "Licensed under the EUPL" following the copyright notice of your source code, for example in a README file or directly in a source code file as a comment. +how: Indicate “Licensed under the EUPL” following the copyright notice of your source code, for example in a README file or directly in a source code file as a comment. using: AethysRotation: https://github.com/SimCMinMax/AethysRotation/blob/master/LICENSE @@ -37,42 +37,42 @@ V. 1.2 EUPL © the European Union 2007, 2016 -This European Union Public Licence (the 'EUPL') applies to the Work (as +This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined below) which is provided under the terms of this Licence. Any use of the Work, other than as authorised under this Licence is prohibited (to the extent such use is covered by a right of the copyright holder of the Work). The Work is provided under the terms of this Licence when the Licensor (as defined below) has placed the following notice immediately following the -copyright notice for the Work: "Licensed under the EUPL", or has expressed by +copyright notice for the Work: “Licensed under the EUPL”, or has expressed by any other means his willingness to license under the EUPL. 1. Definitions In this Licence, the following terms have the following meaning: -- 'The Licence': this Licence. -- 'The Original Work': the work or software distributed or communicated by the - 'Licensor under this Licence, available as Source Code and also as - 'Executable Code as the case may be. -- 'Derivative Works': the works or software that could be created by the - 'Licensee, based upon the Original Work or modifications thereof. This - 'Licence does not define the extent of modification or dependence on the - 'Original Work required in order to classify a work as a Derivative Work; - 'this extent is determined by copyright law applicable in the country - 'mentioned in Article 15. -- 'The Work': the Original Work or its Derivative Works. -- 'The Source Code': the human-readable form of the Work which is the most +— ‘The Licence’: this Licence. +— ‘The Original Work’: the work or software distributed or communicated by the + ‘Licensor under this Licence, available as Source Code and also as + ‘Executable Code as the case may be. +— ‘Derivative Works’: the works or software that could be created by the + ‘Licensee, based upon the Original Work or modifications thereof. This + ‘Licence does not define the extent of modification or dependence on the + ‘Original Work required in order to classify a work as a Derivative Work; + ‘this extent is determined by copyright law applicable in the country + ‘mentioned in Article 15. +— ‘The Work’: the Original Work or its Derivative Works. +— ‘The Source Code’: the human-readable form of the Work which is the most convenient for people to study and modify. -- 'The Executable Code': any code which has generally been compiled and which +— ‘The Executable Code’: any code which has generally been compiled and which is meant to be interpreted by a computer as a program. -- 'The Licensor': the natural or legal person that distributes or communicates +— ‘The Licensor’: the natural or legal person that distributes or communicates the Work under the Licence. -- 'Contributor(s)': any natural or legal person who modifies the Work under +— ‘Contributor(s)’: any natural or legal person who modifies the Work under the Licence, or otherwise contributes to the creation of a Derivative Work. -- 'The Licensee' or 'You': any natural or legal person who makes any usage of +— ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of the Work under the terms of the Licence. -- 'Distribution' or 'Communication': any act of selling, giving, lending, +— ‘Distribution’ or ‘Communication’: any act of selling, giving, lending, renting, distributing, communicating, transmitting, or otherwise making available, online or offline, copies of the Work or providing access to its essential functionalities at the disposal of any other natural or legal @@ -84,15 +84,15 @@ The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, sublicensable licence to do the following, for the duration of copyright vested in the Original Work: -- use the Work in any circumstance and for all usage, -- reproduce the Work, -- modify the Work, and make Derivative Works based upon the Work, -- communicate to the public, including the right to make available or display +— use the Work in any circumstance and for all usage, +— reproduce the Work, +— modify the Work, and make Derivative Works based upon the Work, +— communicate to the public, including the right to make available or display the Work or copies thereof to the public and perform publicly, as the case may be, the Work, -- distribute the Work or copies thereof, -- lend and rent the Work or copies thereof, -- sublicense rights in the Work or copies thereof. +— distribute the Work or copies thereof, +— lend and rent the Work or copies thereof, +— sublicense rights in the Work or copies thereof. Those rights can be exercised on any media, supports and formats, whether now known or later invented, as far as the applicable law permits so. @@ -138,7 +138,7 @@ Copyleft clause: If the Licensee distributes or communicates copies of the Original Works or Derivative Works, this Distribution or Communication will be done under the terms of this Licence or of a later version of this Licence unless the Original Work is expressly distributed only under this version of -the Licence - for example by communicating 'EUPL v. 1.2 only'. The Licensee +the Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee (becoming Licensor) cannot offer or impose any additional terms or conditions on the Work or Derivative Work that alter or restrict the terms of the Licence. @@ -147,7 +147,7 @@ Compatibility clause: If the Licensee Distributes or Communicates Derivative Works or copies thereof based upon both the Work and another work licensed under a Compatible Licence, this Distribution or Communication can be done under the terms of this Compatible Licence. For the sake of this clause, -'Compatible Licence' refers to the licences listed in the appendix attached to +‘Compatible Licence’ refers to the licences listed in the appendix attached to this Licence. Should the Licensee's obligations under the Compatible Licence conflict with his/her obligations under this Licence, the obligations of the Compatible Licence shall prevail. @@ -180,9 +180,9 @@ terms of this Licence. The Work is a work in progress, which is continuously improved by numerous Contributors. It is not a finished work and may therefore contain defects or -'bugs' inherent to this type of development. +‘bugs’ inherent to this type of development. -For the above reason, the Work is provided under the Licence on an 'as is' +For the above reason, the Work is provided under the Licence on an ‘as is’ basis and without warranties of any kind concerning the Work, including without limitation merchantability, fitness for a particular purpose, absence of defects or errors, accuracy, non-infringement of intellectual property @@ -215,8 +215,8 @@ liability. 10. Acceptance of the Licence -The provisions of this Licence can be accepted by clicking on an icon 'I -agree' placed under the bottom of a window displaying the text of this Licence +The provisions of this Licence can be accepted by clicking on an icon ‘I +agree’ placed under the bottom of a window displaying the text of this Licence or by affirming consent in any other similar way, in accordance with the rules of applicable law. Clicking on that icon indicates your clear and irrevocable acceptance of this Licence and all of its terms and conditions. @@ -266,12 +266,12 @@ their choice. 14. Jurisdiction Without prejudice to specific agreement between parties, -- any litigation resulting from the interpretation of this License, arising +— any litigation resulting from the interpretation of this License, arising between the European Union institutions, bodies, offices or agencies, as a Licensor, and any Licensee, will be subject to the jurisdiction of the Court of Justice of the European Union, as laid down in article 272 of the Treaty on the Functioning of the European Union, -- any litigation arising between other parties and resulting from the +— any litigation arising between other parties and resulting from the interpretation of this License, will be subject to the exclusive jurisdiction of the competent court where the Licensor resides or conducts its primary business. @@ -279,30 +279,30 @@ Without prejudice to specific agreement between parties, 15. Applicable Law Without prejudice to specific agreement between parties, -- this Licence shall be governed by the law of the European Union Member State +— this Licence shall be governed by the law of the European Union Member State where the Licensor has his seat, resides or has his registered office, -- this licence shall be governed by Belgian law if the Licensor has no seat, +— this licence shall be governed by Belgian law if the Licensor has no seat, residence or registered office inside a European Union Member State. Appendix -'Compatible Licences' according to Article 5 EUPL are: -- GNU General Public License (GPL) v. 2, v. 3 -- GNU Affero General Public License (AGPL) v. 3 -- Open Software License (OSL) v. 2.1, v. 3.0 -- Eclipse Public License (EPL) v. 1.0 -- CeCILL v. 2.0, v. 2.1 -- Mozilla Public Licence (MPL) v. 2 -- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 -- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for +‘Compatible Licences’ according to Article 5 EUPL are: +— GNU General Public License (GPL) v. 2, v. 3 +— GNU Affero General Public License (AGPL) v. 3 +— Open Software License (OSL) v. 2.1, v. 3.0 +— Eclipse Public License (EPL) v. 1.0 +— CeCILL v. 2.0, v. 2.1 +— Mozilla Public Licence (MPL) v. 2 +— GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 +— Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for works other than software -- European Union Public Licence (EUPL) v. 1.1, v. 1.2 -- Québec Free and Open-Source Licence - Reciprocity (LiLiQ-R) or +— European Union Public Licence (EUPL) v. 1.1, v. 1.2 +— Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong Reciprocity (LiLiQ-R+) -- The European Commission may update this Appendix to later versions of the +— The European Commission may update this Appendix to later versions of the above licences without producing a new version of the EUPL, as long as they provide the rights granted in Article 2 of this Licence and protect the covered Source Code from exclusive appropriation. -- All other changes or additions to this Appendix require the production of a +— All other changes or additions to this Appendix require the production of a new EUPL version. diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index 06cf8cf..407ae1f 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -8,7 +8,7 @@ description: Permissions of this copyleft license are conditioned on making avai how: This license is an additional set of permissions to the GNU GPLv3 license. Follow the instructions to apply the GNU GPLv3, in the root of your source code. Then add another file named COPYING.LESSER and copy the text. -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 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. +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 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. using: diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index 772858d..6c53e79 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -43,7 +43,7 @@ Works (as defined below), to deal in both (a) the Software, and (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if -one is included with the Software (each a "Larger Work" to which the Software +one is included with the Software (each a “Larger Work” to which the Software is contributed by such licensors), without restriction, including without limitation the rights to copy, create diff --git a/no-permission.md b/no-permission.md index d7e4a3f..b17682b 100644 --- a/no-permission.md +++ b/no-permission.md @@ -8,7 +8,7 @@ title: No License description: "You're under no obligation to choose a license and it's your right not to include one with your code or project. But please note that opting out of open source licenses doesn't mean you're opting out of copyright law." --- -When you make a creative work (which includes code), the work is under exclusive copyright by default. Unless you include a license that specifies otherwise, nobody else can copy, distribute, or modify your work without being at risk of take-downs, shake-downs, or litigation. Once the work has other contributors (each a copyright holder), "nobody" starts including you. +When you make a creative work (which includes code), the work is under exclusive copyright by default. Unless you include a license that specifies otherwise, nobody else can copy, distribute, or modify your work without being at risk of take-downs, shake-downs, or litigation. Once the work has other contributors (each a copyright holder), “nobody” starts including you. Even in the absence of a license file, you may grant some rights in cases where you publish your source code to a site that requires accepting terms of service. For example, if you publish your source code in a public repository on GitHub, you have accepted the [Terms of Service](https://help.github.com/articles/github-terms-of-service), by which you allow others to view and fork your repository. Others may not need your permission if [limitations and exceptions to copyright](https://en.wikipedia.org/wiki/Limitations_and_exceptions_to_copyright) apply to their particular situation. Neither site terms nor jurisdiction-specific copyright limitations are sufficient for the kinds of collaboration that people usually seek on a public code host, such as experimentation, modification, and sharing as fostered by an open source license. From 41ae8531898dbc93ab073dc4361a28d14a31d08d Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 20 Nov 2020 09:20:59 -0800 Subject: [PATCH 19/71] turn on bundler cache --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c71740e..fc45f28 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,6 +18,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: 2.7.1 + bundler-cache: true - name: Install dependencies run: ./script/bootstrap From f7bd8a4d2609cf3669515116cee618f72462ffdd Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 20 Nov 2020 09:42:45 -0800 Subject: [PATCH 20/71] don't publish spec directory --- _config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index dffa752..14ec7a7 100644 --- a/_config.yml +++ b/_config.yml @@ -30,8 +30,7 @@ exclude: - README.md - script - vendor/bundle - - test - - tests + - spec - assets/vendor/selectivizr/tests - assets/vendor/clipboard/test - assets/vendor/*/README.* From df2920d76ff84fb6b18e3709fd3650e0009217e3 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 20 Nov 2020 09:58:37 -0800 Subject: [PATCH 21/71] redundant with cache enabled, per https://github.com/github/choosealicense.com/pull/791#discussion_r527852495 --- .github/workflows/test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fc45f28..dc1b872 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,8 +20,5 @@ jobs: ruby-version: 2.7.1 bundler-cache: true - - name: Install dependencies - run: ./script/bootstrap - - name: Run tests run: ./script/cibuild From 8b401895a1a8631cfa0778aa52c9c1fee6e10284 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 13 Dec 2020 10:45:01 -0800 Subject: [PATCH 22/71] -no-RFN and -RFN to OFL sidebar Fixes #795 --- _includes/sidebar.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 1540756..355e62a 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -26,7 +26,9 @@ {% endif %} {% assign xgpl = false %} {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %} -

    Add {{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}{% if xgpl %} (or {{ page.spdx-id }}-only to disallow future versions){% endif %} to your project’s package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.

    + {% assign ofl = false %} + {% if page.spdx-id contains 'OFL-1' %}{% assign ofl = true %}{% endif %} +

    Add {{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}{% if ofl %}-no-RFN{% endif %}{% if xgpl %} (or {{ page.spdx-id }}-only to disallow future versions){% endif %}{% if ofl %} (or {{ page.spdx-id }}-RFN if a Reserved Font Name is specified after the copyright statement){% endif %} to your project’s package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.

    {% if page.spdx-id contains 'GPL-2' %}

    If you would like your project to adopt the GPL-3.0’s cure provision, add the text of the GPL Cooperation Commitment to a file named COMMITMENT in the same directory as your {{ page.spdx-id }} license file.

    {% endif %} From af6ee9e35c323e78560275672a600652629dbb18 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 17 Dec 2020 21:13:52 -0800 Subject: [PATCH 23/71] no longer used --- _includes/footer.html | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index d3097e6..220b2e9 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -34,16 +34,5 @@ {% endif %} - - - From 7a5b314c0472b74f112f91a138482055f564831d Mon Sep 17 00:00:00 2001 From: Benno Bielmeier <32938211+bbenno@users.noreply.github.com> Date: Tue, 22 Dec 2020 09:29:42 +0100 Subject: [PATCH 24/71] Update format of eupl-1.2.txt Use the official UTF-8 format version from https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/2020-03/EUPL-1.2%20EN.txt that is linked on https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 --- _licenses/eupl-1.2.txt | 307 +++++++++++++++++++++-------------------- 1 file changed, 160 insertions(+), 147 deletions(-) diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index 8d7249b..683f35c 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -32,47 +32,56 @@ limitations: --- -European Union Public Licence -V. 1.2 + EUROPEAN UNION PUBLIC LICENCE v. 1.2 + EUPL © the European Union 2007, 2016 -EUPL © the European Union 2007, 2016 - -This European Union Public Licence (the ‘EUPL’) applies to the Work (as -defined below) which is provided under the terms of this Licence. Any use of -the Work, other than as authorised under this Licence is prohibited (to the -extent such use is covered by a right of the copyright holder of the Work). +This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined +below) which is provided under the terms of this Licence. Any use of the Work, +other than as authorised under this Licence is prohibited (to the extent such +use is covered by a right of the copyright holder of the Work). The Work is provided under the terms of this Licence when the Licensor (as defined below) has placed the following notice immediately following the -copyright notice for the Work: “Licensed under the EUPL”, or has expressed by -any other means his willingness to license under the EUPL. +copyright notice for the Work: + + Licensed under the EUPL + +or has expressed by any other means his willingness to license under the EUPL. 1. Definitions In this Licence, the following terms have the following meaning: -— ‘The Licence’: this Licence. -— ‘The Original Work’: the work or software distributed or communicated by the - ‘Licensor under this Licence, available as Source Code and also as - ‘Executable Code as the case may be. -— ‘Derivative Works’: the works or software that could be created by the - ‘Licensee, based upon the Original Work or modifications thereof. This - ‘Licence does not define the extent of modification or dependence on the - ‘Original Work required in order to classify a work as a Derivative Work; - ‘this extent is determined by copyright law applicable in the country - ‘mentioned in Article 15. -— ‘The Work’: the Original Work or its Derivative Works. -— ‘The Source Code’: the human-readable form of the Work which is the most + +- ‘The Licence’: this Licence. + +- ‘The Original Work’: the work or software distributed or communicated by the + Licensor under this Licence, available as Source Code and also as Executable + Code as the case may be. + +- ‘Derivative Works’: the works or software that could be created by the + Licensee, based upon the Original Work or modifications thereof. This Licence + does not define the extent of modification or dependence on the Original Work + required in order to classify a work as a Derivative Work; this extent is + determined by copyright law applicable in the country mentioned in Article 15. + +- ‘The Work’: the Original Work or its Derivative Works. + +- ‘The Source Code’: the human-readable form of the Work which is the most convenient for people to study and modify. -— ‘The Executable Code’: any code which has generally been compiled and which - is meant to be interpreted by a computer as a program. -— ‘The Licensor’: the natural or legal person that distributes or communicates +- ‘The Executable Code’: any code which has generally been compiled and which is + meant to be interpreted by a computer as a program. + +- ‘The Licensor’: the natural or legal person that distributes or communicates the Work under the Licence. -— ‘Contributor(s)’: any natural or legal person who modifies the Work under - the Licence, or otherwise contributes to the creation of a Derivative Work. -— ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of + +- ‘Contributor(s)’: any natural or legal person who modifies the Work under the + Licence, or otherwise contributes to the creation of a Derivative Work. + +- ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of the Work under the terms of the Licence. -— ‘Distribution’ or ‘Communication’: any act of selling, giving, lending, + +- ‘Distribution’ or ‘Communication’: any act of selling, giving, lending, renting, distributing, communicating, transmitting, or otherwise making available, online or offline, copies of the Work or providing access to its essential functionalities at the disposal of any other natural or legal @@ -81,46 +90,46 @@ In this Licence, the following terms have the following meaning: 2. Scope of the rights granted by the Licence The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, -sublicensable licence to do the following, for the duration of copyright -vested in the Original Work: +sublicensable licence to do the following, for the duration of copyright vested +in the Original Work: -— use the Work in any circumstance and for all usage, -— reproduce the Work, -— modify the Work, and make Derivative Works based upon the Work, -— communicate to the public, including the right to make available or display - the Work or copies thereof to the public and perform publicly, as the case - may be, the Work, -— distribute the Work or copies thereof, -— lend and rent the Work or copies thereof, -— sublicense rights in the Work or copies thereof. +- use the Work in any circumstance and for all usage, +- reproduce the Work, +- modify the Work, and make Derivative Works based upon the Work, +- communicate to the public, including the right to make available or display + the Work or copies thereof to the public and perform publicly, as the case may + be, the Work, +- distribute the Work or copies thereof, +- lend and rent the Work or copies thereof, +- sublicense rights in the Work or copies thereof. Those rights can be exercised on any media, supports and formats, whether now known or later invented, as far as the applicable law permits so. In the countries where moral rights apply, the Licensor waives his right to -exercise his moral right to the extent allowed by law in order to make -effective the licence of the economic rights here above listed. +exercise his moral right to the extent allowed by law in order to make effective +the licence of the economic rights here above listed. -The Licensor grants to the Licensee royalty-free, non-exclusive usage rights -to any patents held by the Licensor, to the extent necessary to make use of -the rights granted on the Work under this Licence. +The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to +any patents held by the Licensor, to the extent necessary to make use of the +rights granted on the Work under this Licence. 3. Communication of the Source Code The Licensor may provide the Work either in its Source Code form, or as Executable Code. If the Work is provided as Executable Code, the Licensor provides in addition a machine-readable copy of the Source Code of the Work -along with each copy of the Work that the Licensor distributes or indicates, -in a notice following the copyright notice attached to the Work, a repository -where the Source Code is easily and freely accessible for as long as the -Licensor continues to distribute or communicate the Work. +along with each copy of the Work that the Licensor distributes or indicates, in +a notice following the copyright notice attached to the Work, a repository where +the Source Code is easily and freely accessible for as long as the Licensor +continues to distribute or communicate the Work. 4. Limitations on copyright -Nothing in this Licence is intended to deprive the Licensee of the benefits -from any exception or limitation to the exclusive rights of the rights owners -in the Work, of the exhaustion of those rights or of other applicable -limitations thereto. +Nothing in this Licence is intended to deprive the Licensee of the benefits from +any exception or limitation to the exclusive rights of the rights owners in the +Work, of the exhaustion of those rights or of other applicable limitations +thereto. 5. Obligations of the Licensee @@ -129,37 +138,36 @@ obligations imposed on the Licensee. Those obligations are the following: Attribution right: The Licensee shall keep intact all copyright, patent or trademarks notices and all notices that refer to the Licence and to the -disclaimer of warranties. The Licensee must include a copy of such notices and -a copy of the Licence with every copy of the Work he/she distributes or +disclaimer of warranties. The Licensee must include a copy of such notices and a +copy of the Licence with every copy of the Work he/she distributes or communicates. The Licensee must cause any Derivative Work to carry prominent notices stating that the Work has been modified and the date of modification. Copyleft clause: If the Licensee distributes or communicates copies of the Original Works or Derivative Works, this Distribution or Communication will be done under the terms of this Licence or of a later version of this Licence -unless the Original Work is expressly distributed only under this version of -the Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee -(becoming Licensor) cannot offer or impose any additional terms or conditions -on the Work or Derivative Work that alter or restrict the terms of the -Licence. +unless the Original Work is expressly distributed only under this version of the +Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee +(becoming Licensor) cannot offer or impose any additional terms or conditions on +the Work or Derivative Work that alter or restrict the terms of the Licence. Compatibility clause: If the Licensee Distributes or Communicates Derivative -Works or copies thereof based upon both the Work and another work licensed -under a Compatible Licence, this Distribution or Communication can be done -under the terms of this Compatible Licence. For the sake of this clause, -‘Compatible Licence’ refers to the licences listed in the appendix attached to -this Licence. Should the Licensee's obligations under the Compatible Licence -conflict with his/her obligations under this Licence, the obligations of the -Compatible Licence shall prevail. +Works or copies thereof based upon both the Work and another work licensed under +a Compatible Licence, this Distribution or Communication can be done under the +terms of this Compatible Licence. For the sake of this clause, ‘Compatible +Licence’ refers to the licences listed in the appendix attached to this Licence. +Should the Licensee's obligations under the Compatible Licence conflict with +his/her obligations under this Licence, the obligations of the Compatible +Licence shall prevail. -Provision of Source Code: When distributing or communicating copies of the -Work, the Licensee will provide a machine-readable copy of the Source Code or -indicate a repository where this Source will be easily and freely available -for as long as the Licensee continues to distribute or communicate the Work. +Provision of Source Code: When distributing or communicating copies of the Work, +the Licensee will provide a machine-readable copy of the Source Code or indicate +a repository where this Source will be easily and freely available for as long +as the Licensee continues to distribute or communicate the Work. -Legal Protection: This Licence does not grant permission to use the trade -names, trademarks, service marks, or names of the Licensor, except as required -for reasonable and customary use in describing the origin of the Work and +Legal Protection: This Licence does not grant permission to use the trade names, +trademarks, service marks, or names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and reproducing the content of the copyright notice. 6. Chain of Authorship @@ -168,9 +176,9 @@ The original Licensor warrants that the copyright in the Original Work granted hereunder is owned by him/her or licensed to him/her and that he/she has the power and authority to grant the Licence. -Each Contributor warrants that the copyright in the modifications he/she -brings to the Work are owned by him/her or licensed to him/her and that he/she -has the power and authority to grant the Licence. +Each Contributor warrants that the copyright in the modifications he/she brings +to the Work are owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. Each time You accept the Licence, the original Licensor and subsequent Contributors grant You a licence to their contributions to the Work, under the @@ -182,66 +190,66 @@ The Work is a work in progress, which is continuously improved by numerous Contributors. It is not a finished work and may therefore contain defects or ‘bugs’ inherent to this type of development. -For the above reason, the Work is provided under the Licence on an ‘as is’ -basis and without warranties of any kind concerning the Work, including -without limitation merchantability, fitness for a particular purpose, absence -of defects or errors, accuracy, non-infringement of intellectual property -rights other than copyright as stated in Article 6 of this Licence. +For the above reason, the Work is provided under the Licence on an ‘as is’ basis +and without warranties of any kind concerning the Work, including without +limitation merchantability, fitness for a particular purpose, absence of defects +or errors, accuracy, non-infringement of intellectual property rights other than +copyright as stated in Article 6 of this Licence. -This disclaimer of warranty is an essential part of the Licence and a -condition for the grant of any rights to the Work. +This disclaimer of warranty is an essential part of the Licence and a condition +for the grant of any rights to the Work. 8. Disclaimer of Liability Except in the cases of wilful misconduct or damages directly caused to natural persons, the Licensor will in no event be liable for any direct or indirect, -material or moral, damages of any kind, arising out of the Licence or of the -use of the Work, including without limitation, damages for loss of goodwill, -work stoppage, computer failure or malfunction, loss of data or any commercial -damage, even if the Licensor has been advised of the possibility of such -damage. However, the Licensor will be liable under statutory product liability -laws as far such laws apply to the Work. +material or moral, damages of any kind, arising out of the Licence or of the use +of the Work, including without limitation, damages for loss of goodwill, work +stoppage, computer failure or malfunction, loss of data or any commercial +damage, even if the Licensor has been advised of the possibility of such damage. +However, the Licensor will be liable under statutory product liability laws as +far such laws apply to the Work. 9. Additional agreements -While distributing the Work, You may choose to conclude an additional -agreement, defining obligations or services consistent with this Licence. -However, if accepting obligations, You may act only on your own behalf and on -your sole responsibility, not on behalf of the original Licensor or any other -Contributor, and only if You agree to indemnify, defend, and hold each -Contributor harmless for any liability incurred by, or claims asserted against -such Contributor by the fact You have accepted any warranty or additional -liability. +While distributing the Work, You may choose to conclude an additional agreement, +defining obligations or services consistent with this Licence. However, if +accepting obligations, You may act only on your own behalf and on your sole +responsibility, not on behalf of the original Licensor or any other Contributor, +and only if You agree to indemnify, defend, and hold each Contributor harmless +for any liability incurred by, or claims asserted against such Contributor by +the fact You have accepted any warranty or additional liability. 10. Acceptance of the Licence -The provisions of this Licence can be accepted by clicking on an icon ‘I -agree’ placed under the bottom of a window displaying the text of this Licence -or by affirming consent in any other similar way, in accordance with the rules -of applicable law. Clicking on that icon indicates your clear and irrevocable +The provisions of this Licence can be accepted by clicking on an icon ‘I agree’ +placed under the bottom of a window displaying the text of this Licence or by +affirming consent in any other similar way, in accordance with the rules of +applicable law. Clicking on that icon indicates your clear and irrevocable acceptance of this Licence and all of its terms and conditions. Similarly, you irrevocably accept this Licence and all of its terms and -conditions by exercising any rights granted to You by Article 2 of this -Licence, such as the use of the Work, the creation by You of a Derivative Work -or the Distribution or Communication by You of the Work or copies thereof. +conditions by exercising any rights granted to You by Article 2 of this Licence, +such as the use of the Work, the creation by You of a Derivative Work or the +Distribution or Communication by You of the Work or copies thereof. 11. Information to the public -In case of any Distribution or Communication of the Work by means of -electronic communication by You (for example, by offering to download the Work -from a remote location) the distribution channel or media (for example, a -website) must at least provide to the public the information requested by the -applicable law regarding the Licensor, the Licence and the way it may be -accessible, concluded, stored and reproduced by the Licensee. +In case of any Distribution or Communication of the Work by means of electronic +communication by You (for example, by offering to download the Work from a +remote location) the distribution channel or media (for example, a website) must +at least provide to the public the information requested by the applicable law +regarding the Licensor, the Licence and the way it may be accessible, concluded, +stored and reproduced by the Licensee. 12. Termination of the Licence The Licence and the rights granted hereunder will terminate automatically upon -any breach by the Licensee of the terms of the Licence. Such a termination -will not terminate the licences of any person who has received the Work from -the Licensee under the Licence, provided such persons remain in full -compliance with the Licence. +any breach by the Licensee of the terms of the Licence. + +Such a termination will not terminate the licences of any person who has +received the Work from the Licensee under the Licence, provided such persons +remain in full compliance with the Licence. 13. Miscellaneous @@ -253,11 +261,10 @@ law, this will not affect the validity or enforceability of the Licence as a whole. Such provision will be construed or reformed so as necessary to make it valid and enforceable. -The European Commission may publish other linguistic versions or new versions -of this Licence or updated versions of the Appendix, so far this is required -and reasonable, without reducing the scope of the rights granted by the -Licence. New versions of the Licence will be published with a unique version -number. +The European Commission may publish other linguistic versions or new versions of +this Licence or updated versions of the Appendix, so far this is required and +reasonable, without reducing the scope of the rights granted by the Licence. New +versions of the Licence will be published with a unique version number. All linguistic versions of this Licence, approved by the European Commission, have identical value. Parties can take advantage of the linguistic version of @@ -266,43 +273,49 @@ their choice. 14. Jurisdiction Without prejudice to specific agreement between parties, -— any litigation resulting from the interpretation of this License, arising + +- any litigation resulting from the interpretation of this License, arising between the European Union institutions, bodies, offices or agencies, as a Licensor, and any Licensee, will be subject to the jurisdiction of the Court - of Justice of the European Union, as laid down in article 272 of the Treaty - on the Functioning of the European Union, -— any litigation arising between other parties and resulting from the - interpretation of this License, will be subject to the exclusive - jurisdiction of the competent court where the Licensor resides or conducts - its primary business. + of Justice of the European Union, as laid down in article 272 of the Treaty on + the Functioning of the European Union, + +- any litigation arising between other parties and resulting from the + interpretation of this License, will be subject to the exclusive jurisdiction + of the competent court where the Licensor resides or conducts its primary + business. 15. Applicable Law Without prejudice to specific agreement between parties, -— this Licence shall be governed by the law of the European Union Member State + +- this Licence shall be governed by the law of the European Union Member State where the Licensor has his seat, resides or has his registered office, -— this licence shall be governed by Belgian law if the Licensor has no seat, + +- this licence shall be governed by Belgian law if the Licensor has no seat, residence or registered office inside a European Union Member State. Appendix ‘Compatible Licences’ according to Article 5 EUPL are: -— GNU General Public License (GPL) v. 2, v. 3 -— GNU Affero General Public License (AGPL) v. 3 -— Open Software License (OSL) v. 2.1, v. 3.0 -— Eclipse Public License (EPL) v. 1.0 -— CeCILL v. 2.0, v. 2.1 -— Mozilla Public Licence (MPL) v. 2 -— GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 -— Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for - works other than software -— European Union Public Licence (EUPL) v. 1.1, v. 1.2 -— Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or - Strong Reciprocity (LiLiQ-R+) -— The European Commission may update this Appendix to later versions of the - above licences without producing a new version of the EUPL, as long as they - provide the rights granted in Article 2 of this Licence and protect the - covered Source Code from exclusive appropriation. -— All other changes or additions to this Appendix require the production of a - new EUPL version. +- GNU General Public License (GPL) v. 2, v. 3 +- GNU Affero General Public License (AGPL) v. 3 +- Open Software License (OSL) v. 2.1, v. 3.0 +- Eclipse Public License (EPL) v. 1.0 +- CeCILL v. 2.0, v. 2.1 +- Mozilla Public Licence (MPL) v. 2 +- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 +- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for + works other than software +- European Union Public Licence (EUPL) v. 1.1, v. 1.2 +- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong + Reciprocity (LiLiQ-R+). + +The European Commission may update this Appendix to later versions of the above +licences without producing a new version of the EUPL, as long as they provide +the rights granted in Article 2 of this Licence and protect the covered Source +Code from exclusive appropriation. + +All other changes or additions to this Appendix require the production of a new +EUPL version. From d4c21e14a76e2693766760a7bfde96b61b9c3a88 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier <32938211+bbenno@users.noreply.github.com> Date: Tue, 22 Dec 2020 09:46:11 +0100 Subject: [PATCH 25/71] Apply max line-width in eupl-1.2.txt --- _licenses/eupl-1.2.txt | 204 +++++++++++++++++++++-------------------- 1 file changed, 104 insertions(+), 100 deletions(-) diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index 683f35c..e0ce013 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -35,10 +35,10 @@ limitations: EUROPEAN UNION PUBLIC LICENCE v. 1.2 EUPL © the European Union 2007, 2016 -This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined -below) which is provided under the terms of this Licence. Any use of the Work, -other than as authorised under this Licence is prohibited (to the extent such -use is covered by a right of the copyright holder of the Work). +This European Union Public Licence (the ‘EUPL’) applies to the Work (as +defined below) which is provided under the terms of this Licence. Any use of +the Work, other than as authorised under this Licence is prohibited (to the +extent such use is covered by a right of the copyright holder of the Work). The Work is provided under the terms of this Licence when the Licensor (as defined below) has placed the following notice immediately following the @@ -59,24 +59,25 @@ In this Licence, the following terms have the following meaning: Code as the case may be. - ‘Derivative Works’: the works or software that could be created by the - Licensee, based upon the Original Work or modifications thereof. This Licence - does not define the extent of modification or dependence on the Original Work - required in order to classify a work as a Derivative Work; this extent is - determined by copyright law applicable in the country mentioned in Article 15. + Licensee, based upon the Original Work or modifications thereof. This + Licence does not define the extent of modification or dependence on the + Original Work required in order to classify a work as a Derivative Work; + this extent is determined by copyright law applicable in the country + mentioned in Article 15. - ‘The Work’: the Original Work or its Derivative Works. - ‘The Source Code’: the human-readable form of the Work which is the most convenient for people to study and modify. -- ‘The Executable Code’: any code which has generally been compiled and which is - meant to be interpreted by a computer as a program. +- ‘The Executable Code’: any code which has generally been compiled and which + is meant to be interpreted by a computer as a program. - ‘The Licensor’: the natural or legal person that distributes or communicates the Work under the Licence. -- ‘Contributor(s)’: any natural or legal person who modifies the Work under the - Licence, or otherwise contributes to the creation of a Derivative Work. +- ‘Contributor(s)’: any natural or legal person who modifies the Work under + the Licence, or otherwise contributes to the creation of a Derivative Work. - ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of the Work under the terms of the Licence. @@ -90,15 +91,15 @@ In this Licence, the following terms have the following meaning: 2. Scope of the rights granted by the Licence The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, -sublicensable licence to do the following, for the duration of copyright vested -in the Original Work: +sublicensable licence to do the following, for the duration of copyright +vested in the Original Work: - use the Work in any circumstance and for all usage, - reproduce the Work, - modify the Work, and make Derivative Works based upon the Work, - communicate to the public, including the right to make available or display - the Work or copies thereof to the public and perform publicly, as the case may - be, the Work, + the Work or copies thereof to the public and perform publicly, as the case + may be, the Work, - distribute the Work or copies thereof, - lend and rent the Work or copies thereof, - sublicense rights in the Work or copies thereof. @@ -107,29 +108,29 @@ Those rights can be exercised on any media, supports and formats, whether now known or later invented, as far as the applicable law permits so. In the countries where moral rights apply, the Licensor waives his right to -exercise his moral right to the extent allowed by law in order to make effective -the licence of the economic rights here above listed. +exercise his moral right to the extent allowed by law in order to make +effective the licence of the economic rights here above listed. -The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to -any patents held by the Licensor, to the extent necessary to make use of the -rights granted on the Work under this Licence. +The Licensor grants to the Licensee royalty-free, non-exclusive usage rights +to any patents held by the Licensor, to the extent necessary to make use of +the rights granted on the Work under this Licence. 3. Communication of the Source Code The Licensor may provide the Work either in its Source Code form, or as Executable Code. If the Work is provided as Executable Code, the Licensor provides in addition a machine-readable copy of the Source Code of the Work -along with each copy of the Work that the Licensor distributes or indicates, in -a notice following the copyright notice attached to the Work, a repository where -the Source Code is easily and freely accessible for as long as the Licensor -continues to distribute or communicate the Work. +along with each copy of the Work that the Licensor distributes or indicates, +in a notice following the copyright notice attached to the Work, a repository +where the Source Code is easily and freely accessible for as long as the +Licensor continues to distribute or communicate the Work. 4. Limitations on copyright -Nothing in this Licence is intended to deprive the Licensee of the benefits from -any exception or limitation to the exclusive rights of the rights owners in the -Work, of the exhaustion of those rights or of other applicable limitations -thereto. +Nothing in this Licence is intended to deprive the Licensee of the benefits +from any exception or limitation to the exclusive rights of the rights owners +in the Work, of the exhaustion of those rights or of other applicable +limitations thereto. 5. Obligations of the Licensee @@ -138,36 +139,37 @@ obligations imposed on the Licensee. Those obligations are the following: Attribution right: The Licensee shall keep intact all copyright, patent or trademarks notices and all notices that refer to the Licence and to the -disclaimer of warranties. The Licensee must include a copy of such notices and a -copy of the Licence with every copy of the Work he/she distributes or +disclaimer of warranties. The Licensee must include a copy of such notices and +a copy of the Licence with every copy of the Work he/she distributes or communicates. The Licensee must cause any Derivative Work to carry prominent notices stating that the Work has been modified and the date of modification. Copyleft clause: If the Licensee distributes or communicates copies of the Original Works or Derivative Works, this Distribution or Communication will be done under the terms of this Licence or of a later version of this Licence -unless the Original Work is expressly distributed only under this version of the -Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee -(becoming Licensor) cannot offer or impose any additional terms or conditions on -the Work or Derivative Work that alter or restrict the terms of the Licence. +unless the Original Work is expressly distributed only under this version of +the Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee +(becoming Licensor) cannot offer or impose any additional terms or conditions +on the Work or Derivative Work that alter or restrict the terms of the +Licence. Compatibility clause: If the Licensee Distributes or Communicates Derivative -Works or copies thereof based upon both the Work and another work licensed under -a Compatible Licence, this Distribution or Communication can be done under the -terms of this Compatible Licence. For the sake of this clause, ‘Compatible -Licence’ refers to the licences listed in the appendix attached to this Licence. -Should the Licensee's obligations under the Compatible Licence conflict with -his/her obligations under this Licence, the obligations of the Compatible -Licence shall prevail. +Works or copies thereof based upon both the Work and another work licensed +under a Compatible Licence, this Distribution or Communication can be done +under the terms of this Compatible Licence. For the sake of this clause, +‘Compatible Licence’ refers to the licences listed in the appendix attached to +this Licence. Should the Licensee's obligations under the Compatible Licence +conflict with his/her obligations under this Licence, the obligations of the +Compatible Licence shall prevail. -Provision of Source Code: When distributing or communicating copies of the Work, -the Licensee will provide a machine-readable copy of the Source Code or indicate -a repository where this Source will be easily and freely available for as long -as the Licensee continues to distribute or communicate the Work. +Provision of Source Code: When distributing or communicating copies of the +Work, the Licensee will provide a machine-readable copy of the Source Code or +indicate a repository where this Source will be easily and freely available +for as long as the Licensee continues to distribute or communicate the Work. -Legal Protection: This Licence does not grant permission to use the trade names, -trademarks, service marks, or names of the Licensor, except as required for -reasonable and customary use in describing the origin of the Work and +Legal Protection: This Licence does not grant permission to use the trade +names, trademarks, service marks, or names of the Licensor, except as required +for reasonable and customary use in describing the origin of the Work and reproducing the content of the copyright notice. 6. Chain of Authorship @@ -176,9 +178,9 @@ The original Licensor warrants that the copyright in the Original Work granted hereunder is owned by him/her or licensed to him/her and that he/she has the power and authority to grant the Licence. -Each Contributor warrants that the copyright in the modifications he/she brings -to the Work are owned by him/her or licensed to him/her and that he/she has the -power and authority to grant the Licence. +Each Contributor warrants that the copyright in the modifications he/she +brings to the Work are owned by him/her or licensed to him/her and that he/she +has the power and authority to grant the Licence. Each time You accept the Licence, the original Licensor and subsequent Contributors grant You a licence to their contributions to the Work, under the @@ -190,57 +192,58 @@ The Work is a work in progress, which is continuously improved by numerous Contributors. It is not a finished work and may therefore contain defects or ‘bugs’ inherent to this type of development. -For the above reason, the Work is provided under the Licence on an ‘as is’ basis -and without warranties of any kind concerning the Work, including without -limitation merchantability, fitness for a particular purpose, absence of defects -or errors, accuracy, non-infringement of intellectual property rights other than -copyright as stated in Article 6 of this Licence. +For the above reason, the Work is provided under the Licence on an ‘as is’ +basis and without warranties of any kind concerning the Work, including +without limitation merchantability, fitness for a particular purpose, absence +of defects or errors, accuracy, non-infringement of intellectual property +rights other than copyright as stated in Article 6 of this Licence. -This disclaimer of warranty is an essential part of the Licence and a condition -for the grant of any rights to the Work. +This disclaimer of warranty is an essential part of the Licence and a +condition for the grant of any rights to the Work. 8. Disclaimer of Liability Except in the cases of wilful misconduct or damages directly caused to natural persons, the Licensor will in no event be liable for any direct or indirect, -material or moral, damages of any kind, arising out of the Licence or of the use -of the Work, including without limitation, damages for loss of goodwill, work -stoppage, computer failure or malfunction, loss of data or any commercial -damage, even if the Licensor has been advised of the possibility of such damage. -However, the Licensor will be liable under statutory product liability laws as -far such laws apply to the Work. +material or moral, damages of any kind, arising out of the Licence or of the +use of the Work, including without limitation, damages for loss of goodwill, +work stoppage, computer failure or malfunction, loss of data or any commercial +damage, even if the Licensor has been advised of the possibility of such +damage. However, the Licensor will be liable under statutory product liability +laws as far such laws apply to the Work. 9. Additional agreements -While distributing the Work, You may choose to conclude an additional agreement, -defining obligations or services consistent with this Licence. However, if -accepting obligations, You may act only on your own behalf and on your sole -responsibility, not on behalf of the original Licensor or any other Contributor, -and only if You agree to indemnify, defend, and hold each Contributor harmless -for any liability incurred by, or claims asserted against such Contributor by -the fact You have accepted any warranty or additional liability. +While distributing the Work, You may choose to conclude an additional +agreement, defining obligations or services consistent with this Licence. +However, if accepting obligations, You may act only on your own behalf and on +your sole responsibility, not on behalf of the original Licensor or any other +Contributor, and only if You agree to indemnify, defend, and hold each +Contributor harmless for any liability incurred by, or claims asserted against +such Contributor by the fact You have accepted any warranty or additional +liability. 10. Acceptance of the Licence -The provisions of this Licence can be accepted by clicking on an icon ‘I agree’ -placed under the bottom of a window displaying the text of this Licence or by -affirming consent in any other similar way, in accordance with the rules of -applicable law. Clicking on that icon indicates your clear and irrevocable +The provisions of this Licence can be accepted by clicking on an icon ‘I +agree’ placed under the bottom of a window displaying the text of this Licence +or by affirming consent in any other similar way, in accordance with the rules +of applicable law. Clicking on that icon indicates your clear and irrevocable acceptance of this Licence and all of its terms and conditions. Similarly, you irrevocably accept this Licence and all of its terms and -conditions by exercising any rights granted to You by Article 2 of this Licence, -such as the use of the Work, the creation by You of a Derivative Work or the -Distribution or Communication by You of the Work or copies thereof. +conditions by exercising any rights granted to You by Article 2 of this +Licence, such as the use of the Work, the creation by You of a Derivative Work +or the Distribution or Communication by You of the Work or copies thereof. 11. Information to the public -In case of any Distribution or Communication of the Work by means of electronic -communication by You (for example, by offering to download the Work from a -remote location) the distribution channel or media (for example, a website) must -at least provide to the public the information requested by the applicable law -regarding the Licensor, the Licence and the way it may be accessible, concluded, -stored and reproduced by the Licensee. +In case of any Distribution or Communication of the Work by means of +electronic communication by You (for example, by offering to download the Work +from a remote location) the distribution channel or media (for example, a +website) must at least provide to the public the information requested by the +applicable law regarding the Licensor, the Licence and the way it may be +accessible, concluded, stored and reproduced by the Licensee. 12. Termination of the Licence @@ -261,10 +264,11 @@ law, this will not affect the validity or enforceability of the Licence as a whole. Such provision will be construed or reformed so as necessary to make it valid and enforceable. -The European Commission may publish other linguistic versions or new versions of -this Licence or updated versions of the Appendix, so far this is required and -reasonable, without reducing the scope of the rights granted by the Licence. New -versions of the Licence will be published with a unique version number. +The European Commission may publish other linguistic versions or new versions +of this Licence or updated versions of the Appendix, so far this is required +and reasonable, without reducing the scope of the rights granted by the +Licence. New versions of the Licence will be published with a unique version +number. All linguistic versions of this Licence, approved by the European Commission, have identical value. Parties can take advantage of the linguistic version of @@ -277,13 +281,13 @@ Without prejudice to specific agreement between parties, - any litigation resulting from the interpretation of this License, arising between the European Union institutions, bodies, offices or agencies, as a Licensor, and any Licensee, will be subject to the jurisdiction of the Court - of Justice of the European Union, as laid down in article 272 of the Treaty on - the Functioning of the European Union, + of Justice of the European Union, as laid down in article 272 of the Treaty + on the Functioning of the European Union, - any litigation arising between other parties and resulting from the - interpretation of this License, will be subject to the exclusive jurisdiction - of the competent court where the Licensor resides or conducts its primary - business. + interpretation of this License, will be subject to the exclusive + jurisdiction of the competent court where the Licensor resides or conducts + its primary business. 15. Applicable Law @@ -312,10 +316,10 @@ Appendix - Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong Reciprocity (LiLiQ-R+). -The European Commission may update this Appendix to later versions of the above -licences without producing a new version of the EUPL, as long as they provide -the rights granted in Article 2 of this Licence and protect the covered Source -Code from exclusive appropriation. +The European Commission may update this Appendix to later versions of the +above licences without producing a new version of the EUPL, as long as they +provide the rights granted in Article 2 of this Licence and protect the +covered Source Code from exclusive appropriation. -All other changes or additions to this Appendix require the production of a new -EUPL version. +All other changes or additions to this Appendix require the production of a +new EUPL version. From 6b58f5f292a7ed392413866181030b2c90763feb Mon Sep 17 00:00:00 2001 From: Pawel Borkar Date: Sat, 20 Feb 2021 22:58:14 +0530 Subject: [PATCH 26/71] Update license year to 2021 --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 4b26f77..a295749 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2013-2018 GitHub, Inc. and contributors +Copyright (c) 2013-2021 GitHub, Inc. and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From f79f20a052bf194866f98b2b4029cd88d2d308a3 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 26 Feb 2021 12:37:14 -0800 Subject: [PATCH 27/71] Update mit-0.txt add examples --- _licenses/mit-0.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_licenses/mit-0.txt b/_licenses/mit-0.txt index 17b13d5..13e2053 100644 --- a/_licenses/mit-0.txt +++ b/_licenses/mit-0.txt @@ -7,7 +7,9 @@ description: A short and simple permissive license with no conditions, not even 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. using: + - rssfs: https://github.com/dertuxmalwieder/rssfs/blob/master/LICENSE - SOIL2: https://github.com/SpartanJ/SOIL2/blob/master/LICENSE + - Units.NET: https://github.com/angularsen/UnitsNet/blob/master/LICENSE permissions: - commercial-use From e0797f324be989ed2a674dee2fa69633db1dc586 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 26 Feb 2021 12:45:13 -0800 Subject: [PATCH 28/71] align with a5e495914c0df227e0ecd641852788c54586a04c --- _licenses/mit-0.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/mit-0.txt b/_licenses/mit-0.txt index 13e2053..1c32b5c 100644 --- a/_licenses/mit-0.txt +++ b/_licenses/mit-0.txt @@ -7,9 +7,9 @@ description: A short and simple permissive license with no conditions, not even 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. using: - - rssfs: https://github.com/dertuxmalwieder/rssfs/blob/master/LICENSE - - SOIL2: https://github.com/SpartanJ/SOIL2/blob/master/LICENSE - - Units.NET: https://github.com/angularsen/UnitsNet/blob/master/LICENSE + rssfs: https://github.com/dertuxmalwieder/rssfs/blob/master/LICENSE + SOIL2: https://github.com/SpartanJ/SOIL2/blob/master/LICENSE + Units.NET: https://github.com/angularsen/UnitsNet/blob/master/LICENSE permissions: - commercial-use From d4f8e2afe1f7759f5cb0dd8eb4bf969a6f584aa1 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 26 Feb 2021 13:47:53 -0800 Subject: [PATCH 29/71] license-list-XML as submodule and further monkeypatch licensee to use it --- .gitmodules | 3 +++ _config.yml | 1 + license-list-XML | 1 + spec/spec_helper.rb | 3 +++ 4 files changed, 8 insertions(+) create mode 100644 .gitmodules create mode 160000 license-list-XML diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..36e3304 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "license-list-XML"] + path = license-list-XML + url = https://github.com/spdx/license-list-XML.git diff --git a/_config.yml b/_config.yml index 14ec7a7..a75f55c 100644 --- a/_config.yml +++ b/_config.yml @@ -34,6 +34,7 @@ exclude: - assets/vendor/selectivizr/tests - assets/vendor/clipboard/test - assets/vendor/*/README.* + - license-list-XML plugins: - jekyll-sitemap diff --git a/license-list-XML b/license-list-XML new file mode 160000 index 0000000..b7470fc --- /dev/null +++ b/license-list-XML @@ -0,0 +1 @@ +Subproject commit b7470fcd383d59c95187af07b66b926e4ca23201 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 60a2012..00285b8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -139,6 +139,9 @@ module Licensee dir = ::File.dirname(__FILE__) ::File.expand_path '../_licenses', dir end + def spdx_dir + ::File.expand_path '../license-list-XML/src', __dir__ + end end end end From 55d5160d84d20d543a1b24f698a9b1c796ec65cc Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 23 Mar 2021 13:53:07 -0700 Subject: [PATCH 30/71] BSD-3-Clause description: copyright holder rather than project --- _licenses/bsd-3-clause.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index f554f45..df37c7d 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -3,7 +3,7 @@ title: BSD 3-Clause "New" or "Revised" License spdx-id: BSD-3-Clause hidden: false -description: A permissive license similar to the BSD 2-Clause License, but with a 3rd clause that prohibits others from using the name of the project or its contributors to promote derived products without written consent. +description: A permissive license similar to the BSD 2-Clause License, but with a 3rd clause that prohibits others from using the name of the copyright holder or its contributors to promote derived products without written consent. 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. From a4d61437065251d118c6750a8f310a4ffabff4a4 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 29 Mar 2021 09:17:44 -0700 Subject: [PATCH 31/71] CI: checkout submodules --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dc1b872..36fa223 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,6 +13,8 @@ jobs: steps: - uses: actions/checkout@v2 + with: + submodules: true - name: Set up Ruby uses: ruby/setup-ruby@v1 From 2324b41306ac252fcec92decd501500e470b0c79 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 29 Mar 2021 09:22:05 -0700 Subject: [PATCH 32/71] Update ODbL title Caught by CI, following https://github.com/spdx/license-list-XML/pull/1181 --- _licenses/odbl-1.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/odbl-1.0.txt b/_licenses/odbl-1.0.txt index c960056..161ed96 100644 --- a/_licenses/odbl-1.0.txt +++ b/_licenses/odbl-1.0.txt @@ -1,5 +1,5 @@ --- -title: ODC Open Database License v1.0 +title: Open Data Commons Open Database License v1.0 spdx-id: ODbL-1.0 nickname: ODbL From 9a138e1ef387f4336f4eabe42c99b9db9e67d42d Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 29 Mar 2021 09:25:41 -0700 Subject: [PATCH 33/71] Update CC-BY-4.0 example use WHATWG moved to a concatenated CC-BY-4.0 and BSD-3-Clause LICENSE file --- _licenses/cc-by-4.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index baa5c9f..176bb69 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -8,7 +8,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: caniuse: https://github.com/Fyrd/caniuse/blob/master/LICENSE - WHATWG HTML standard: https://github.com/whatwg/html/blob/master/LICENSE + FiveThirtyEight data: https://github.com/fivethirtyeight/data/blob/master/LICENSE Kubernetes documentation: https://github.com/kubernetes/website/blob/master/LICENSE permissions: From 07e3e9521f075ebd0d037bfc0f007a3d0324d872 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 29 Mar 2021 09:30:10 -0700 Subject: [PATCH 34/71] rubocop fixes --- spec/spec_helper.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 00285b8..9f27e58 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -33,11 +33,9 @@ def config end def licenses - SpecHelper.licenses ||= begin - site.collections['licenses'].docs.map do |license| - spdx_lcase = File.basename(license.basename, '.txt') - license.to_liquid.merge('spdx-lcase' => spdx_lcase) - end + SpecHelper.licenses ||= site.collections['licenses'].docs.map do |license| + spdx_lcase = File.basename(license.basename, '.txt') + license.to_liquid.merge('spdx-lcase' => spdx_lcase) end end @@ -139,6 +137,7 @@ module Licensee dir = ::File.dirname(__FILE__) ::File.expand_path '../_licenses', dir end + def spdx_dir ::File.expand_path '../license-list-XML/src', __dir__ end From af860ab6426d8ada854d20dfefbe6741e88167b4 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 29 Mar 2021 09:32:31 -0700 Subject: [PATCH 35/71] rubocop: indent --- spec/spec_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9f27e58..94a1655 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -34,8 +34,8 @@ end def licenses SpecHelper.licenses ||= site.collections['licenses'].docs.map do |license| - spdx_lcase = File.basename(license.basename, '.txt') - license.to_liquid.merge('spdx-lcase' => spdx_lcase) + spdx_lcase = File.basename(license.basename, '.txt') + license.to_liquid.merge('spdx-lcase' => spdx_lcase) end end From 17dc9b40dd39147362e1bbf141875f30e8b6dcd5 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Sun, 4 Apr 2021 12:08:09 +0800 Subject: [PATCH 36/71] Add the Mulan-PSL v2 license 1. SPDX Identifier: https://spdx.org/licenses/MulanPSL-2.0.html 2. OSI approved: https://opensource.org/licenses/MulanPSL-2.0 3. Over 1000 projects: https://hub.fastgit.org/search?q=%22Mulan+PSL+v2%22+filename%3ALICENSE 4. 3 notable projects founded Chinese characters are wrapped to 50 characters each line width since they're much wider than English letters. previous issue: #761 --- _licenses/mulanpsl-2.0.txt | 225 +++++++++++++++++++++++++++++++++++++ 1 file changed, 225 insertions(+) create mode 100644 _licenses/mulanpsl-2.0.txt diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt new file mode 100644 index 0000000..d904c0c --- /dev/null +++ b/_licenses/mulanpsl-2.0.txt @@ -0,0 +1,225 @@ +--- +title: Mulan Permissive Software License，Version 2 +spdx-id: MulanPSL-2.0 +hidden: true + +description: A permissive license similar to the Apache License, but explicitly states that it does not grant trademark rights. Mulan Permissive Software License is the first open source license in both Chinese and English approved by OSI. + +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. + +note: It's suggested to take 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. + +using: + - openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/LICENSE + - OSCPU NutShell: https://github.com/OSCPU/NutShell/blob/master/LICENSE + - Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE + +permissions: + - commercial-use + - modifications + - distribution + - patent-use + - private-use + +conditions: + - include-copyright + +limitations: + - liability + - trademark-use + - warranty + +--- + +木兰宽松许可证, 第2版 + +木兰宽松许可证， 第2版 + +2020年1月 http://license.coscl.org.cn/MulanPSL2 + +您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束： + +0. 定义 + +“软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。 + +“贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。 + +“贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。 + +“法人实体” 是指提交贡献的机构及其“关联实体”。 + +“关联实体” 是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是 +指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。 + +1. 授予版权许可 + +每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可 +以复制、使用、修改、分发其“贡献”，不论修改与否。 + +2. 授予专利许可 + +每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定 +撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡 +献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软 +件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“ +关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或 +其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权 +行动之日终止。 + +3. 无商标许可 + +“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定 +的声明义务而必须使用除外。 + +4. 分发限制 + +您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“ +本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。 + +5. 免责声明与责任限制 + +“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对 +任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于 +何种法律理论，即使其曾被建议有此种损失的可能性。 + +6. 语言 + +“本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文 +版为准。 + +条款结束 + +如何将木兰宽松许可证，第2版，应用到您的软件 + +如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步： + +1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字； + +2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中； + +3， 请将如下声明文本放入每个源文件的头部注释中。 + +Copyright (c) [Year] [name of copyright holder] +[Software Name] is licensed under Mulan PSL v2. +You can use this software according to the terms and conditions of the Mulan +PSL v2. +You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 +THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +See the Mulan PSL v2 for more details. + +Mulan Permissive Software License，Version 2 + +Mulan Permissive Software License，Version 2 (Mulan PSL v2) + +January 2020 http://license.coscl.org.cn/MulanPSL2 + +Your reproduction, use, modification and distribution of the Software shall b +e subject to Mulan PSL v2 (this License) with the following terms and conditi +ons: + +0. Definition + +Software means the program and related documents which are licensed under +this License and comprise all Contribution(s). + +Contribution means the copyrightable work licensed by a particular +Contributor under this License. + +Contributor means the Individual or Legal Entity who licenses its +copyrightable work under this License. + +Legal Entity means the entity making a Contribution and all its +Affiliates. + +Affiliates means entities that control, are controlled by, or are under +common control with the acting entity under this License, ‘control’ means +direct or indirect ownership of at least fifty percent (50%) of the voting +power, capital or other securities of controlled or commonly controlled +entity. + +1. Grant of Copyright License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to you a perpetual, worldwide, royalty-free, non-exclusive, +irrevocable copyright license to reproduce, use, modify, or distribute its +Contribution, with modification or not. + +2. Grant of Patent License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to you a perpetual, worldwide, royalty-free, non-exclusive, +irrevocable (except for revocation under this Section) patent license to +make, have made, use, offer for sale, sell, import or otherwise transfer its +Contribution, where such patent license is only limited to the patent claims +owned or controlled by such Contributor now or in future which will be +necessarily infringed by its Contribution alone, or by combination of the +Contribution with the Software to which the Contribution was contributed. The +patent license shall not apply to any modification of the Contribution, and +any other combination which includes the Contribution. If you or your +Affiliates directly or indirectly institute patent litigation (including a +cross claim or counterclaim in a litigation) or other patent enforcement +activities against any individual or entity by alleging that the Software or +any Contribution in it infringes patents, then any patent license granted to +you under this License for the Software shall terminate as of the date such +litigation or activity is filed or taken. + +3. No Trademark License + +No trademark license is granted to use the trade names, trademarks, service +marks, or product names of Contributor, except as required to fulfill notice +requirements in section 4. + +4. Distribution Restriction + +You may distribute the Software in any medium with or without modification, +whether in source or executable forms, provided that you provide recipients +with a copy of this License and retain copyright, patent, trademark and +disclaimer statements in the Software. + +5. Disclaimer of Warranty and Limitation of Liability + +THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY +KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR +COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED +TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM +YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO +MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGES. + +6. Language + +THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION +AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF +DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION +SHALL PREVAIL. + +END OF THE TERMS AND CONDITIONS + +How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) +to Your Software + +To apply the Mulan PSL v2 to your work, for easy identification by +recipients, you are suggested to complete following three steps: + +i. Fill in the blanks in following statement, including insert your software +name, the year of the first publication of your software, and your name +identified as the copyright owner; +ii. Create a file named "LICENSE" which contains the whole context of this +License in the first directory of your software package; +iii. Attach the statement to the appropriate annotated syntax at the +beginning of each source file. + +Copyright (c) [Year] [name of copyright holder] +[Software Name] is licensed under Mulan PSL v2. +You can use this software according to the terms and conditions of the Mulan PSL +v2. +You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 +THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +See the Mulan PSL v2 for more details. From 7d0e120a22fa15b1711e098da24cd7f36b2437b3 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Sun, 4 Apr 2021 14:53:30 +0800 Subject: [PATCH 37/71] Correct the YAML format for MulanPSL-v2 --- _licenses/mulanpsl-2.0.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index d904c0c..81841ef 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -1,7 +1,6 @@ --- title: Mulan Permissive Software License，Version 2 spdx-id: MulanPSL-2.0 -hidden: true description: A permissive license similar to the Apache License, but explicitly states that it does not grant trademark rights. Mulan Permissive Software License is the first open source license in both Chinese and English approved by OSI. @@ -10,9 +9,9 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: It's suggested to take 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. using: - - openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/LICENSE - - OSCPU NutShell: https://github.com/OSCPU/NutShell/blob/master/LICENSE - - Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE + openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/LICENSE + OSCPU NutShell: https://github.com/OSCPU/NutShell/blob/master/LICENSE + Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE permissions: - commercial-use From d8a0cbe843d0b3b9bc6c4062b318d86bf00f75ce Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Sun, 4 Apr 2021 15:10:00 +0800 Subject: [PATCH 38/71] Correct the wrap lines for MulanPSL-v2 --- _licenses/mulanpsl-2.0.txt | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index 81841ef..f40f663 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -105,8 +105,9 @@ You can use this software according to the terms and conditions of the Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at: http://license.coscl.org.cn/MulanPSL2 -THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, -EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY +KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO +NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. @@ -116,9 +117,9 @@ Mulan Permissive Software License，Version 2 (Mulan PSL v2) January 2020 http://license.coscl.org.cn/MulanPSL2 -Your reproduction, use, modification and distribution of the Software shall b -e subject to Mulan PSL v2 (this License) with the following terms and conditi -ons: +Your reproduction, use, modification and distribution of the Software shall +be subject to Mulan PSL v2 (this License) with the following terms and +conditions: 0. Definition @@ -156,8 +157,8 @@ make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the -Contribution with the Software to which the Contribution was contributed. The -patent license shall not apply to any modification of the Contribution, and +Contribution with the Software to which the Contribution was contributed. +The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement @@ -183,9 +184,9 @@ disclaimer statements in the Software. THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR -COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED -TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM -YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO +COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT +LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING +FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @@ -214,11 +215,12 @@ beginning of each source file. Copyright (c) [Year] [name of copyright holder] [Software Name] is licensed under Mulan PSL v2. -You can use this software according to the terms and conditions of the Mulan PSL -v2. +You can use this software according to the terms and conditions of the Mulan +PSL v2. You may obtain a copy of Mulan PSL v2 at: http://license.coscl.org.cn/MulanPSL2 -THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, -EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY +KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO +NON-INFRINGEMENT MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. From 8ab1de200066cd58b5a84fdc593252c25ea24f6f Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Sun, 4 Apr 2021 15:13:09 +0800 Subject: [PATCH 39/71] Correct the wrap lines for MulanPSL-v2 --- _licenses/mulanpsl-2.0.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index f40f663..a563ebe 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -158,8 +158,8 @@ Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. -The patent license shall not apply to any modification of the Contribution, and -any other combination which includes the Contribution. If you or your +The patent license shall not apply to any modification of the Contribution, +and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or @@ -199,8 +199,8 @@ SHALL PREVAIL. END OF THE TERMS AND CONDITIONS -How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) -to Your Software +How to Apply the Mulan Permissive Software License，Version 2 +(Mulan PSL v2) to Your Software To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps: From 7aa85522343ec71b1869469d43f74354fbba9df3 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Sun, 4 Apr 2021 15:18:06 +0800 Subject: [PATCH 40/71] Correct the for MulanPSL-v2 --- _licenses/mulanpsl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index a563ebe..ad2537d 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -9,7 +9,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: It's suggested to take 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. using: - openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/LICENSE + openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/License OSCPU NutShell: https://github.com/OSCPU/NutShell/blob/master/LICENSE Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE From 86129dc939ecc4ea85ca172f32b14f5430e3d80f Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Sun, 4 Apr 2021 15:32:23 +0800 Subject: [PATCH 41/71] Change the comma form for MulanPSL-v2 --- _licenses/mulanpsl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index ad2537d..2cfb15a 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -1,5 +1,5 @@ --- -title: Mulan Permissive Software License，Version 2 +title: Mulan Permissive Software License, Version 2 spdx-id: MulanPSL-2.0 description: A permissive license similar to the Apache License, but explicitly states that it does not grant trademark rights. Mulan Permissive Software License is the first open source license in both Chinese and English approved by OSI. From 3d952744bc2782eb2176e1e82ce215eaf54f4814 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Mon, 5 Apr 2021 09:50:15 +0800 Subject: [PATCH 42/71] Fix missing comma in MulanPSL-2.0 --- _licenses/mulanpsl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index 2cfb15a..424ebfe 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -221,6 +221,6 @@ You may obtain a copy of Mulan PSL v2 at: http://license.coscl.org.cn/MulanPSL2 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO -NON-INFRINGEMENT +NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. From 74170e098ab3710700bc1af62b18a3bcaf724f6f Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Mon, 5 Apr 2021 09:57:34 +0800 Subject: [PATCH 43/71] Update `using` example in MulanPSL-2.0 Huawei LiteOS is licensed under BSD-3-Clause, but the security function library, called `libsec`, is stored in a secondary directory. --- _licenses/mulanpsl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index 424ebfe..b734281 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -10,7 +10,7 @@ note: It's suggested to take the additional step of adding a boilerplate notice using: openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/License - OSCPU NutShell: https://github.com/OSCPU/NutShell/blob/master/LICENSE + Huawei LiteOS security function library: https://github.com/LiteOS/LiteOS/blob/master/lib/libsec/LICENSE Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE permissions: From f0efa379bb1a22d382bb2136bf2b7523da09e9b0 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Mon, 5 Apr 2021 10:23:29 +0800 Subject: [PATCH 44/71] Correct the writing format in MulanPSL-2.0 --- _licenses/mulanpsl-2.0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index b734281..d9e4df5 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -220,7 +220,7 @@ PSL v2. You may obtain a copy of Mulan PSL v2 at: http://license.coscl.org.cn/MulanPSL2 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY -KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO -NON-INFRINGEMENT, +KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON- +INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. From 071d0a76abeb7f439a4f5c9e6db1c898e1bc739e Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Mon, 5 Apr 2021 10:34:27 +0800 Subject: [PATCH 45/71] Change the `using` example in MulanPSL-v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Got one from Google search with `site:github.com` qualifier. （ --- _licenses/mulanpsl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index d9e4df5..d092562 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -10,7 +10,7 @@ note: It's suggested to take the additional step of adding a boilerplate notice using: openGauss Server: https://github.com/opengauss-mirror/openGauss-server/blob/master/License - Huawei LiteOS security function library: https://github.com/LiteOS/LiteOS/blob/master/lib/libsec/LICENSE + lute: https://github.com/88250/lute/blob/master/LICENSE Android CN OAID: https://github.com/gzu-liyujiang/Android_CN_OAID/blob/master/LICENSE permissions: From 370441731651463ac3c3efe641fd29b15b106f69 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Mon, 5 Apr 2021 10:41:43 +0800 Subject: [PATCH 46/71] Correct writing in MulanPSL-2.0 --- _licenses/mulanpsl-2.0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index d092562..f28743d 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -220,7 +220,7 @@ PSL v2. You may obtain a copy of Mulan PSL v2 at: http://license.coscl.org.cn/MulanPSL2 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY -KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON- -INFRINGEMENT, +KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO +NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. From 49800f1b9b693e722a2db626a3c6a5e0eddc0990 Mon Sep 17 00:00:00 2001 From: TheInterestingSoul Date: Mon, 5 Apr 2021 10:45:57 +0800 Subject: [PATCH 47/71] Remove the duplicate line in MulanPSL-2.0 Forgive me for not wearing glasses. --- _licenses/mulanpsl-2.0.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index f28743d..9a1dbea 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -222,5 +222,4 @@ You may obtain a copy of Mulan PSL v2 at: THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. -MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. From f807d03fae4f25ac9aa41927ddbc6247b881f201 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 4 Apr 2021 20:36:09 -0700 Subject: [PATCH 48/71] Add Mulan PSL v2 as nickname for MulanPSL-2.0 --- _licenses/mulanpsl-2.0.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/_licenses/mulanpsl-2.0.txt b/_licenses/mulanpsl-2.0.txt index 9a1dbea..90a2248 100644 --- a/_licenses/mulanpsl-2.0.txt +++ b/_licenses/mulanpsl-2.0.txt @@ -1,6 +1,7 @@ --- title: Mulan Permissive Software License, Version 2 spdx-id: MulanPSL-2.0 +nickname: Mulan PSL v2 description: A permissive license similar to the Apache License, but explicitly states that it does not grant trademark rights. Mulan Permissive Software License is the first open source license in both Chinese and English approved by OSI. From ec9bbeaeae5019a5f3a5b5abe43bca08b1abef6f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 4 Apr 2021 23:02:13 -0700 Subject: [PATCH 49/71] Allow bundle updae and tests to be run under ruby 3 --- Gemfile | 4 ++-- spec/ci_ruby_version_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index afe5a46..fda964b 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,8 @@ source 'https://rubygems.org' require 'json' -require 'open-uri' -versions = JSON.parse(open('https://pages.github.com/versions.json').read) +require 'net/http' +versions = JSON.parse(Net::HTTP.get(URI('https://pages.github.com/versions.json'))) gem 'github-pages', versions['github-pages'] diff --git a/spec/ci_ruby_version_spec.rb b/spec/ci_ruby_version_spec.rb index 472edce..714cf89 100644 --- a/spec/ci_ruby_version_spec.rb +++ b/spec/ci_ruby_version_spec.rb @@ -6,7 +6,7 @@ require 'spec_helper' require 'yaml' describe 'ruby version' do - pages_versions = JSON.parse(open('https://pages.github.com/versions.json').read) + pages_versions = JSON.parse(URI.open('https://pages.github.com/versions.json').read) pages_ruby_version = pages_versions['ruby'] ci_config_file = '.github/workflows/test.yml' From 91817e84d4c3d2110c9d42c021d497b0a4d07f38 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 5 Apr 2021 00:13:49 -0700 Subject: [PATCH 50/71] Add webrick to Gemfile so jekyll serve works under ruby 3 As noted in https://github.com/github/choosealicense.com/issues/822 --- Gemfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index fda964b..3a72062 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,9 @@ versions = JSON.parse(Net::HTTP.get(URI('https://pages.github.com/versions.json' gem 'github-pages', versions['github-pages'] +# https://github.com/jekyll/jekyll/issues/8523 +gem "webrick", "~> 1.7" + group :development do gem 'colored' gem 'fuzzy_match' From 3494f9e01124ee5fab1f30b26f4f18ef98a9e709 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 5 Apr 2021 00:17:33 -0700 Subject: [PATCH 51/71] rubocop --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3a72062..9ba535a 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ versions = JSON.parse(Net::HTTP.get(URI('https://pages.github.com/versions.json' gem 'github-pages', versions['github-pages'] # https://github.com/jekyll/jekyll/issues/8523 -gem "webrick", "~> 1.7" +gem 'webrick', '~> 1.7' group :development do gem 'colored' From 9b74f0ea655da78b48ccbddbd1e098fac2e8f874 Mon Sep 17 00:00:00 2001 From: r00ster Date: Sat, 29 May 2021 23:55:46 +0200 Subject: [PATCH 52/71] Improve sidebar reference links --- _includes/sidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 355e62a..8928950 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -28,7 +28,7 @@ {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %} {% assign ofl = false %} {% if page.spdx-id contains 'OFL-1' %}{% assign ofl = true %}{% endif %} -

    Add {{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}{% if ofl %}-no-RFN{% endif %}{% if xgpl %} (or {{ page.spdx-id }}-only to disallow future versions){% endif %}{% if ofl %} (or {{ page.spdx-id }}-RFN if a Reserved Font Name is specified after the copyright statement){% endif %} to your project’s package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.

    +

    Add {{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}{% if ofl %}-no-RFN{% endif %}{% if xgpl %} (or {{ page.spdx-id }}-only to disallow future versions){% endif %}{% if ofl %} (or {{ page.spdx-id }}-RFN if a Reserved Font Name is specified after the copyright statement){% endif %} to your project’s package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.

    {% if page.spdx-id contains 'GPL-2' %}

    If you would like your project to adopt the GPL-3.0’s cure provision, add the text of the GPL Cooperation Commitment to a file named COMMITMENT in the same directory as your {{ page.spdx-id }} license file.

    {% endif %} From c52ac07d8e471801130e3d315eea581f6943a350 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 6 Jun 2021 12:41:02 -0500 Subject: [PATCH 53/71] update ruby version to match github-pages gem --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 36fa223..5c131f7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7.1 + ruby-version: 2.7.3 bundler-cache: true - name: Run tests From 7d690890338aac8d654e31e1321608312c593193 Mon Sep 17 00:00:00 2001 From: Pukima Date: Sat, 12 Jun 2021 17:01:43 +0200 Subject: [PATCH 54/71] added DarkMode --- assets/css/application.scss | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/assets/css/application.scss b/assets/css/application.scss index 779b75c..9d90b2c 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -10,6 +10,29 @@ body { font: 14px/1.4 "Helvetica Neue", Helvetica, Arial, sans-serif; } +@media (prefers-color-scheme: dark) { + body { + background: #212121; + color: #d0c8c1; + } + + h1, h2, h3, h5 { + color: #dadada; + } + + .site-footer { + color: #ccc; + } + + .site-footer a { + color: #ddd; + } + + .home h2 { + color: #b6bcbd; + } +} + a { color: #149ad4; font-weight: bold; From b1e0ee80b4dd3f3e4f8dcc44b85d2ec980903889 Mon Sep 17 00:00:00 2001 From: Pukima Date: Sun, 20 Jun 2021 15:54:29 +0200 Subject: [PATCH 55/71] [Dark Mode] Added `!important`s and unthemed parts --- assets/css/application.scss | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/assets/css/application.scss b/assets/css/application.scss index 9d90b2c..a638a4e 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -17,19 +17,36 @@ body { } h1, h2, h3, h5 { - color: #dadada; + color: #dadada !important; } .site-footer { - color: #ccc; + color: #ccc !important; } .site-footer a { - color: #ddd; + color: #ddd !important; } .home h2 { - color: #b6bcbd; + color: #c7cdce !important; + } + + .license-body pre { + background-color: #131313 !important; + border: 1px solid #3e3e3e !important; + } + + .note { + color: #9fa5a6 !important; + } + + strong { + color: #bdbdbd !important; + } + + button, input, optgroup, select, textarea { + color: black !important; } } From ca19f18cc580dae5594e64d0d6fe05801c701a32 Mon Sep 17 00:00:00 2001 From: William Swartzendruber Date: Mon, 5 Jul 2021 18:59:21 -0600 Subject: [PATCH 56/71] Making the OSL-3.0 and AFL-3.0 text consistent with each other. --- _licenses/afl-3.0.txt | 24 ++++++++++++------------ _licenses/osl-3.0.txt | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index 7c19318..d324b21 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -33,27 +33,27 @@ authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: - Licensed under the Academic Free License version 3.0 + Licensed under the Academic Free License version 3.0 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: - a) to reproduce the Original Work in copies, either alone or as part of a - collective work; + a) to reproduce the Original Work in copies, either alone or as part of a + collective work; - b) to translate, adapt, alter, transform, modify, or arrange the Original - Work, thereby creating derivative works ("Derivative Works") based upon - the Original Work; + b) to translate, adapt, alter, transform, modify, or arrange the Original + Work, thereby creating derivative works ("Derivative Works") based upon the + Original Work; - c) to distribute or communicate copies of the Original Work and - Derivative Works to the public, under any license of your choice that - does not contradict the terms and conditions, including Licensor's - reserved rights and remedies, in this Academic Free License; + c) to distribute or communicate copies of the Original Work and Derivative + Works to the public, under any license of your choice that does not + contradict the terms and conditions, including Licensor's reserved rights + and remedies, in this Academic Free License; - d) to perform the Original Work publicly; and + d) to perform the Original Work publicly; and - e) to display the Original Work publicly. + e) to display the Original Work publicly. 2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index befdc77..05612b6 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -41,7 +41,7 @@ authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: -Licensed under the Open Software License version 3.0 + Licensed under the Open Software License version 3.0 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do From 4037f7168e0e9ad8d27d4bab2d04c378c76acb43 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 5 Jul 2021 21:31:41 -0700 Subject: [PATCH 57/71] Update BSD-3-Clause examples because d3 is now ISC licensed --- _licenses/bsd-3-clause.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index df37c7d..ab09aca 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -8,7 +8,7 @@ description: A permissive license similar to the Date: Fri, 13 Aug 2021 11:42:54 -0700 Subject: [PATCH 60/71] Make css and js load correctly if site rendered in a subdirectory to make showig changes from {user}.github.io/choosealicense.com possible, as suggested by @waldyrious in https://github.com/github/choosealicense.com/pull/833#issuecomment-860777503 Note links within the site will still break in this scenario, would need relative_url sprinkled in all internal links to avoid. Non-goal for now. --- _includes/footer.html | 8 ++++---- _includes/header.html | 4 ++-- assets/css/application.scss | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 220b2e9..5c4d88d 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -16,9 +16,9 @@
{% if page.collection == "licenses" or page.class == "license-types" %} - - - + + + - + {% endif %} diff --git a/_includes/header.html b/_includes/header.html index 06ee4e0..a3d4f57 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -5,8 +5,8 @@ - - + +