From dcea53171e527f1b9d96bc5465a4d4a3575db68a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 10 Jan 2017 17:23:54 -0800 Subject: [PATCH 001/144] Putdown one-use downcase script Seems to be one-time use https://github.com/github/choosealicense.com/pull/221 and doesn't need to stick around. Side note: I wondered what was going on with the double rename. I guess to make work with case insensitive file systems, which I had forgotten about. --- script/downcase | 7 ------- 1 file changed, 7 deletions(-) delete mode 100755 script/downcase diff --git a/script/downcase b/script/downcase deleted file mode 100755 index 2fb3147..0000000 --- a/script/downcase +++ /dev/null @@ -1,7 +0,0 @@ -#! /usr/bin/env ruby -# downcases all licenses in a git-friendly way - -Dir['_licenses/*'].each do |file| - system "git mv #{file} #{file.downcase}2" - system "git mv #{file.downcase}2 #{file.downcase}" -end From db878ed8f9120c56189265d480a37e1b3d9bc7ee Mon Sep 17 00:00:00 2001 From: Brandon Keepers Date: Tue, 17 Jan 2017 11:59:22 -0800 Subject: [PATCH 002/144] Check images for consistent use of http/https --- Rakefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 9cf7614..412dcbb 100644 --- a/Rakefile +++ b/Rakefile @@ -13,7 +13,8 @@ task :test do HTMLProofer.check_directory('./_site', check_html: true, validation: { ignore_script_embeds: true }, - url_swap: { %r{http://choosealicense.com} => '' }).run + url_swap: { %r{http://choosealicense.com} => '' }, + check_img_http: true).run end task :approved_licenses do From 1a728bdd264f672e0ceda8ae8d735e13d32b7192 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 17 Jan 2017 13:37:52 -0800 Subject: [PATCH 003/144] disable rubocop check new in 0.47 Avoid: ``` spec/license_spec.rb:3:1: C: Metrics/BlockLength: Block has too many lines. [40/25] describe 'licenses' do ... ^^^^^^^^^^^^^^^^^^^^^^ spec/license_spec.rb:8:3: C: Metrics/BlockLength: Block has too many lines. [35/25] licenses.each do |license| ... ^^^^^^^^^^^^^^^^^^^^^^^^^^ spec/license_spec.rb:9:5: C: Metrics/BlockLength: Block has too many lines. [33/25] context "The #{license['title']} license" do ... ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``` Doesn't seem worth refactoring, but happy to be wrong. --- .rubocop.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 07d01c1..6c5cba1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,9 +1,12 @@ AllCops: - TargetRubyVersion: 2.1 + TargetRubyVersion: 2.3 Exclude: - _site/**/* - vendor/**/* +Metrics/BlockLength: + Enabled: false + Metrics/LineLength: Enabled: false From 472237f8723f2b839b1a580127856a0d52edd843 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 17 Jan 2017 14:10:51 -0800 Subject: [PATCH 004/144] don't bump rubocop to 2.3 yet --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 6c5cba1..02d49ba 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.3 + TargetRubyVersion: 2.1 Exclude: - _site/**/* - vendor/**/* From 8360759d874d46283115eda499e6db40bcce8787 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 18 Jan 2017 11:58:54 -0800 Subject: [PATCH 005/144] https in config/test strip, maybe no functional difference --- Rakefile | 2 +- _config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index 412dcbb..7e2647e 100644 --- a/Rakefile +++ b/Rakefile @@ -13,7 +13,7 @@ task :test do HTMLProofer.check_directory('./_site', check_html: true, validation: { ignore_script_embeds: true }, - url_swap: { %r{http://choosealicense.com} => '' }, + url_swap: { %r{https://choosealicense.com} => '' }, check_img_http: true).run end diff --git a/_config.yml b/_config.yml index 74e1fce..e5d4e8d 100644 --- a/_config.yml +++ b/_config.yml @@ -3,7 +3,7 @@ title: Choose a License description: Non-judgmental guidance on choosing a license for your open source project relative_permalinks: false markdown: kramdown -url: "http://choosealicense.com" +url: "https://choosealicense.com" collections: licenses: From f08ace3feb061c26145cfe2c34fb44dcbc769947 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 18 Jan 2017 13:31:19 -0800 Subject: [PATCH 006/144] make rubocop ruby version match pages ruby version --- .rubocop.yml | 2 +- Gemfile | 1 + Rakefile | 1 + script/check-approval | 1 + script/generate-docs | 1 + spec/ci_ruby_version_spec.rb | 16 ++++++++++++++-- spec/license_bom_spec.rb | 1 + spec/license_fields_spec.rb | 1 + spec/license_meta_spec.rb | 1 + spec/license_rules_spec.rb | 1 + spec/license_shown_spec.rb | 1 + spec/license_spec.rb | 1 + spec/spec_helper.rb | 1 + 13 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 02d49ba..6c5cba1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.1 + TargetRubyVersion: 2.3 Exclude: - _site/**/* - vendor/**/* diff --git a/Gemfile b/Gemfile index 44de39e..6285dab 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ +# frozen_string_literal: true source 'https://rubygems.org' require 'json' diff --git a/Rakefile b/Rakefile index 7e2647e..01734ae 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'html-proofer' require 'rspec/core/rake_task' diff --git a/script/check-approval b/script/check-approval index 57d2867..2e4c9d2 100755 --- a/script/check-approval +++ b/script/check-approval @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true # Checks if a given license meets the approval criteria to be added to choosealicense.com # See https://github.com/github/choosealicense.com/blob/gh-pages/CONTRIBUTING.md#adding-a-license # Usage: script/check-approval [SPDX LICENSE ID] diff --git a/script/generate-docs b/script/generate-docs index e7df50d..b4edae4 100755 --- a/script/generate-docs +++ b/script/generate-docs @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true # Usage: script/generate-docs # Reads in the fields, meta, and rules YAML files and produces markdown output # suitable for documenting in the project's README diff --git a/spec/ci_ruby_version_spec.rb b/spec/ci_ruby_version_spec.rb index 7a39ad5..b61c7c5 100644 --- a/spec/ci_ruby_version_spec.rb +++ b/spec/ci_ruby_version_spec.rb @@ -1,14 +1,14 @@ +# frozen_string_literal: true require 'json' require 'open-uri' require 'spec_helper' require 'yaml' -describe 'ci ruby version' do +describe 'ruby version' do pages_versions = JSON.parse(open('https://pages.github.com/versions.json').read) pages_ruby_version = pages_versions['ruby'] ci_config_file = '.travis.yml' - ci_config = YAML.load_file(ci_config_file) ci_ruby_version = ci_config['rvm'][0] @@ -18,4 +18,16 @@ describe 'ci ruby version' do expect(ci_ruby_version).to eql(pages_ruby_version), msg end end + + rubocop_config_file = '.rubocop.yml' + rubocop_config = YAML.load_file(rubocop_config_file) + rubocop_ruby_version = rubocop_config['AllCops']['TargetRubyVersion'] + pages_ruby_version_minor = pages_ruby_version.match('^(\d+)\.(\d+)')[0] + + context "in #{rubocop_config_file} and pages ruby minor version" do + it 'match' do + msg = "#{rubocop_ruby_version} != #{pages_ruby_version_minor}; please add a commit bumping in #{rubocop_config_file}" + expect(rubocop_ruby_version.to_s).to eql(pages_ruby_version_minor), msg + end + end end diff --git a/spec/license_bom_spec.rb b/spec/license_bom_spec.rb index 02ec086..a3e2798 100644 --- a/spec/license_bom_spec.rb +++ b/spec/license_bom_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'spec_helper' describe 'byte order marks' do diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb index 52d04ec..bac33e9 100644 --- a/spec/license_fields_spec.rb +++ b/spec/license_fields_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'spec_helper' describe 'license fillable fields' do diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 0933085..60ea68b 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'spec_helper' describe 'license meta' do diff --git a/spec/license_rules_spec.rb b/spec/license_rules_spec.rb index 289d142..83137c2 100644 --- a/spec/license_rules_spec.rb +++ b/spec/license_rules_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'spec_helper' describe 'license rules' do diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb index 7c0ec1d..d2b50e4 100644 --- a/spec/license_shown_spec.rb +++ b/spec/license_shown_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'spec_helper' describe 'shown licenses' do diff --git a/spec/license_spec.rb b/spec/license_spec.rb index 2917392..95e6f43 100644 --- a/spec/license_spec.rb +++ b/spec/license_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'spec_helper' describe 'licenses' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f71f332..c99daf6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'jekyll' require 'open-uri' require 'json' From 7eb19e13685890392c4fd719eeb16775deed0360 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 14 Feb 2017 13:22:06 -0800 Subject: [PATCH 007/144] Link to Open Source Guide on The Legal Side of Open Source https://opensource.guide/legal/ one of a set of guides released today https://github.com/blog/2318-announcing-open-source-guides For now just adding as an additional resource, eventually should be worked into home and/or licenses pages. --- about.md | 1 + 1 file changed, 1 insertion(+) diff --git a/about.md b/about.md index 26572d5..cd5914c 100644 --- a/about.md +++ b/about.md @@ -24,6 +24,7 @@ See our [appendix](/appendix) for a table of all of the licenses cataloged in th * [Comparison of free and open-source software licenses](https://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses) on English Wikipedia * [License differentiator](http://www.oss-watch.ac.uk/apps/licdiff/) ([source](https://github.com/ox-it/licdiff)) from [OSS Watch](http://www.oss-watch.ac.uk/) * [Free/Libre/Open Source license selection wizard](http://vrici.lojban.org/~cowan/floss/) by John Cowan +* [The Legal Side of Open Source](https://opensource.guide/legal/), an Open Source Guide covering licensing and related issues ## Help us improve it From fef584ce1a161f259a9031548cc1398084cfdd36 Mon Sep 17 00:00:00 2001 From: Phineas Date: Wed, 15 Feb 2017 20:29:30 +0000 Subject: [PATCH 008/144] Update LICENSE Copyright Date to 2017 --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 61ed314..a08a18f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2013-2016 GitHub, Inc. and contributors +Copyright (c) 2013-2017 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 6ae1f697d76db394a33fe4cfcddea76c80c7c51a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Feb 2017 14:37:32 -0800 Subject: [PATCH 009/144] same-license--variations --- _data/rules.yml | 9 +++++++++ _licenses/epl-1.0.txt | 2 +- _licenses/lgpl-2.1.txt | 2 +- _licenses/lgpl-3.0.txt | 2 +- _licenses/mpl-2.0.txt | 2 +- _licenses/ms-rl.txt | 2 +- appendix.md | 22 ++++++++++++---------- 7 files changed, 26 insertions(+), 15 deletions(-) diff --git a/_data/rules.yml b/_data/rules.yml index f1be24a..57400b6 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -31,6 +31,15 @@ conditions: - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. label: Same License tag: same-license +- description: Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. + label: Same License (File) + tag: same-license--file +- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. + label: Same License (Library) + tag: same-license--library +- description: Modifications must be released under the same license when distributing the software in source form. + label: Same License (Source) + tag: same-license--source limitations: - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 80712e9..5a5b6c4 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -24,7 +24,7 @@ permissions: conditions: - disclose-source - include-copyright - - same-license + - same-license--source limitations: - liability diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index 7dbfc2a..d1224d0 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -22,7 +22,7 @@ conditions: - include-copyright - disclose-source - document-changes - - same-license + - same-license--library limitations: - liability diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index b7fd1dd..cea10cb 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -23,7 +23,7 @@ conditions: - include-copyright - disclose-source - document-changes - - same-license + - same-license--library limitations: - liability diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index ec461ce..7da98da 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -26,7 +26,7 @@ permissions: conditions: - disclose-source - include-copyright - - same-license + - same-license--file limitations: - liability diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index db4fb67..18ab1ca 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -17,7 +17,7 @@ permissions: conditions: - disclose-source - include-copyright - - same-license + - same-license--file limitations: - warranty diff --git a/appendix.md b/appendix.md index a28f3be..316c6bd 100644 --- a/appendix.md +++ b/appendix.md @@ -17,7 +17,7 @@ If you're here to choose a license, **[start from the home page](/)** to see a f {% for type in types %} {% assign rules = site.data.rules[type] | sort: "label" %} {% for rule_obj in rules %} - {% if seen_tags contains rule_obj.tag %} + {% if seen_tags contains rule_obj.tag or rule_obj.tag contains '--' %} {% continue %} {% endif %} {% capture seen_tags %}{{ seen_tags | append:rule_obj.tag }}{% endcapture %} @@ -33,20 +33,22 @@ If you're here to choose a license, **[start from the home page](/)** to see a f {% assign rules = site.data.rules[type] | sort: "label" %} {% for rule_obj in rules %} {% assign req = rule_obj.tag %} - {% if seen_tags contains req %} + {% if seen_tags contains req or rule_obj.tag contains '--' %} {% continue %} {% endif %} {% capture seen_tags %}{{ seen_tags | append:req }}{% endcapture %} {% assign seen_req = false %} {% for t in types %} - {% if license[t] contains req %} - - - - - - {% assign seen_req = true %} - {% endif %} + {% for r in license[t] %} + {% if r contains req %} + + + + + + {% assign seen_req = true %} + {% endif %} + {% endfor %} {% endfor %} {% unless seen_req %} From b240450ca97dd807bf88f893e1b32b1ac8c969d7 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Feb 2017 14:59:25 -0800 Subject: [PATCH 010/144] add same-license-- variations to README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ab072bb..6b7f7e9 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,9 @@ The license properties (rules) are stored as a bulleted list within the licenses * `disclose-source` - Source code must be made available when distributing the software. * `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code. * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. +* `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. +* `same-license--library` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. +* `same-license--source` - Modifications must be released under the same license when distributing the software in source form. #### Limitations From 1ce6e03c5e531cc2d94d0df5c5e097783f9e228d Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Feb 2017 17:31:58 -0800 Subject: [PATCH 011/144] simplify --- README.md | 1 - _data/rules.yml | 3 --- _licenses/epl-1.0.txt | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 6b7f7e9..96069a4 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,6 @@ The license properties (rules) are stored as a bulleted list within the licenses * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. * `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. * `same-license--library` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. -* `same-license--source` - Modifications must be released under the same license when distributing the software in source form. #### Limitations diff --git a/_data/rules.yml b/_data/rules.yml index 57400b6..ce36cce 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -37,9 +37,6 @@ conditions: - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. label: Same License (Library) tag: same-license--library -- description: Modifications must be released under the same license when distributing the software in source form. - label: Same License (Source) - tag: same-license--source limitations: - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 5a5b6c4..80712e9 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -24,7 +24,7 @@ permissions: conditions: - disclose-source - include-copyright - - same-license--source + - same-license limitations: - liability From 092ad597e35d1fba3e062840034e84a469b1fe4d Mon Sep 17 00:00:00 2001 From: Jacob Mischka Date: Thu, 2 Mar 2017 19:18:44 -0600 Subject: [PATCH 012/144] Change copyright date 2004 -> [year] in wtfpl --- _licenses/wtfpl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.txt index 854bdb6..3ced1d7 100644 --- a/_licenses/wtfpl.txt +++ b/_licenses/wtfpl.txt @@ -22,7 +22,7 @@ limitations: [] DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE Version 2, December 2004 - Copyright (C) 2004 [fullname] <[email]> + Copyright (C) [year] [fullname] <[email]> Everyone is permitted to copy and distribute verbatim or modified copies of this license document, and changing it is allowed as long From 556c00626630cf089f5bffc1d51473b11c8d8cb9 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 2 Mar 2017 17:37:03 -0800 Subject: [PATCH 013/144] Fix copyright line, which pertains to the license itself See http://www.wtfpl.net/faq/ --- _licenses/wtfpl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.txt index 3ced1d7..0c7607f 100644 --- a/_licenses/wtfpl.txt +++ b/_licenses/wtfpl.txt @@ -22,7 +22,7 @@ limitations: [] DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE Version 2, December 2004 - Copyright (C) [year] [fullname] <[email]> + Copyright (C) 2004 Sam Hocevar Everyone is permitted to copy and distribute verbatim or modified copies of this license document, and changing it is allowed as long From ada5a49769cae96e8c404cafbe2f13e611df135e Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 14 Mar 2017 11:39:34 -0700 Subject: [PATCH 014/144] focus additional resources on choosing an open license, not lists of licenses Fixes #490 which was concerned that the additional resources list did not include all like items, I understand driven by concern that the SPDX license list includes non-open licenses. So does the FSF license list -- worse, it even recommends some. This fix focuses the list on resources about choosing an open license, not resources listing a bunch of licenses. Fortunately both OSI and FSF have pages directly addressing choosing a license. I've removed the SPDX and English Wikipedia lists. --- about.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/about.md b/about.md index cd5914c..a99a430 100644 --- a/about.md +++ b/about.md @@ -18,10 +18,8 @@ See our [appendix](/appendix) for a table of all of the licenses cataloged in th {: .bullets} -* Open Source Initiative's [list of licenses](https://opensource.org/licenses/) approved as conforming to the [Open Source Definition](https://opensource.org/osd) -* Free Software Foundation's [comments on various licenses](http://www.gnu.org/licenses/license-list.html) and [advice on how to choose a license](https://www.gnu.org/licenses/license-recommendations.en.html) -* Linux Foundation's [SPDX License List](https://spdx.org/licenses/) -* [Comparison of free and open-source software licenses](https://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses) on English Wikipedia +* Open Source Initiative's FAQ on [Which Open Source license should I choose to release my software under?](https://opensource.org/faq#which-license) +* Free Software Foundation's [advice on how to choose a license](https://www.gnu.org/licenses/license-recommendations.en.html) * [License differentiator](http://www.oss-watch.ac.uk/apps/licdiff/) ([source](https://github.com/ox-it/licdiff)) from [OSS Watch](http://www.oss-watch.ac.uk/) * [Free/Libre/Open Source license selection wizard](http://vrici.lojban.org/~cowan/floss/) by John Cowan * [The Legal Side of Open Source](https://opensource.guide/legal/), an Open Source Guide covering licensing and related issues From 401fbf5fc0f248126c9fded57265c9d690f249bb Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 14 Mar 2017 19:44:38 -0400 Subject: [PATCH 015/144] convert rule labels to sentance case --- _data/rules.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/_data/rules.yml b/_data/rules.yml index ce36cce..4f1c74d 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -1,6 +1,6 @@ permissions: - description: This software and derivatives may be used for commercial purposes. - label: Commercial Use + label: Commercial use tag: commercial-use - description: This software may be modified. label: Modification @@ -9,44 +9,44 @@ permissions: label: Distribution tag: distribution - description: You may use and modify the software without distributing it. - label: Private Use + label: Private use tag: private-use - description: This license provides an express grant of patent rights from the contributor to the recipient. - label: Patent Use + label: Patent use tag: patent-use conditions: - description: Include a copy of the license and copyright notice with the software. - label: License and Copyright Notice + label: License and copyright notice tag: include-copyright - description: Indicate changes made to the code. - label: State Changes + label: State changes tag: document-changes - description: Source code must be made available when distributing the software. - label: Disclose Source + label: Disclose source tag: disclose-source - description: Users who interact with the software via network are given the right to receive a copy of the corresponding source code. - label: Network Use is Distribution + label: Network use is distribution tag: network-use-disclose - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. label: Same License tag: same-license - description: Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. - label: Same License (File) + label: Same license (file) tag: same-license--file - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. - label: Same License (Library) + label: Same license (library) tag: same-license--library limitations: - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. - label: Trademark Use + label: Trademark use tag: trademark-use - description: This license includes a limitation of liability. label: Liability tag: liability - description: This license explicitly states that it does NOT grant you any rights in the patents of contributors. - label: Patent Use + label: Patent use tag: patent-use - description: The license explicitly states that it does NOT provide any warranty. label: Warranty From 2f005b33f9ed3611d2c066acaf3cfd5f9b3dbd58 Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Fri, 17 Mar 2017 11:02:11 +0000 Subject: [PATCH 016/144] Add ECL-2.0 License The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license. --- _licenses/ecl-2.0.txt | 240 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 240 insertions(+) create mode 100644 _licenses/ecl-2.0.txt diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt new file mode 100644 index 0000000..ba44158 --- /dev/null +++ b/_licenses/ecl-2.0.txt @@ -0,0 +1,240 @@ +--- +title: Educational Community License v2.0 +spdx-id: ECL-2.0 +source: https://opensource.org/licenses/ECL-2.0 +featured: false +hidden: true + +description: The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license. + +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. + +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 at the very end of the license in the appendix. + +using: + - Sakai: https://github.com/sakaiproject/sakai/blob/master/LICENSE + - OAE: https://github.com/oaeproject/Hilary/blob/master/LICENSE + - Opencast Matterhorn: https://bitbucket.org/opencast-community/matterhorn/src/e5b1684a822c0bd9bb07f3e53b4e1f22932da5ef/LICENSE?fileviewer=file-view-default + +permissions: + - commercial-use + - modifications + - distribution + - patent-use + - private-use + +conditions: + - include-copyright + - document-changes + +limitations: + - trademark-use + - liability + - warranty + +--- +Educational Community License, Version 2.0 (ECL-2.0) + +Educational Community License + +Version 2.0, April 2007 + +http://opensource.org/licenses/ECL-2.0 + +The Educational Community License version 2.0 ("ECL") consists of the Apache +2.0 license, modified to change the scope of the patent grant in section 3 to +be specific to the needs of the education communities using this license. The +original Apache 2.0 license can be found at: +http://www.apache.org/licenses/LICENSE-2.0 + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the +copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other +entities that control, are controlled by, or are under common control with +that entity. For the purposes of this definition, "control" means (i) the +power, direct or indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (ii) ownership of fifty percent +(50%) or more of the outstanding shares, or (iii) beneficial ownership of such +entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, and +configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object +code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, +made available under the License, as indicated by a copyright notice that is +included in or attached to the work (an example is provided in the Appendix +below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative +Works shall not include works that remain separable from, or merely link (or +bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor for +inclusion in the Work by the copyright owner or by an individual or Legal +Entity authorized to submit on behalf of the copyright owner. For the purposes +of this definition, "submitted" means any form of electronic, verbal, or +written communication sent to the Licensor or its representatives, including +but not limited to communication on electronic mailing lists, source code +control systems, and issue tracking systems that are managed by, or on behalf +of, the Licensor for the purpose of discussing and improving the Work, but +excluding communication that is conspicuously marked or otherwise designated +in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and +such Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such +Contributor that are necessarily infringed by their Contribution(s) alone or +by combination of their Contribution(s) with the Work to which such +Contribution(s) was submitted. If You institute patent litigation against any +entity (including a cross-claim or counterclaim in a lawsuit) alleging that +the Work or a Contribution incorporated within the Work constitutes direct or +contributory patent infringement, then any patent licenses granted to You +under this License for that Work shall terminate as of the date such +litigation is filed. Any patent license granted hereby with respect to +contributions by an individual employed by an institution or organization is +limited to patent claims where the individual that is the author of the Work +is also the inventor of the patent claims licensed, and where the organization +or institution has the right to grant such license under applicable grant and +research funding agreements. No other express or implied licenses are granted. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works +thereof in any medium, with or without modifications, and in Source or Object +form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of +this License; and You must cause any modified files to carry prominent notices +stating that You changed the files; and You must retain, in the Source form of +any Derivative Works that You distribute, all copyright, patent, trademark, +and attribution notices from the Source form of the Work, excluding those +notices that do not pertain to any part of the Derivative Works; and If the +Work includes a "NOTICE" text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of +the following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents +of the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. You may add Your own copyright statement to Your +modifications and may provide additional or different license terms and +conditions for use, reproduction, or distribution of Your modifications, or +for any such Derivative Works as a whole, provided Your use, reproduction, and +distribution of the Work otherwise complies with the conditions stated in this +License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally +submitted for inclusion in the Work by You to the Licensor shall be under the +terms and conditions of this License, without any additional terms or +conditions. Notwithstanding the above, nothing herein shall supersede or +modify the terms of any separate license agreement you may have executed with +Licensor regarding such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, +service marks, or product 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 NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides +the Work (and each Contributor provides its Contributions) on an "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied, including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You +are solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a result of +this License or out of the use or inability to use the Work (including but not +limited to damages for loss of goodwill, work stoppage, computer failure or +malfunction, or any and all other commercial damages or losses), even if such +Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. +However, in accepting such obligations, You may act only on Your own behalf +and on Your sole responsibility, not on behalf of 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 +reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Educational Community License to your work + +To apply the Educational Community License to your work, attach the following +boilerplate notice, with the fields enclosed by brackets "[]" replaced with +your own identifying information. (Don't include the brackets!) The text +should be enclosed in the appropriate comment syntax for the file format. We +also recommend that a file or class name and description of purpose be +included on the same "printed page" as the copyright notice for easier +identification within third-party archives. + +Copyright {yyyy} {name of copyright owner} Licensed under the Educational +Community License, Version 2.0 (the "License"); you may not use this file +except in compliance with the License. You may obtain a copy of the License at + +http://opensource.org/licenses/ECL-2.0 + + Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations under +the License. From 52a73b82861d57985b0a33d861b34ac97c8cf522 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 17 Mar 2017 10:42:31 -0700 Subject: [PATCH 017/144] rm fields with default values --- _licenses/ecl-2.0.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index ba44158..3308275 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -2,8 +2,6 @@ title: Educational Community License v2.0 spdx-id: ECL-2.0 source: https://opensource.org/licenses/ECL-2.0 -featured: false -hidden: true description: The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license. From 388396f93371efcfed1003e886204c76bb5554b1 Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Fri, 17 Mar 2017 18:03:29 +0000 Subject: [PATCH 018/144] Dropped duplicate heading on ECL license. --- _licenses/ecl-2.0.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index 3308275..955959e 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -31,8 +31,6 @@ limitations: - warranty --- -Educational Community License, Version 2.0 (ECL-2.0) - Educational Community License Version 2.0, April 2007 From 69ad10f6c9c8493f2bd108ae8598eabf149684a0 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 20 Mar 2017 10:13:37 -0700 Subject: [PATCH 019/144] []->{} consistency in ECL-2.0 appendix See https://github.com/github/choosealicense.com/pull/494#issuecomment-287436948 and Apache-2.0 treatment here. --- _licenses/ecl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index 955959e..c0d6909 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -216,7 +216,7 @@ END OF TERMS AND CONDITIONS APPENDIX: How to apply the Educational Community License to your work To apply the Educational Community License to your work, attach the following -boilerplate notice, with the fields enclosed by brackets "[]" replaced with +boilerplate notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be From 713b9b602042b9a3e38b14025ba5432454bbc12c Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 18:41:20 -0700 Subject: [PATCH 020/144] Adding NCSA License --- _licenses/ncsa.txt | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 _licenses/ncsa.txt diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt new file mode 100644 index 0000000..ea687d4 --- /dev/null +++ b/_licenses/ncsa.txt @@ -0,0 +1,68 @@ +--- +title: University of Illinois/NCSA Open Source License +spdx-id: NCSA +nickname: UIUC/NCSA +source: https://opensource.org/licenses/NCSA +hidden: false +featured: false + +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. + +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: + - Clang: https://github.com/llvm-mirror/clang/blob/master/LICENSE.TXT + - LLVM: https://github.com/llvm-mirror/llvm/blob/master/LICENSE.TXT + - LLDB: https://github.com/llvm-mirror/lldb/blob/master/LICENSE.TXT + +permissions: + - commercial-use + - modifications + - distribute + - private-use + +conditions: + - include-copyright + +limitations: + - trademark-use + - liability + - warranty + +--- + +University of Illinois/NCSA Open Source License + +Copyright (c) [year], [fullname] +All rights reserved. + +Developed by: [fullname] + [project] + [email] + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation files +(the "Software"), to deal with 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, +subject to the following conditions: + +* Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + +* Neither the names of [fullname], [project] nor the names of its + contributors may be used to endorse or promote products derived from + this Software without specific prior written permission. + +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 +CONTRIBUTORS 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 WITH +THE SOFTWARE. From e29f5d16d92290e9bb1f63cd1734bbb5531330c2 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 18:45:40 -0700 Subject: [PATCH 021/144] Update ncsa.txt --- _licenses/ncsa.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index ea687d4..f5e3845 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -36,9 +36,9 @@ University of Illinois/NCSA Open Source License Copyright (c) [year], [fullname] All rights reserved. -Developed by: [fullname] - [project] - [email] +Developed by: [fullname] + [project] + [email] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files From d0af1481b0ccf341259081c65ee89cfd6816f946 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 18:51:32 -0700 Subject: [PATCH 022/144] links --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index f5e3845..54316ae 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -6,7 +6,7 @@ source: https://opensource.org/licenses/NCSA hidden: false featured: false -description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. 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. From cae5457dfa078190706d3a5fdc44cc4f86c47cdd Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 21:47:46 -0700 Subject: [PATCH 023/144] Update ncsa.txt --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 54316ae..63611e6 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -6,7 +6,7 @@ source: https://opensource.org/licenses/NCSA hidden: false featured: false -description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. It's conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. 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. From 2247a46e7c6addc02e1f6c1e2c0dd0ae4f202bab Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 21:49:33 -0700 Subject: [PATCH 024/144] distibute -> distribution --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 63611e6..d1f4926 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -18,7 +18,7 @@ using: permissions: - commercial-use - modifications - - distribute + - distribution - private-use conditions: From c8ac7795747ba611ab2ca4db969405ab4bf8a5b4 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 22:50:03 -0700 Subject: [PATCH 025/144] fix links --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index d1f4926..9f727d5 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -6,7 +6,7 @@ source: https://opensource.org/licenses/NCSA hidden: false featured: false -description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. It's conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. It's conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. 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. From da0e011c66422d4ba9e279d8cce27c0ec70a8863 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 23:19:04 -0700 Subject: [PATCH 026/144] Change hidden to true --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 9f727d5..b456023 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -3,7 +3,7 @@ title: University of Illinois/NCSA Open Source License spdx-id: NCSA nickname: UIUC/NCSA source: https://opensource.org/licenses/NCSA -hidden: false +hidden: true featured: false description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. It's conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. From abff65e95d8aa64cc1213519dda992966e09ee43 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 24 Mar 2017 11:40:33 -0700 Subject: [PATCH 027/144] rm fields with default values --- _licenses/ncsa.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index b456023..c998864 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -3,8 +3,6 @@ title: University of Illinois/NCSA Open Source License spdx-id: NCSA nickname: UIUC/NCSA source: https://opensource.org/licenses/NCSA -hidden: true -featured: false description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. It's conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. From 8e08db2e2749d1516048a164a2b9480105d3cd5f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 24 Mar 2017 11:47:47 -0700 Subject: [PATCH 028/144] rm trademark-use limitation; this just has a non-endorsement clause --- _licenses/ncsa.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index c998864..d40c0fe 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -23,7 +23,6 @@ conditions: - include-copyright limitations: - - trademark-use - liability - warranty From 27570c5e3f66feeed2e14143c32f6122adeec83c Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Fri, 24 Mar 2017 12:39:36 -0700 Subject: [PATCH 029/144] Added different projects and typo --- _licenses/ncsa.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index d40c0fe..37b42b4 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -4,14 +4,15 @@ spdx-id: NCSA nickname: UIUC/NCSA source: https://opensource.org/licenses/NCSA -description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. It's conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. Its conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. 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: - - Clang: https://github.com/llvm-mirror/clang/blob/master/LICENSE.TXT - - LLVM: https://github.com/llvm-mirror/llvm/blob/master/LICENSE.TXT - LLDB: https://github.com/llvm-mirror/lldb/blob/master/LICENSE.TXT + - ROCR-Runtime: https://github.com/RadeonOpenCompute/ROCR-Runtime/blob/master/LICENSE.txt + - RLTK: https://github.com/chriswailes/RLTK/blob/master/LICENSE + permissions: - commercial-use From 19544b0112d71886b9ca944253d1b13968809e15 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Fri, 24 Mar 2017 12:45:18 -0700 Subject: [PATCH 030/144] Matching SPDX over OSI --- _licenses/ncsa.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 37b42b4..680efa4 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -31,12 +31,9 @@ limitations: University of Illinois/NCSA Open Source License -Copyright (c) [year], [fullname] -All rights reserved. +Copyright (c) [year] [fullname]. All rights reserved. -Developed by: [fullname] - [project] - [email] +Developed by: [fullname] [project] [email] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files From 7eb2639152e5892061e850bd64191e7fe2bf8f2c Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Fri, 24 Mar 2017 12:51:02 -0700 Subject: [PATCH 031/144] Update ncsa.txt --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 680efa4..48a9750 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -4,7 +4,7 @@ spdx-id: NCSA nickname: UIUC/NCSA source: https://opensource.org/licenses/NCSA -description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. Its conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. Its conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. 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. From d818ba67faa70d0d0ba1eabc85bf3d16c245e784 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Sat, 25 Mar 2017 13:15:30 -0700 Subject: [PATCH 032/144] update developed by --- _licenses/ncsa.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 48a9750..f1bd196 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -33,7 +33,9 @@ University of Illinois/NCSA Open Source License Copyright (c) [year] [fullname]. All rights reserved. -Developed by: [fullname] [project] [email] +Developed by: [fullname] + [project] + [project_url] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files From aeca75a53b7ea34231287670d4fc04adc0ad332c Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 26 Mar 2017 16:56:26 -0700 Subject: [PATCH 033/144] Don't inlcude 'you' in any rule descriptions Descriptions should make sense whether reader is licensor or licensee --- README.md | 18 +++++++++--------- _data/rules.yml | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 96069a4..206bb62 100644 --- a/README.md +++ b/README.md @@ -80,25 +80,25 @@ The license properties (rules) are stored as a bulleted list within the licenses * `commercial-use` - This software and derivatives may be used for commercial purposes. * `modifications` - This software may be modified. -* `distribution` - You may distribute this software. -* `private-use` - You may use and modify the software without distributing it. -* `patent-use` - This license provides an express grant of patent rights from the contributor to the recipient. +* `distribution` - This software may be distributed. +* `private-use` - This software may be used and modifed in private. +* `patent-use` - This license provides an express grant of patent rights from contributors. #### Conditions -* `include-copyright` - Include a copy of the license and copyright notice with the software. -* `document-changes` - Indicate changes made to the code. -* `disclose-source` - Source code must be made available when distributing the software. -* `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code. +* `include-copyright` - A copy of the license and copyright notice must be included with the software. +* `document-changes` - Changes made to the code must be documented. +* `disclose-source` - Source code must be made available the software is distributed. +* `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the source code. * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. * `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. * `same-license--library` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. #### Limitations -* `trademark-use` - This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. +* `trademark-use` - This license explicitly states that it does NOT grant trademark rights, even though licenses without such a statement probably do not grant any implicit trademark rights. * `liability` - This license includes a limitation of liability. -* `patent-use` - This license explicitly states that it does NOT grant you any rights in the patents of contributors. +* `patent-use` - This license explicitly states that it does NOT grant any rights in the patents of contributors. * `warranty` - The license explicitly states that it does NOT provide any warranty. ## License diff --git a/_data/rules.yml b/_data/rules.yml index 4f1c74d..96e5109 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -5,27 +5,27 @@ permissions: - description: This software may be modified. label: Modification tag: modifications -- description: You may distribute this software. +- description: This software may be distributed. label: Distribution tag: distribution -- description: You may use and modify the software without distributing it. +- description: This software may be used and modifed in private. label: Private use tag: private-use -- description: This license provides an express grant of patent rights from the contributor to the recipient. +- description: This license provides an express grant of patent rights from contributors. label: Patent use tag: patent-use conditions: -- description: Include a copy of the license and copyright notice with the software. +- description: A copy of the license and copyright notice must be included with the software. label: License and copyright notice tag: include-copyright -- description: Indicate changes made to the code. +- description: Changes made to the code must be documented. label: State changes tag: document-changes -- description: Source code must be made available when distributing the software. +- description: Source code must be made available the software is distributed. label: Disclose source tag: disclose-source -- description: Users who interact with the software via network are given the right to receive a copy of the corresponding source code. +- description: Users who interact with the software via network are given the right to receive a copy of the source code. label: Network use is distribution tag: network-use-disclose - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. @@ -39,13 +39,13 @@ conditions: tag: same-license--library limitations: -- description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. +- description: This license explicitly states that it does NOT grant trademark rights, even though licenses without such a statement probably do not grant any implicit trademark rights. label: Trademark use tag: trademark-use - description: This license includes a limitation of liability. label: Liability tag: liability -- description: This license explicitly states that it does NOT grant you any rights in the patents of contributors. +- description: This license explicitly states that it does NOT grant any rights in the patents of contributors. label: Patent use tag: patent-use - description: The license explicitly states that it does NOT provide any warranty. From 75c05d717c054422222172d3c6befbc0289faf40 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 26 Mar 2017 17:19:44 -0700 Subject: [PATCH 034/144] mindlessly satisfy rubocop 0.48 --- Gemfile | 1 + Rakefile | 3 ++- script/check-approval | 1 + script/generate-docs | 1 + spec/ci_ruby_version_spec.rb | 1 + spec/license_bom_spec.rb | 1 + spec/license_fields_spec.rb | 3 ++- spec/license_meta_spec.rb | 3 ++- spec/license_rules_spec.rb | 1 + spec/license_shown_spec.rb | 1 + spec/license_spec.rb | 1 + spec/spec_helper.rb | 3 ++- 12 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 6285dab..84fd12d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ # frozen_string_literal: true + source 'https://rubygems.org' require 'json' diff --git a/Rakefile b/Rakefile index 01734ae..360bfdf 100644 --- a/Rakefile +++ b/Rakefile @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'html-proofer' require 'rspec/core/rake_task' @@ -26,7 +27,7 @@ task :approved_licenses do puts approved.join(', ') puts "\n" - potential = approved - licenses.map { |l| l['id'] } + potential = approved - (licenses.map { |l| l['id'] }) puts "#{potential.count} potential additions:" puts potential.join(', ') end diff --git a/script/check-approval b/script/check-approval index 2e4c9d2..6b491db 100755 --- a/script/check-approval +++ b/script/check-approval @@ -1,5 +1,6 @@ #!/usr/bin/env ruby # frozen_string_literal: true + # Checks if a given license meets the approval criteria to be added to choosealicense.com # See https://github.com/github/choosealicense.com/blob/gh-pages/CONTRIBUTING.md#adding-a-license # Usage: script/check-approval [SPDX LICENSE ID] diff --git a/script/generate-docs b/script/generate-docs index b4edae4..4940d69 100755 --- a/script/generate-docs +++ b/script/generate-docs @@ -1,5 +1,6 @@ #!/usr/bin/env ruby # frozen_string_literal: true + # Usage: script/generate-docs # Reads in the fields, meta, and rules YAML files and produces markdown output # suitable for documenting in the project's README diff --git a/spec/ci_ruby_version_spec.rb b/spec/ci_ruby_version_spec.rb index b61c7c5..6809848 100644 --- a/spec/ci_ruby_version_spec.rb +++ b/spec/ci_ruby_version_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'json' require 'open-uri' require 'spec_helper' diff --git a/spec/license_bom_spec.rb b/spec/license_bom_spec.rb index a3e2798..bed1d1e 100644 --- a/spec/license_bom_spec.rb +++ b/spec/license_bom_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' describe 'byte order marks' do diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb index bac33e9..4215f37 100644 --- a/spec/license_fields_spec.rb +++ b/spec/license_fields_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' describe 'license fillable fields' do @@ -6,7 +7,7 @@ describe 'license fillable fields' do context "The #{license['title']} license" do it 'should only contain supported fillable fields' do matches = license['content'].scan(/\[([a-z]+)\]/) - extra_fields = matches.flatten - fields.map { |f| f['name'] } + extra_fields = matches.flatten - (fields.map { |f| f['name'] }) expect(extra_fields).to be_empty end end diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 60ea68b..2e5b8c3 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' describe 'license meta' do @@ -8,7 +9,7 @@ describe 'license meta' do context "The #{license['title']} license" do it 'should only contain supported meta fields' do - extra_fields = raw_fields.keys - meta.map { |m| m['name'] } + extra_fields = raw_fields.keys - (meta.map { |m| m['name'] }) expect(extra_fields).to be_empty end diff --git a/spec/license_rules_spec.rb b/spec/license_rules_spec.rb index 83137c2..450c164 100644 --- a/spec/license_rules_spec.rb +++ b/spec/license_rules_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' describe 'license rules' do diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb index d2b50e4..4ef3f8c 100644 --- a/spec/license_shown_spec.rb +++ b/spec/license_shown_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' describe 'shown licenses' do diff --git a/spec/license_spec.rb b/spec/license_spec.rb index 95e6f43..0fd8a96 100644 --- a/spec/license_spec.rb +++ b/spec/license_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' describe 'licenses' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c99daf6..ab89492 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'jekyll' require 'open-uri' require 'json' @@ -42,7 +43,7 @@ def licenses end def shown_licenses - licenses.select { |l| !l['hidden'] } + licenses.reject { |l| l['hidden'] } end def site From ec57a36433aae65209f7c681e51573940eea4937 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 27 Mar 2017 08:35:39 -0700 Subject: [PATCH 035/144] spel --- README.md | 4 ++-- _data/rules.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 206bb62..d065437 100644 --- a/README.md +++ b/README.md @@ -81,14 +81,14 @@ The license properties (rules) are stored as a bulleted list within the licenses * `commercial-use` - This software and derivatives may be used for commercial purposes. * `modifications` - This software may be modified. * `distribution` - This software may be distributed. -* `private-use` - This software may be used and modifed in private. +* `private-use` - This software may be used and modified in private. * `patent-use` - This license provides an express grant of patent rights from contributors. #### Conditions * `include-copyright` - A copy of the license and copyright notice must be included with the software. * `document-changes` - Changes made to the code must be documented. -* `disclose-source` - Source code must be made available the software is distributed. +* `disclose-source` - Source code must be made available when the software is distributed. * `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the source code. * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. * `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. diff --git a/_data/rules.yml b/_data/rules.yml index 96e5109..75d08cb 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -8,7 +8,7 @@ permissions: - description: This software may be distributed. label: Distribution tag: distribution -- description: This software may be used and modifed in private. +- description: This software may be used and modified in private. label: Private use tag: private-use - description: This license provides an express grant of patent rights from contributors. @@ -22,7 +22,7 @@ conditions: - description: Changes made to the code must be documented. label: State changes tag: document-changes -- description: Source code must be made available the software is distributed. +- description: Source code must be made available when the software is distributed. label: Disclose source tag: disclose-source - description: Users who interact with the software via network are given the right to receive a copy of the source code. From d171cf3c2235ba5acd35cb10d51b47309229b49c Mon Sep 17 00:00:00 2001 From: floatingatoll Date: Sat, 8 Apr 2017 21:23:05 -0700 Subject: [PATCH 036/144] De-capitalize one mistakenly-capitalized 'License' The surround text (and following items) use the phrase "Same license" and no evidence is present of capitalization of License as a proper noun in this text. --- _data/rules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/rules.yml b/_data/rules.yml index 75d08cb..3a20f10 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -29,7 +29,7 @@ conditions: label: Network use is distribution tag: network-use-disclose - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. - label: Same License + label: Same license tag: same-license - description: Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. label: Same license (file) From aa33c8071bcecbf96f6153cdabaab9bf0d6e8bda Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 8 Apr 2017 22:40:27 -0700 Subject: [PATCH 037/144] satisfy rubocop 0.48.1 --- spec/license_shown_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb index 4ef3f8c..adf631f 100644 --- a/spec/license_shown_spec.rb +++ b/spec/license_shown_spec.rb @@ -5,7 +5,7 @@ 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( + SHOWN_LICENSES = %w[ agpl-3.0 apache-2.0 bsd-2-clause @@ -18,7 +18,7 @@ describe 'shown licenses' do mit mpl-2.0 unlicense - ).freeze + ].freeze it 'has the expected number of shown licenses' do expect(shown_licenses.count).to eql(12) From b225f1f94b0dd05ffc9bc4f91bc953c4c195f5a0 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 21 Apr 2017 18:20:47 -0700 Subject: [PATCH 038/144] Example project moved its license file, update --- _licenses/isc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/isc.txt b/_licenses/isc.txt index 867a66a..fe62b9e 100644 --- a/_licenses/isc.txt +++ b/_licenses/isc.txt @@ -10,7 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: - documentation.js: https://github.com/documentationjs/documentation/blob/master/LICENSE - Node.js semver: https://github.com/npm/node-semver/blob/master/LICENSE - - OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/master/LICENSE + - OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/master/LICENSE.md permissions: - commercial-use From 3215952d39a2c38ab37123d70a1516c431f49e35 Mon Sep 17 00:00:00 2001 From: Evan Ogas Date: Wed, 17 May 2017 16:34:04 -0400 Subject: [PATCH 039/144] Fix .NET Core license.txt url --- _licenses/mit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mit.txt b/_licenses/mit.txt index ad07380..68784c8 100644 --- a/_licenses/mit.txt +++ b/_licenses/mit.txt @@ -11,7 +11,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: - jQuery: https://github.com/jquery/jquery/blob/master/LICENSE.txt - - .NET Core: https://github.com/dotnet/corefx/blob/master/LICENSE + - .NET Core: https://github.com/dotnet/corefx/blob/master/LICENSE.TXT - Rails: https://github.com/rails/rails/blob/master/activerecord/MIT-LICENSE permissions: From 00c95e4d77a9b511b111b231c3d1b12c57e5fb40 Mon Sep 17 00:00:00 2001 From: Basil Peace Date: Sun, 21 May 2017 18:12:26 +0300 Subject: [PATCH 040/144] Update external hyperlinks in CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 90e4d89..2c309e1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ get. But first, please make sure you understand what Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or , and there are several requirements for a license to be [cataloged](http://choosealicense.com/appendix/) on the site: -1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license-or-exception). +1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license). 2. The license must be listed on one of the following approved lists of licenses: * [List of OSI approved licenses](https://opensource.org/licenses/alphabetical) * [GNU's list of free licenses](https://www.gnu.org/licenses/license-list.en.html) (*note: the license must be listed in one of the three "free" categories*) From ed8a4b497c2781b26da8bfa510d7ab744f18d00f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 27 May 2017 12:30:43 -0700 Subject: [PATCH 041/144] pages now using ruby 2.4.0 --- .rubocop.yml | 2 +- .travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 6c5cba1..fca3b19 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.3 + TargetRubyVersion: 2.4 Exclude: - _site/**/* - vendor/**/* diff --git a/.travis.yml b/.travis.yml index edbe773..f35dbd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ script: "./script/cibuild" #environment language: ruby rvm: - - 2.3.3 + - 2.4.0 branches: only: From b3f003eba06f369011b34aa36e03f5a764e4ee96 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 27 May 2017 12:31:01 -0700 Subject: [PATCH 042/144] fix uncool EUPL link --- _licenses/eupl-1.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index 5d5d30b..81fb2b2 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -2,7 +2,7 @@ title: European Union Public License 1.1 spdx-id: EUPL-1.1 redirect_from: /licenses/eupl-v1.1/ -source: https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11 +source: https://joinup.ec.europa.eu/community/eupl/og_page/eupl-text-11-12 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. From 1726b836bb43cc3cd991ef57fde1af5e9e78c478 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 30 May 2017 14:17:13 -0700 Subject: [PATCH 043/144] make `using` required for new licenses --- CONTRIBUTING.md | 1 + README.md | 2 +- _data/meta.yml | 8 ++++---- _licenses/afl-3.0.txt | 2 ++ _licenses/agpl-3.0.txt | 2 ++ _licenses/artistic-2.0.txt | 2 ++ _licenses/bsd-2-clause.txt | 2 ++ _licenses/bsd-3-clause-clear.txt | 2 ++ _licenses/bsd-3-clause.txt | 2 ++ _licenses/bsl-1.0.txt | 2 ++ _licenses/cc-by-4.0.txt | 2 ++ _licenses/cc-by-sa-4.0.txt | 2 ++ _licenses/cc0-1.0.txt | 2 ++ _licenses/eupl-1.1.txt | 2 ++ _licenses/lgpl-2.1.txt | 2 ++ _licenses/lgpl-3.0.txt | 2 ++ _licenses/lppl-1.3c.txt | 2 ++ _licenses/ms-pl.txt | 2 ++ _licenses/ms-rl.txt | 2 ++ _licenses/ncsa.txt | 1 - _licenses/ofl-1.1.txt | 2 ++ _licenses/wtfpl.txt | 2 ++ _licenses/zlib.txt | 2 ++ spec/license_meta_spec.rb | 28 ++++++++++++++++++++++++++++ 24 files changed, 72 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2c309e1..6ee9bd9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,6 +20,7 @@ Choosealicense.com is intended to demystify license choices, not present or cata * [GNU's list of free licenses](https://www.gnu.org/licenses/license-list.en.html) (*note: the license must be listed in one of the three "free" categories*) * [Open Definition's list of conformant licenses](http://opendefinition.org/licenses/) (non-code) 3. A [GitHub code search](https://github.com/search?q=MIT+filename%3ALICENSE&type=Code) must reveal at least *1,000* public repositories using the license +4. 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that could be detected by [licensee](https://github.com/benbalter/licensee) if it knew about the license If your proposed license meets the above criteria, here's a few other things to keep in mind as you propose the license's addition: diff --git a/README.md b/README.md index d065437..999e90f 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc * `source` - The URL to the license source text * `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/benbalter/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 @@ -54,7 +55,6 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc * `hidden` - Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true) * `nickname` - Customary short name if applicable (e.g, GPLv3) * `note` - Additional information about the licenses -* `using` - A list of up to 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/benbalter/licensee) in the form of `project_name: license_file_url` * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs ### Auto-populated fields diff --git a/_data/meta.yml b/_data/meta.yml index fc97bd0..1668c04 100644 --- a/_data/meta.yml +++ b/_data/meta.yml @@ -33,6 +33,10 @@ description: Bulleted list of limited rules required: true +- name: using + description: '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/benbalter/licensee) in the form of `project_name: license_file_url`' + required: true + # Optional fields - name: featured @@ -51,10 +55,6 @@ description: Additional information about the licenses required: false -- name: using - description: 'A list of up to 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/benbalter/licensee) in the form of `project_name: license_file_url`' - required: false - - name: redirect_from description: Relative path(s) to redirect to the license from, to prevent breaking old URLs required: false diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index 07754dd..9fbfc86 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -7,6 +7,8 @@ description: The Academic Free License is a variant of the Open Software License how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Files licensed under AFL 3.0 must also include the notice "Licensed under the Academic Free License version 3.0" adjacent to the copyright notice. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index fe61572..6705c36 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -12,6 +12,8 @@ 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: + permissions: - commercial-use - modifications diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt index 755a4af..8b84ce1 100644 --- a/_licenses/artistic-2.0.txt +++ b/_licenses/artistic-2.0.txt @@ -8,6 +8,8 @@ description: Heavily favored by the Perl community, the Artistic license require how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code, and copy the text of the license into the file. Do not replace the copyright notice (year, author), which refers to the license itself, not the licensed project. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index 73de9c3..597a03a 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -9,6 +9,8 @@ description: A permissive license that comes in two variants, the BSD 3-Clause Lic 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: + permissions: - commercial-use - modifications diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index f74002d..71f9235 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -8,6 +8,8 @@ description: A permissive license similar to the found on their website. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index 81fb2b2..da10315 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -10,6 +10,8 @@ how: Create a text file (typically named COPYING or LICENCE.txt) in the root of note: The European Commission recommends taking the additional step of adding a [boilerplate notice](https://joinup.ec.europa.eu/sites/default/files/ckeditor_files/files/EUPL%201_1%20Guidelines%20EN%20Joinup.pdf#page=17) to the top of each file. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index d1224d0..81c218e 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -12,6 +12,8 @@ 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: + permissions: - commercial-use - modifications diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index cea10cb..4006367 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -12,6 +12,8 @@ how: This license is an additional set of permissions to the GNU GPLv3 license. Insert the word “Lesser” before “General” in all three places in the boilerplate notice to make sure that you refer to the GNU LGPLv3 and not the GNU GPLv3. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/lppl-1.3c.txt b/_licenses/lppl-1.3c.txt index 42d45c4..984bf3b 100644 --- a/_licenses/lppl-1.3c.txt +++ b/_licenses/lppl-1.3c.txt @@ -9,6 +9,8 @@ how: To use this license, place in each of the components of your work both an e note: An example boilerplate and more information about how to use the license can be found at the end of the license. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt index dc1485a..5c26163 100644 --- a/_licenses/ms-pl.txt +++ b/_licenses/ms-pl.txt @@ -7,6 +7,8 @@ description: An open source license with a patent grant. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index 18ab1ca..a932c98 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -7,6 +7,8 @@ description: An open source license with a patent grant similar to the Date: Fri, 9 Jun 2017 09:59:16 +0200 Subject: [PATCH 046/144] Remove stacktrace.js as Unlicense example --- _licenses/unlicense.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index a5c8e26..00b8cab 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -10,7 +10,6 @@ how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root using: - youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE - - stacktrace.js: https://github.com/stacktracejs/stacktrace.js/blob/master/LICENSE - kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE permissions: From 435252f5c0efcfa5477205f5e9d475aa807992ed Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 9 Jun 2017 10:49:50 +0200 Subject: [PATCH 047/144] Use docopt.rs as example for the Unlicense --- _licenses/unlicense.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 00b8cab..153051f 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -11,6 +11,7 @@ how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root using: - youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE - kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE + - docopt.rs: https://github.com/docopt/docopt.rs/blob/master/UNLICENSE permissions: - private-use From edf588b327159833201134de1af0f6acd0c73875 Mon Sep 17 00:00:00 2001 From: John Jago Date: Sat, 10 Jun 2017 12:45:38 -0500 Subject: [PATCH 048/144] Replace dual-licensed example with RDF.rb --- _licenses/unlicense.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 153051f..2894fdb 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -11,7 +11,7 @@ how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root using: - youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE - kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE - - docopt.rs: https://github.com/docopt/docopt.rs/blob/master/UNLICENSE + - RDF.rb: https://github.com/ruby-rdf/rdf/blob/master/UNLICENSE permissions: - private-use From d7e5529839e4bdab87865213290585e71ae1a6ff Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Sun, 18 Jun 2017 23:39:22 +0100 Subject: [PATCH 049/144] fix typo: soley --> solely --- _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 d52cf7f..35beda5 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -5,7 +5,7 @@ source: https://creativecommons.org/licenses/by/4.0/legalcode.txt description: Permits almost any use subject to providing credit and license notice. Frequently used for media assets and educational materials. The most common license for Open Access scientific publications. Not recommended for software. -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. It is also acceptable to soley supply a link to a copy of the license, usually to the canonical URL for the license. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to solely supply a link to a copy of the license, usually to the canonical URL for the license. using: From 22dc2dbe3628b5aae621c508dadd82dcfb173b8e Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Sun, 18 Jun 2017 23:40:11 +0100 Subject: [PATCH 050/144] fix typo: soley --> solely --- _licenses/cc-by-sa-4.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index 2a6da7d..ec3451d 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -5,7 +5,7 @@ source: https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt description: Similar to CC-BY-4.0 but requires derivatives be distributed under the same or a similar, compatible license. Frequently used for media assets and educational materials. A previous version is the default license for Wikipedia and other Wikimedia projects. Not recommended for software. -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. It is also acceptable to soley supply a link to a copy of the license, usually to the canonical URL for the license. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to solely supply a link to a copy of the license, usually to the canonical URL for the license. using: From 22a9b2bc80ae82e0d629ff2c09f48434472a8fae Mon Sep 17 00:00:00 2001 From: Haralan Dobrev Date: Tue, 20 Jun 2017 22:30:04 +0300 Subject: [PATCH 051/144] Link to unlicense.org on HTTPS --- _licenses/unlicense.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 2894fdb..2c94391 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -50,4 +50,4 @@ 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. -For more information, please refer to +For more information, please refer to From 9d49847a8af2cd9a0787f269f6899461ad045aeb Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 20 Jun 2017 13:35:28 -0700 Subject: [PATCH 052/144] clarify what open license for documentation means Fix #521 --- non-software.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/non-software.md b/non-software.md index 8bcade8..604d57c 100644 --- a/non-software.md +++ b/non-software.md @@ -12,7 +12,7 @@ Open source software licenses can be used for non-software works, and often are ### Documentation -Any open source software license or open Creative Commons license is applicable to software documentation. If you use different licenses for your software and its documentation, you may wish to take care that source code examples in the documentation are also licensed under the software license. +Any open source software license or open license for media (see above) is applicable to software documentation. If you use different licenses for your software and its documentation, you may wish to take care that source code examples in the documentation are also licensed under the software license. ### Fonts From 31803c88eca1e44e3e097847a2afd0fdbca5a10a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 20 Jun 2017 13:37:11 -0700 Subject: [PATCH 053/144] internal link for zero ambiguity --- non-software.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/non-software.md b/non-software.md index 604d57c..e235a15 100644 --- a/non-software.md +++ b/non-software.md @@ -12,7 +12,7 @@ Open source software licenses can be used for non-software works, and often are ### Documentation -Any open source software license or open license for media (see above) is applicable to software documentation. If you use different licenses for your software and its documentation, you may wish to take care that source code examples in the documentation are also licensed under the software license. +Any open source software license or open license for media (see [above](#data-media-etc)) is applicable to software documentation. If you use different licenses for your software and its documentation, you may wish to take care that source code examples in the documentation are also licensed under the software license. ### Fonts From bcbf76b178fe9918df52810f5cc44cc10d2425fb Mon Sep 17 00:00:00 2001 From: Matti Schneider Date: Thu, 22 Jun 2017 09:55:18 +0200 Subject: [PATCH 054/144] Add EUPL v1.2 --- _licenses/eupl-1.2.txt | 158 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 _licenses/eupl-1.2.txt diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt new file mode 100644 index 0000000..507237d --- /dev/null +++ b/_licenses/eupl-1.2.txt @@ -0,0 +1,158 @@ +--- +title: European Union Public License 1.2 +spdx-id: EUPL-1.2 +source: http://eur-lex.europa.eu/legal-content/TXT/?uri=CELEX%3A32017D0863 + +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. + +using: + +permissions: + - commercial-use + - modifications + - distribution + - patent-use + - private-use + +conditions: + - include-copyright + - disclose-source + - document-changes + - network-use-disclose + - same-license + +limitations: + - liability + - trademark-use + - warranty + +--- + +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). +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. + +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 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 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 Work under the terms of the Licence. +— ‘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 person. + +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: +— 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. +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. + +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. + +5. Obligations of the Licensee + +The grant of the rights mentioned above is subject to some restrictions and 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 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. +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. +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 reproducing the content of the copyright notice. + +6. Chain of Authorship + +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 time You accept the Licence, the original Licensor and subsequent Contributors grant You a licence to their contributions to the Work, under the terms of this Licence. + +7. Disclaimer of Warranty + +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. +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. + +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. + +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 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. + +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. + +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. + +13. Miscellaneous + +Without prejudice of Article 9 above, the Licence represents the complete agreement between the Parties as to the Work. +If any provision of the Licence is invalid or unenforceable under applicable 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. +All linguistic versions of this Licence, approved by the European Commission, have identical value. Parties can take advantage of the linguistic version of their choice. + +14. Jurisdiction + +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, +— 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 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, 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. From 0b57486e2cce17ffa8bde636bf591a48fecda83c Mon Sep 17 00:00:00 2001 From: Matti Schneider Date: Fri, 23 Jun 2017 17:01:59 +0200 Subject: [PATCH 055/144] Line wrap at 78 characters As per CONTRIBUTING rules --- _licenses/eupl-1.2.txt | 538 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 472 insertions(+), 66 deletions(-) diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index 507237d..d50a0b1 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -33,112 +33,254 @@ 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 copyright notice for the Work: “Licensed under the EUPL”, or has expressed by any other means his willingness to license under the EUPL. +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. -1. Definitions +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 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 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 Work under the terms of the Licence. -— ‘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 person. +— ‘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. -2. Scope of the rights granted by the Licence +— ‘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 + the Work under the terms of the Licence. +— ‘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 + person. + +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: -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 the Work or copies thereof to the public and perform publicly, as the case may be, 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. -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. +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. -3. Communication of the Source Code +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. -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. +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. -4. Limitations on copyright +3. Communication of the Source Code -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. +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. -5. Obligations of the Licensee +4. Limitations on copyright -The grant of the rights mentioned above is subject to some restrictions and obligations imposed on the Licensee. Those obligations are the following: +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 + +The grant of the rights mentioned above is subject to some restrictions and +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 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. -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. -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 reproducing the content of the copyright notice. +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 +communicates. The Licensee must cause any Derivative Work to carry prominent +notices stating that the Work has been modified and the date of modification. -6. Chain of Authorship +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. -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 time You accept the Licence, the original Licensor and subsequent Contributors grant You a licence to their contributions to the Work, under the terms of this 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. -7. Disclaimer of Warranty +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. -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. -This disclaimer of warranty is an essential part of the Licence and a condition for the grant of any rights to 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 +reproducing the content of the copyright notice. -8. Disclaimer of Liability +6. Chain of Authorship -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. +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. -9. Additional agreements +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. -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. +Each time You accept the Licence, the original Licensor and subsequent +Contributors grant You a licence to their contributions to the Work, under the +terms of this Licence. -10. Acceptance of the Licence +7. Disclaimer of Warranty -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. +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. -11. Information to the public +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. -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. +This disclaimer of warranty is an essential part of the Licence and a +condition for the grant of any rights to the Work. -12. Termination of the Licence +8. Disclaimer of Liability -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. +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. -13. Miscellaneous +9. Additional agreements -Without prejudice of Article 9 above, the Licence represents the complete agreement between the Parties as to the Work. -If any provision of the Licence is invalid or unenforceable under applicable 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. -All linguistic versions of this Licence, approved by the European Commission, have identical value. Parties can take advantage of the linguistic version of their choice. +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. -14. Jurisdiction +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 +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. + +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. + +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. + +13. Miscellaneous + +Without prejudice of Article 9 above, the Licence represents the complete +agreement between the Parties as to the Work. + +If any provision of the Licence is invalid or unenforceable under applicable +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. + +All linguistic versions of this Licence, approved by the European Commission, +have identical value. Parties can take advantage of the linguistic version of +their choice. + +14. Jurisdiction 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, -— 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. +— 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. -15. Applicable Law +15. Applicable Law Without prejudice to specific agreement between parties, -— 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, residence or registered office inside a 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, + residence or registered office inside a European Union Member State. Appendix @@ -150,9 +292,273 @@ Appendix — 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 +— 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+) +— 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. +— 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. + +— ‘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, 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 person. + +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: +— 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. +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. + +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. + +5. +Obligations of the Licensee + +The grant of the rights mentioned above is +subject to some restrictions and 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 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. +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. +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 reproducing the content of the copyright +notice. + +6. Chain of Authorship + +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 time You accept +the Licence, the original Licensor and subsequent Contributors grant You a +licence to their contributions to the Work, under the terms of this +Licence. + +7. Disclaimer of Warranty + +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. +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. + +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. + +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 +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. + +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. + +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. + +13. Miscellaneous + +Without prejudice of Article 9 above, the +Licence represents the complete agreement between the Parties as to the +Work. +If any provision of the Licence is invalid or unenforceable under +applicable 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. +All linguistic +versions of this Licence, approved by the European Commission, have identical +value. Parties can take advantage of the linguistic version of their +choice. + +14. Jurisdiction + +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, +— 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 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, 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. From fda503385db4871b36a893044da4859b894758b5 Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Fri, 23 Jun 2017 18:24:51 +0200 Subject: [PATCH 056/144] Initial revision --- _licenses/postgresql.txt | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 _licenses/postgresql.txt diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt new file mode 100644 index 0000000..9705e18 --- /dev/null +++ b/_licenses/postgresql.txt @@ -0,0 +1,50 @@ +--- +title: PostreSQL License +spdx-id: PostgreSQL +source: https://opensource.org/licenses/PostgreSQL +featured: false +hidden: true + +description: A very short, BSD-style license, used specifically for PostgreSQL. + +how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution. + +using: + - PostgreSQL: https://www.postgresql.org/about/licence/ + - PGAudit: https://github.com/pgaudit/pgaudit/blob/master/LICENSE + - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE.txt + +permissions: + - commercial-use + - modifications + - distribution + - private-use + +conditions: + - include-copyright + +limitations: + - liability + - warranty + +--- + +The PostgreSQL Licence (PostgreSQL) + +Copyright (c) [year] [organisation] + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement is +hereby granted, provided that the above copyright notice and this paragraph +and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL [organisation] BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, +SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING +OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF [organisation] +HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +[organisation] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, +AND ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, +ENHANCEMENTS, OR MODIFICATIONS. From 8625394f3bf659bce9a1771bb97707429a170484 Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Fri, 23 Jun 2017 18:30:16 +0200 Subject: [PATCH 057/144] Fix license name --- _licenses/postgresql.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index 9705e18..dff79ee 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -1,5 +1,5 @@ --- -title: PostreSQL License +title: PostgreSQL License spdx-id: PostgreSQL source: https://opensource.org/licenses/PostgreSQL featured: false From 82e4edbb60eebde8a0792a2bdbf1f320db5ff1b7 Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Fri, 23 Jun 2017 18:36:26 +0200 Subject: [PATCH 058/144] Use allowed fileds --- _licenses/postgresql.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index dff79ee..f57fd21 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -31,19 +31,19 @@ limitations: The PostgreSQL Licence (PostgreSQL) -Copyright (c) [year] [organisation] +Copyright (c) [year] [fullname] Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. -IN NO EVENT SHALL [organisation] BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, +IN NO EVENT SHALL [fullname] BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING -OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF [organisation] +OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF [fullname] HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -[organisation] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT +[fullname] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, From 2e6e50f00f207823ff52eecae50eb5cbcb9d06fe Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Sat, 24 Jun 2017 23:02:26 +0200 Subject: [PATCH 059/144] Provide examples compatible with license template --- _licenses/postgresql.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index f57fd21..6374556 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -10,8 +10,8 @@ description: A very short, BSD-style license, used specifically for PostgreSQL. how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution. using: - - PostgreSQL: https://www.postgresql.org/about/licence/ - - PGAudit: https://github.com/pgaudit/pgaudit/blob/master/LICENSE + - pgBadger: https://github.com/dalibo/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.txt permissions: @@ -29,7 +29,7 @@ limitations: --- -The PostgreSQL Licence (PostgreSQL) +PostgreSQL Licence Copyright (c) [year] [fullname] From b8006f70d1230c2f303450eb9d5092b2222c4c44 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 25 Jun 2017 13:56:27 -0700 Subject: [PATCH 060/144] rm fields with default values --- _licenses/postgresql.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index 6374556..da677eb 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -2,8 +2,6 @@ title: PostgreSQL License spdx-id: PostgreSQL source: https://opensource.org/licenses/PostgreSQL -featured: false -hidden: true description: A very short, BSD-style license, used specifically for PostgreSQL. From 8d7d579c3aa5ebb2613d58daae40c997afc8d48e Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Mon, 26 Jun 2017 11:13:01 +0200 Subject: [PATCH 061/144] Add missing [fullname] field --- _licenses/postgresql.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index da677eb..ca924ba 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -44,5 +44,5 @@ HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [fullname] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, -AND ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, +AND [fullname] HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. From 4df304625c524e99e9e19900dd49c3765a9599a1 Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Mon, 26 Jun 2017 11:20:18 +0200 Subject: [PATCH 062/144] Update according to https://fedoraproject.org/wiki/Licensing/PostgreSQL_License --- _licenses/postgresql.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index ca924ba..67e90d7 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -29,7 +29,7 @@ limitations: PostgreSQL Licence -Copyright (c) [year] [fullname] +Copyright (c) [year], [fullname] Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is From 0647f1c760b9771911bd32de8d858fe7162b83da Mon Sep 17 00:00:00 2001 From: Rhys Bower Date: Thu, 20 Jul 2017 18:38:14 -0700 Subject: [PATCH 063/144] Switch Travis build badge to svg --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 999e90f..87c5bb6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Choosealicense.com -[![Build Status](https://travis-ci.org/github/choosealicense.com.png?branch=gh-pages)](https://travis-ci.org/github/choosealicense.com) +[![Build Status](https://travis-ci.org/github/choosealicense.com.svg?branch=gh-pages)](https://travis-ci.org/github/choosealicense.com) Like a Choose Your Own Adventure site, but only much less interesting. From fe965f16f6f690d40a738e75a46fad3f41f5daa3 Mon Sep 17 00:00:00 2001 From: Ben Balter <282759+benbalter@users.noreply.github.com> Date: Tue, 25 Jul 2017 11:22:05 -0400 Subject: [PATCH 064/144] s/required/true --- _data/meta.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/meta.yml b/_data/meta.yml index 1668c04..6e6de7b 100644 --- a/_data/meta.yml +++ b/_data/meta.yml @@ -7,7 +7,7 @@ - name: spdx-id description: Short identifier specified by http://spdx.org/licenses/ - required: required + required: true - name: source description: The URL to the license source text From d8310f8b8162356d86e7c161c1885bb0aeabf554 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 19 Sep 2017 13:31:33 -0700 Subject: [PATCH 065/144] Update EPL-1.0 examples Each can be detected by licensee and is a non-legacy repo. --- _licenses/epl-1.0.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 80712e9..6884897 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -10,9 +10,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: - - Clojure: https://github.com/clojure/clojure/blob/master/epl-v10.html - - JUnit: https://github.com/junit-team/junit/blob/master/LICENSE-junit.txt - - openHAB: https://github.com/openhab/openhab/blob/master/LICENSE.TXT + - Eclipse Che: https://github.com/eclipse/che/blob/master/LICENSE + - JUnit: https://github.com/junit-team/junit4/blob/master/LICENSE-junit.txt + - openHAB: https://github.com/openhab/openhab-distro/blob/master/LICENSE permissions: - commercial-use From d70d1c18ac15027c05a6876cfa318597ab879491 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 19 Sep 2017 14:00:03 -0700 Subject: [PATCH 066/144] update broken link --- _licenses/ecl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index c0d6909..90f7403 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -12,7 +12,7 @@ note: The Apereo Foundation recommends taking the additional step of adding a bo using: - Sakai: https://github.com/sakaiproject/sakai/blob/master/LICENSE - OAE: https://github.com/oaeproject/Hilary/blob/master/LICENSE - - Opencast Matterhorn: https://bitbucket.org/opencast-community/matterhorn/src/e5b1684a822c0bd9bb07f3e53b4e1f22932da5ef/LICENSE?fileviewer=file-view-default + - Opencast: https://bitbucket.org/opencast-community/opencast/src/905077ba5e6483f8c49869a1fc13bf9268790a79/LICENSE?at=develop permissions: - commercial-use From 9a8bd270170bc996b4356c91b0beb9f68fa032b9 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 19 Sep 2017 14:45:18 -0700 Subject: [PATCH 067/144] swap example failing tests Seems to be a very minor configuration problem with TLS for cgit.freedesktop.org, swapping out example so tests pass. --- _licenses/mpl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index 7da98da..934af1f 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -13,8 +13,8 @@ note: The Mozilla Foundation recommends taking the additional step of adding a b using: - Servo: https://github.com/servo/servo/blob/master/LICENSE + - Syncthing: https://github.com/syncthing/syncthing/blob/master/LICENSE - TimelineJS3: https://github.com/NUKnightLab/TimelineJS3/blob/master/LICENSE - - LibreOffice: https://cgit.freedesktop.org/libreoffice/core/tree/COPYING.MPL permissions: - commercial-use From ad0dc7d8c6660902049c4297b3f1ff48e4252d5d Mon Sep 17 00:00:00 2001 From: games647 Date: Sun, 1 Oct 2017 10:02:19 +0200 Subject: [PATCH 068/144] Use HTTPS if available --- _licenses/afl-3.0.txt | 2 +- _licenses/agpl-3.0.txt | 2 +- _licenses/apache-2.0.txt | 2 +- _licenses/bsd-2-clause.txt | 2 +- _licenses/bsd-3-clause.txt | 2 +- _licenses/cc0-1.0.txt | 4 ++-- _licenses/gpl-2.0.txt | 2 +- _licenses/gpl-3.0.txt | 4 ++-- _licenses/isc.txt | 2 +- _licenses/lgpl-2.1.txt | 2 +- _licenses/lgpl-3.0.txt | 2 +- _licenses/ms-pl.txt | 2 +- _licenses/ms-rl.txt | 2 +- _licenses/osl-3.0.txt | 2 +- _licenses/unlicense.txt | 4 ++-- existing.md | 2 +- non-software.md | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index 9fbfc86..ed45814 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -1,7 +1,7 @@ --- title: Academic Free License v3.0 spdx-id: AFL-3.0 -source: http://opensource.org/licenses/afl-3.0 +source: https://opensource.org/licenses/afl-3.0 description: The Academic Free License is a variant of the Open Software License that does not require that the source code of derivative works be disclosed. It contains explicit copyright and patent grants and reserves trademark rights in the author. diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index 6705c36..8369752 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -3,7 +3,7 @@ title: GNU Affero General Public License v3.0 spdx-id: AGPL-3.0 nickname: GNU AGPLv3 redirect_from: /licenses/agpl/ -source: http://www.gnu.org/licenses/agpl-3.0.txt +source: https://www.gnu.org/licenses/agpl-3.0.txt hidden: false description: Permissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. When a modified version is used to provide a service over a network, the complete source code of the modified version must be made available. diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index 2180c26..0c594de 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -2,7 +2,7 @@ title: Apache License 2.0 spdx-id: Apache-2.0 redirect_from: /licenses/apache/ -source: http://www.apache.org/licenses/LICENSE-2.0.html +source: https://www.apache.org/licenses/LICENSE-2.0.html featured: true hidden: false diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index 597a03a..524d663 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -2,7 +2,7 @@ title: BSD 2-clause "Simplified" License spdx-id: BSD-2-Clause redirect_from: /licenses/bsd/ -source: http://opensource.org/licenses/BSD-2-Clause +source: https://opensource.org/licenses/BSD-2-Clause hidden: false description: A permissive license that comes in two variants, the BSD 2-Clause and BSD 3-Clause. Both have very minute differences to the MIT license. diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index 71f9235..e644905 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -1,7 +1,7 @@ --- title: BSD 3-clause "New" or "Revised" License spdx-id: BSD-3-Clause -source: http://opensource.org/licenses/BSD-3-Clause +source: https://opensource.org/licenses/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. diff --git a/_licenses/cc0-1.0.txt b/_licenses/cc0-1.0.txt index 71b646b..73d9655 100644 --- a/_licenses/cc0-1.0.txt +++ b/_licenses/cc0-1.0.txt @@ -2,9 +2,9 @@ title: Creative Commons Zero v1.0 Universal spdx-id: CC0-1.0 redirect_from: /licenses/cc0/ -source: http://creativecommons.org/publicdomain/zero/1.0/ +source: https://creativecommons.org/publicdomain/zero/1.0/ -description: The Creative Commons CC0 Public Domain Dedication waives copyright interest in any a work you've created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach. As with the Unlicense and typical software licenses, CC0 disclaims warranties. CC0 is very similar to the Unlicense. +description: The Creative Commons CC0 Public Domain Dedication waives copyright interest in any a work you've created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach. As with the Unlicense and typical software licenses, CC0 disclaims warranties. CC0 is very similar to the Unlicense. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the CC0 into the file. diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 06a90fe..0ed70e4 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -3,7 +3,7 @@ title: GNU General Public License v2.0 spdx-id: GPL-2.0 nickname: GNU GPLv2 redirect_from: /licenses/gpl-v2/ -source: http://www.gnu.org/licenses/gpl-2.0.txt +source: https://www.gnu.org/licenses/gpl-2.0.txt hidden: false description: The GNU GPL is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license. There are multiple variants of the GNU GPL, each with different requirements. diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index 010070c..b05798b 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -3,7 +3,7 @@ title: GNU General Public License v3.0 spdx-id: GPL-3.0 nickname: GNU GPLv3 redirect_from: /licenses/gpl-v3/ -source: http://www.gnu.org/licenses/gpl-3.0.txt +source: https://www.gnu.org/licenses/gpl-3.0.txt featured: true hidden: false @@ -14,7 +14,7 @@ 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: - - Bash: http://git.savannah.gnu.org/cgit/bash.git/tree/COPYING + - Bash: https://git.savannah.gnu.org/cgit/bash.git/tree/COPYING - GIMP: https://git.gnome.org/browse/gimp/tree/COPYING - Privacy Badger: https://github.com/EFForg/privacybadgerfirefox/blob/master/LICENSE diff --git a/_licenses/isc.txt b/_licenses/isc.txt index fe62b9e..2d8f0e1 100644 --- a/_licenses/isc.txt +++ b/_licenses/isc.txt @@ -1,7 +1,7 @@ --- title: ISC License spdx-id: ISC -source: http://opensource.org/licenses/isc-license +source: https://opensource.org/licenses/isc-license description: A permissive license lets people do anything with your code with proper attribution and without warranty. The ISC license is functionally equivalent to the BSD 2-Clause and MIT licenses, removing some language that is no longer necessary. diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index 81c218e..3f5bb28 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -3,7 +3,7 @@ title: GNU Lesser General Public License v2.1 spdx-id: LGPL-2.1 nickname: GNU LGPLv2.1 redirect_from: /licenses/lgpl-v2.1/ -source: http://www.gnu.org/licenses/lgpl-2.1.txt +source: https://www.gnu.org/licenses/lgpl-2.1.txt hidden: false description: Primarily used for software libraries, the GNU LGPL requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction. There are two commonly used versions of the GNU LGPL. diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index 4006367..f14e7f1 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -3,7 +3,7 @@ title: GNU Lesser General Public License v3.0 spdx-id: LGPL-3.0 nickname: GNU LGPLv3 redirect_from: /licenses/lgpl-v3/ -source: http://www.gnu.org/licenses/lgpl-3.0.txt +source: https://www.gnu.org/licenses/lgpl-3.0.txt hidden: false description: Permissions of this copyleft license are conditioned on making available complete source code of licensed works and modifications under the same license or the GNU GPLv3. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. However, a larger work using the licensed work through interfaces provided by the licensed work may be distributed under different terms and without source code for the larger work. diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt index 5c26163..622bda0 100644 --- a/_licenses/ms-pl.txt +++ b/_licenses/ms-pl.txt @@ -1,7 +1,7 @@ --- title: Microsoft Public License spdx-id: MS-PL -source: http://opensource.org/licenses/ms-pl +source: https://opensource.org/licenses/ms-pl description: An open source license with a patent grant. diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index a932c98..e2577e0 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -1,7 +1,7 @@ --- title: Microsoft Reciprocal License spdx-id: MS-RL -source: http://opensource.org/licenses/ms-rl +source: https://opensource.org/licenses/ms-rl description: An open source license with a patent grant similar to the Microsoft Public License, with the additional condition that any source code for any derived file be provided under this license. diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index cd28ec3..a71ce60 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -1,7 +1,7 @@ --- title: Open Software License 3.0 spdx-id: OSL-3.0 -source: http://opensource.org/licenses/OSL-3.0 +source: https://opensource.org/licenses/OSL-3.0 description: OSL 3.0 is a copyleft license that does not require reciprocal licensing on linked works. It also provides an express grant of patent rights from contributors to users, with a termination clause triggered if a user files a patent infringement lawsuit. diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 2c94391..db18a75 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -1,7 +1,7 @@ --- title: The Unlicense spdx-id: Unlicense -source: http://unlicense.org/UNLICENSE +source: https://unlicense.org/UNLICENSE hidden: false description: A license with no conditions whatsoever which dedicates works to the public domain. Unlicensed works, modifications, and larger works may be distributed under different terms and without source code. @@ -50,4 +50,4 @@ 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. -For more information, please refer to +For more information, please refer to diff --git a/existing.md b/existing.md index 9f26207..2cf7c28 100644 --- a/existing.md +++ b/existing.md @@ -14,6 +14,6 @@ Some communities have strong preferences for particular licenses. If you want to * [Apache](https://www.apache.org/licenses/) requires [Apache License 2.0](/licenses/apache-2.0/) * [GNU](https://www.gnu.org/licenses/license-recommendations.html) recommends [GNU GPLv3](/licenses/gpl-3.0/) for most programs -* [OpenBSD](http://www.openbsd.org/policy.html) prefers [ISC](/licenses/isc/) +* [OpenBSD](https://www.openbsd.org/policy.html) prefers [ISC](/licenses/isc/) Communities come in all shapes and sizes. The examples above are *very* well established. If the community you see your project as a part of doesn't have set-in-stone licensing traditions, or you don't see your project as part of any particular community, that's just fine: [make your own choice of an open source license](/). diff --git a/non-software.md b/non-software.md index e235a15..091fa22 100644 --- a/non-software.md +++ b/non-software.md @@ -4,7 +4,7 @@ layout: default permalink: /non-software/ --- -Open source software licenses can be used for non-software works, and often are the best choice. This is particularly the case when the works in question can be edited and versioned as source, e.g., [open source hardware](http://www.oshwa.org/definition/) designs. Choose an [open source license](/licenses/). +Open source software licenses can be used for non-software works, and often are the best choice. This is particularly the case when the works in question can be edited and versioned as source, e.g., [open source hardware](https://www.oshwa.org/definition/) designs. Choose an [open source license](/licenses/). ### Data, media, etc. From b1baa060f29bd99aa853c10c40caa0e275aed449 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 4 Oct 2017 13:59:15 -0700 Subject: [PATCH 069/144] libcurl4-openssl-dev to maybe avoid SSL errors in tests? errors like https://github.com/github/choosealicense.com/pull/539#issuecomment-333402497 possible fix found at https://github.com/gjtorikian/html-proofer/issues/376#issuecomment-332770021 --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index f35dbd0..0b42a5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,11 @@ language: ruby rvm: - 2.4.0 +addons: + apt: + packages: + - libcurl4-openssl-dev + branches: only: - gh-pages From dd9a24fb78cbf258ec5551d18c9ab0cb0209e0fd Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 4 Oct 2017 14:03:08 -0700 Subject: [PATCH 070/144] Fix EUPL link that changed once again without redirect! --- _licenses/eupl-1.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index da10315..6f679ab 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -2,7 +2,7 @@ title: European Union Public License 1.1 spdx-id: EUPL-1.1 redirect_from: /licenses/eupl-v1.1/ -source: https://joinup.ec.europa.eu/community/eupl/og_page/eupl-text-11-12 +source: https://joinup.ec.europa.eu/page/eupl-text-11-12 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. From d7dd72fdecea24ab32b58499c8ed522b486970d8 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 18 Oct 2017 17:04:09 -0700 Subject: [PATCH 071/144] {} -> <> in license trailer to more closely match canonical texts --- _licenses/gpl-2.0.txt | 6 +++--- _licenses/gpl-3.0.txt | 6 +++--- _licenses/lgpl-2.1.txt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 0ed70e4..1f05260 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -326,8 +326,8 @@ to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {description} - Copyright (C) {year} {fullname} + + Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -365,7 +365,7 @@ necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. - {signature of Ty Coon}, 1 April 1989 + , 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index b05798b..68d2f5d 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -670,8 +670,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + + Copyright (C) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -691,7 +691,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + Copyright (C) This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index 3f5bb28..c0fe81d 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -504,8 +504,8 @@ safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {description} - Copyright (C) {year} {fullname} + + Copyright (C) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -532,7 +532,7 @@ necessary. Here is a sample; alter the names: library `Frob' (a library for tweaking knobs) written by James Random Hacker. - {signature of Ty Coon}, 1 April 1990 + , 1 April 1990 Ty Coon, President of Vice That's all there is to it! From e90b7c383a8c46fa6b88801be60bced12f429513 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 18 Oct 2017 17:14:38 -0700 Subject: [PATCH 072/144] wording changes for <> fields to match canonical versions --- _licenses/gpl-2.0.txt | 4 ++-- _licenses/gpl-3.0.txt | 2 +- _licenses/lgpl-2.1.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 1f05260..4e47be9 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -326,8 +326,8 @@ to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + + Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index 68d2f5d..a533d7f 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -691,7 +691,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - Copyright (C) + Copyright (C) This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index c0fe81d..deecf4e 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -504,8 +504,8 @@ safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + + Copyright (C) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public From 64ba25a22f835295c80e024cf3bc7703c876fcb9 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 18 Oct 2017 17:16:11 -0700 Subject: [PATCH 073/144] remove link not found in canonical version --- _licenses/gpl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 4e47be9..506fcea 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -37,7 +37,7 @@ limitations: GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., + Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. From ddb0f09db972522b2aaf4877332cb96ad2a4d196 Mon Sep 17 00:00:00 2001 From: Park Hyunwoo Date: Thu, 19 Oct 2017 22:34:04 +0900 Subject: [PATCH 074/144] Replace gems with plugins to follow up jekyll update --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index e5d4e8d..004f14b 100644 --- a/_config.yml +++ b/_config.yml @@ -35,7 +35,7 @@ exclude: - assets/vendor/selectivizr/tests - assets/vendor/clipboard/test -gems: +plugins: - jekyll-sitemap - jekyll-redirect-from - jekyll-seo-tag From 96620b48968c1ebc905ff0d663612806357c63a4 Mon Sep 17 00:00:00 2001 From: Park Hyunwoo Date: Fri, 20 Oct 2017 14:25:19 +0900 Subject: [PATCH 075/144] Add pipe character for sort filter to fix liquid syntax warning --- appendix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appendix.md b/appendix.md index 316c6bd..09c6e45 100644 --- a/appendix.md +++ b/appendix.md @@ -25,7 +25,7 @@ If you're here to choose a license, **[start from the home page](/)** to see a f {% endfor %} {% endfor %} -{% assign licenses = site.licenses sort: "path" %} +{% assign licenses = site.licenses | sort: "path" %} {% for license in licenses %} {{ license.title }} {% assign seen_tags = '' %} From 17d1196b31240c4596a1c7fac5447a20ee3e85fd Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 24 Oct 2017 11:22:07 -0700 Subject: [PATCH 076/144] replace 404 link --- _licenses/osl-3.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index a71ce60..d973ace 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -11,7 +11,7 @@ note: OSL 3.0's author has pr using: - appserver.io: https://github.com/appserver-io/appserver/blob/master/LICENSE.txt - - Magento 2: https://github.com/magento/magento2/blob/develop/LICENSE.txt + - JsonMapper: https://github.com/cweiske/jsonmapper/blob/master/LICENSE - Restyaboard: https://github.com/RestyaPlatform/board/blob/master/LICENSE.txt permissions: From 38a3be48986ad7ad8dae94748294e3c563d2bfd8 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 24 Oct 2017 14:48:49 -0700 Subject: [PATCH 077/144] restore square brackets from canonical versions --- _licenses/apache-2.0.txt | 4 ++-- _licenses/ecl-2.0.txt | 4 ++-- _licenses/lgpl-2.1.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index 0c594de..f652198 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -215,7 +215,7 @@ limitations: APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -223,7 +223,7 @@ limitations: same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index 90f7403..ccc9267 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -216,14 +216,14 @@ END OF TERMS AND CONDITIONS APPENDIX: How to apply the Educational Community License to your work To apply the Educational Community License to your work, attach the following -boilerplate notice, with the fields enclosed by brackets "{}" replaced with +boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. -Copyright {yyyy} {name of copyright owner} Licensed under the Educational +Copyright [yyyy] [name of copyright owner] Licensed under the Educational Community License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index deecf4e..88fb2d3 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -40,9 +40,9 @@ limitations: Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -(This is the first released version of the Lesser GPL. It also counts +[This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.) + the version number 2.1.] Preamble From d5c6d8d7467682963a31ee3395d4a4a7db7963d2 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 24 Oct 2017 14:51:39 -0700 Subject: [PATCH 078/144] only look for unknown [] fields in first 1000 charcters that's where they're likely to be, outside of examples at the end of long licenses still want to check as if there are unknown [] fields in first 1000 characters, might be a field that should be filled in, but wouldn't for lack of correct name --- spec/license_fields_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb index 4215f37..f8b88bd 100644 --- a/spec/license_fields_spec.rb +++ b/spec/license_fields_spec.rb @@ -6,7 +6,7 @@ describe 'license fillable fields' do licenses.each do |license| context "The #{license['title']} license" do it 'should only contain supported fillable fields' do - matches = license['content'].scan(/\[([a-z]+)\]/) + matches = license['content'][0,1000].scan(/\[([a-z]+)\]/) extra_fields = matches.flatten - (fields.map { |f| f['name'] }) expect(extra_fields).to be_empty end From 71aace0808219610c42e358114cdc3399749aa75 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 24 Oct 2017 16:24:38 -0700 Subject: [PATCH 079/144] rubocop --- spec/license_fields_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb index f8b88bd..af0a177 100644 --- a/spec/license_fields_spec.rb +++ b/spec/license_fields_spec.rb @@ -6,7 +6,7 @@ describe 'license fillable fields' do licenses.each do |license| context "The #{license['title']} license" do it 'should only contain supported fillable fields' do - matches = license['content'][0,1000].scan(/\[([a-z]+)\]/) + matches = license['content'][0, 1000].scan(/\[([a-z]+)\]/) extra_fields = matches.flatten - (fields.map { |f| f['name'] }) expect(extra_fields).to be_empty end From 5e7b07f998e9264092b8e1274f99605ead412138 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 25 Oct 2017 09:34:49 -0700 Subject: [PATCH 080/144] rm no longer relevant test --- spec/license_fields_spec.rb | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 spec/license_fields_spec.rb diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb deleted file mode 100644 index af0a177..0000000 --- a/spec/license_fields_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'license fillable fields' do - licenses.each do |license| - context "The #{license['title']} license" do - it 'should only contain supported fillable fields' do - matches = license['content'][0, 1000].scan(/\[([a-z]+)\]/) - extra_fields = matches.flatten - (fields.map { |f| f['name'] }) - expect(extra_fields).to be_empty - end - end - end -end From e28f022138e8402d31fe9dabdb1f51aaf7bde9d8 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Mon, 6 Nov 2017 03:43:52 +0000 Subject: [PATCH 081/144] spelling: existing --- existing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/existing.md b/existing.md index 2cf7c28..e6c6dc0 100644 --- a/existing.md +++ b/existing.md @@ -8,7 +8,7 @@ If you're contributing to or extending an existing project, it's almost always e Depending on how you're building on an existing project and what its license is, using the existing project's license for your own might not just be the easiest thing to do, but a condition on which your permission to build on the existing project rests: see the "same license" condition of [some licenses](/licenses/). -Some communities have strong preferences for particular licenses. If you want to participate in one of these, it will be easier to use the preferred license even if you're starting a brand new project with no exisiting dependencies. A few examples: +Some communities have strong preferences for particular licenses. If you want to participate in one of these, it will be easier to use the preferred license even if you're starting a brand new project with no existing dependencies. A few examples: {: .bullets} From ce1ee044a9308502b837aa9ecd9ab91a676ca63e Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Mon, 6 Nov 2017 03:45:19 +0000 Subject: [PATCH 082/144] spelling: prohibition --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 4f2d52b..ce26d43 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -4,7 +4,7 @@ spdx-id: NCSA nickname: UIUC/NCSA source: https://opensource.org/licenses/NCSA -description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. Its conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. Its conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibition of using the names of the authors or the project organization to promote or endorse derived products. 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. From d43130dc55c92f8c8b8c1ba259276a37585303ae Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 13 Nov 2017 16:01:45 -0800 Subject: [PATCH 083/144] make wtfpl source: field point to url with license text --- _licenses/wtfpl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.txt index 12b2b10..2a23d0a 100644 --- a/_licenses/wtfpl.txt +++ b/_licenses/wtfpl.txt @@ -1,7 +1,7 @@ --- title: "Do What The F*ck You Want To Public License" spdx-id: WTFPL -source: http://www.wtfpl.net/ +source: http://www.wtfpl.net/txt/copying/ description: The easiest license out there. It gives the user permissions to do whatever they want with your code. From 2d5a7244b456e0b60206a8c69f537ae1de89c7e3 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 13 Nov 2017 16:51:43 -0800 Subject: [PATCH 084/144] update apache-2.0 using examples - Apache HTTPD URL giving timeouts in CI - Android license file isn't a simple example to copy from + Kubernetes, Elasticsearch are very high profile, with simple verbatim license files --- _licenses/apache-2.0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index f652198..bcd63fa 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -13,8 +13,8 @@ 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 at the very end of the license in the appendix. using: - - Android: https://github.com/android/platform_system_core/blob/master/NOTICE - - Apache: https://svn.apache.org/viewvc/httpd/httpd/trunk/LICENSE?view=markup + - Elasticsearch: https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt + - Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE - Swift: https://github.com/apple/swift/blob/master/LICENSE.txt permissions: From bb49e4c1f7420c3a8aa2cb8a62440ba0189c693c Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Nov 2017 11:10:38 -0800 Subject: [PATCH 085/144] whoops, test looking at wrong file extension --- spec/license_bom_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/license_bom_spec.rb b/spec/license_bom_spec.rb index bed1d1e..0b316bd 100644 --- a/spec/license_bom_spec.rb +++ b/spec/license_bom_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'byte order marks' do - Dir["#{licenses_path}/*.html"].each do |file| + Dir["#{licenses_path}/*.txt"].each do |file| context "the #{File.basename(file, '.txt')} license" do it 'does not begin with a byte order mark' do bom = File.open(file).read.start_with?("\u0000EF\u0000BB\u0000BF") From fc3370e024f7fb0125bf60d83ebc9576f62d3d94 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Nov 2017 12:11:14 -0800 Subject: [PATCH 086/144] basic test for line length <= 78 --- spec/license_wrap_spec.rb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 spec/license_wrap_spec.rb diff --git a/spec/license_wrap_spec.rb b/spec/license_wrap_spec.rb new file mode 100644 index 0000000..cac82bf --- /dev/null +++ b/spec/license_wrap_spec.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'word wrapping' do + Dir["#{licenses_path}/*.txt"].each do |file| + context "the #{File.basename(file, '.txt')} license" do + it 'does not wrap at line length 78' do + file_content = File.read(file, encoding: 'utf-8') + license_text = file_content.match(/\A(?:---\n.*\n---\n+)?(.*)/m)[1] + max_line_length = 0 + max_line = "" + license_text.lines.each do |line| + if line.length > max_line_length + max_line_length = line.length + max_line = line + end + end + msg = "Longest line is #{max_line_length} characters: #{max_line}" + skip msg if max_line_length > 78 && max_line_length < 81 + expect(max_line_length).to be <= 78, msg + end + end + end +end From dc4c7215cabdc455d8f72583d03c98b2edcdbf50 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Nov 2017 12:23:28 -0800 Subject: [PATCH 087/144] don't count newline --- spec/license_wrap_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/license_wrap_spec.rb b/spec/license_wrap_spec.rb index cac82bf..7e49632 100644 --- a/spec/license_wrap_spec.rb +++ b/spec/license_wrap_spec.rb @@ -11,6 +11,7 @@ describe 'word wrapping' do max_line_length = 0 max_line = "" license_text.lines.each do |line| + line.chomp! if line.length > max_line_length max_line_length = line.length max_line = line From dc00fc0ae5b0ed51488397c9dc3f05181771986a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Nov 2017 12:33:01 -0800 Subject: [PATCH 088/144] rubocop --- spec/license_wrap_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/license_wrap_spec.rb b/spec/license_wrap_spec.rb index 7e49632..334c792 100644 --- a/spec/license_wrap_spec.rb +++ b/spec/license_wrap_spec.rb @@ -9,7 +9,7 @@ describe 'word wrapping' do file_content = File.read(file, encoding: 'utf-8') license_text = file_content.match(/\A(?:---\n.*\n---\n+)?(.*)/m)[1] max_line_length = 0 - max_line = "" + max_line = '' license_text.lines.each do |line| line.chomp! if line.length > max_line_length From 29a3b153e3d525a94b6a1558a83830212f0548ef Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Nov 2017 14:21:19 -0800 Subject: [PATCH 089/144] wrapped AFL-3.0, MS-PL, MS-RL taken from https://github.com/github/choosealicense.com/pull/489/commits/8332159157c6e96ece583060b5be53700de4f63d --- _licenses/afl-3.0.txt | 169 ++++++++++++++++++++++++++++++++++++------ _licenses/ms-pl.txt | 60 +++++++++++---- _licenses/ms-rl.txt | 70 +++++++++++++---- 3 files changed, 248 insertions(+), 51 deletions(-) diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index ed45814..1a14b55 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -29,44 +29,169 @@ limitations: Academic Free License (“AFL”) v. 3.0 -This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: +This Academic Free License (the "License") applies to any original work of +authorship (the "Original Work") whose owner (the "Licensor") has placed the +following licensing notice adjacent to the copyright notice for the Original +Work: 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: +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; - 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; - d) to perform the Original Work publicly; and - e) to display the Original Work publicly. +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; +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 +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 by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. +2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, +non-exclusive, sublicensable license, under patent claims owned or controlled +by the Licensor that are embodied in the Original Work as furnished by the +Licensor, for the duration of the patents, to make, use, sell, offer for sale, +have made, and import the Original Work and Derivative Works. -3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. +3) Grant of Source Code License. The term "Source Code" means the preferred +form of the Original Work for making modifications to it and all available +documentation describing how to modify the Original Work. Licensor agrees to +provide a machine-readable copy of the Source Code of the Original Work along +with each copy of the Original Work that Licensor distributes. Licensor +reserves the right to satisfy this obligation by placing a machine-readable +copy of the Source Code in an information repository reasonably calculated to +permit inexpensive and convenient access by You for as long as Licensor +continues to distribute the Original Work. -4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor’s trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. +4) Exclusions From License Grant. Neither the names of Licensor, nor the names +of any contributors to the Original Work, nor any of their trademarks or +service marks, may be used to endorse or promote products derived from this +Original Work without express prior permission of the Licensor. Except as +expressly stated herein, nothing in this License grants any license to +Licensor’s trademarks, copyrights, patents, trade secrets or any other +intellectual property. No patent license is granted to make, use, sell, offer +for sale, have made, or import embodiments of any patent claims other than the +licensed claims defined in Section 2. No license is granted to the trademarks +of Licensor even if such marks are included in the Original Work. Nothing in +this License shall be interpreted to prohibit Licensor from licensing under +terms different from this License any Original Work that Licensor otherwise +would have a right to license. -5) External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). +5) External Deployment. The term "External Deployment" means the use, +distribution, or communication of the Original Work or Derivative Works in any +way such that the Original Work or Derivative Works may be used by anyone +other than You, whether those works are distributed or communicated to those +persons or made available as an application intended for use over a network. +As an express condition for the grants of license hereunder, You must treat +any External Deployment by You of the Original Work or a Derivative Work as a +distribution under section 1(c). -6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. +6) Attribution Rights. You must retain, in the Source Code of any Derivative +Works that You create, all copyright, patent, or trademark notices from the +Source Code of the Original Work, as well as any notices of licensing and any +descriptive text identified therein as an "Attribution Notice." You must cause +the Source Code for any Derivative Works that You create to carry a prominent +Attribution Notice reasonably calculated to inform recipients that You have +modified the Original Work. -7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. +7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that +the copyright in and to the Original Work and the patent rights granted herein +by Licensor are owned by the Licensor or are sublicensed to You under the +terms of this License with the permission of the contributor(s) of those +copyrights and patent rights. Except as expressly stated in the immediately +preceding sentence, the Original Work is provided under this License on an "AS +IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without +limitation, the warranties of non-infringement, merchantability or fitness for +a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK +IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this +License. No license to the Original Work is granted by this License except +under this disclaimer. -8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. +8) Limitation of Liability. Under no circumstances and under no legal theory, +whether in tort (including negligence), contract, or otherwise, shall the +Licensor be liable to anyone for any indirect, special, incidental, or +consequential damages of any character arising as a result of this License or +the use of the Original Work including, without limitation, damages for loss +of goodwill, work stoppage, computer failure or malfunction, or any and all +other commercial damages or losses. This limitation of liability shall not +apply to the extent applicable law prohibits such limitation. -9) Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including “fair use” or “fair dealing”). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). +9) Acceptance and Termination. If, at any time, You expressly assented to this +License, that assent indicates your clear and irrevocable acceptance of this +License and all of its terms and conditions. If You distribute or communicate +copies of the Original Work or a Derivative Work, You must make a reasonable +effort under the circumstances to obtain the express assent of recipients to +the terms of this License. This License conditions your rights to undertake +the activities listed in Section 1, including your right to create Derivative +Works based upon the Original Work, and doing so without honoring these terms +and conditions is prohibited by copyright law and international treaty. +Nothing in this License is intended to affect copyright exceptions and +limitations (including “fair use” or “fair dealing”). This License shall +terminate immediately and You may no longer exercise any of the rights granted +to You by this License upon your failure to honor the conditions in Section +1(c). -10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. +10) Termination for Patent Action. This License shall terminate automatically +and You may no longer exercise any of the rights granted to You by this +License as of the date You commence an action, including a cross-claim or +counterclaim, against Licensor or any licensee alleging that the Original Work +infringes a patent. This termination provision shall not apply for an action +alleging patent infringement by combinations of the Original Work with other +software or hardware. -11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. +11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this +License may be brought only in the courts of a jurisdiction wherein the +Licensor resides or in which Licensor conducts its primary business, and under +the laws of that jurisdiction excluding its conflict-of-law provisions. The +application of the United Nations Convention on Contracts for the +International Sale of Goods is expressly excluded. Any use of the Original +Work outside the scope of this License or after its termination shall be +subject to the requirements and penalties of copyright or patent law in the +appropriate jurisdiction. This section shall survive the termination of this +License. -12) Attorneys’ Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. +12) Attorneys’ Fees. In any action to enforce the terms of this License or +seeking damages relating thereto, the prevailing party shall be entitled to +recover its costs and expenses, including, without limitation, reasonable +attorneys' fees and costs incurred in connection with such action, including +any appeal of such action. This section shall survive the termination of this +License. -13) Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. +13) Miscellaneous. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent necessary +to make it enforceable. -14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. +14) Definition of "You" in This License. "You" throughout this License, +whether in upper or lower case, means an individual or a legal entity +exercising rights under, and complying with all of the terms of, this License. +For legal entities, "You" includes any entity that controls, is controlled by, +or is under common control with you. For purposes of this definition, +"control" means (i) the power, direct or indirect, to cause the direction or +management of such entity, whether by contract or otherwise, or (ii) ownership +of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial +ownership of such entity. -15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. +15) Right to Use. You may use the Original Work in all ways not otherwise +restricted or conditioned by this License or by law, and Licensor promises not +to interfere with or be responsible for such uses by You. -16) Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. +16) Modification of This License. This License is Copyright © 2005 Lawrence +Rosen. Permission is granted to copy, distribute, or communicate this License +without modification. Nothing in this License permits You to modify this +License as applied to the Original Work or to Derivative Works. However, You +may modify the text of this License and copy, distribute or communicate your +modified version (the "Modified License") and apply it to other original works +of authorship subject to the following conditions: (i) You may not indicate in +any way that your Modified License is the "Academic Free License" or "AFL" and +you may not use those names in the name of your Modified License; (ii) You +must replace the notice specified in the first paragraph above with the notice +"Licensed under " or with a notice of your own +that is not confusingly similar to the notice in this License; and (iii) You +may not claim that your original works are open source software unless your +Modified License has been approved by Open Source Initiative (OSI) and You +comply with its license review and certification process. diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt index 622bda0..7e493c9 100644 --- a/_licenses/ms-pl.txt +++ b/_licenses/ms-pl.txt @@ -25,25 +25,55 @@ limitations: --- -Microsoft Public License (MS-PL) +Microsoft Public License (Ms-PL) -This license governs use of the accompanying software. If you use the software, you -accept this license. If you do not accept the license, do not use the software. +This license governs use of the accompanying software. If you use the +software, you accept this license. If you do not accept the license, do not +use the software. 1. Definitions -The terms "reproduce," "reproduction," "derivative works," and "distribution" have the -same meaning here as under U.S. copyright law. -A "contribution" is the original software, or any additions or changes to the software. -A "contributor" is any person that distributes its contribution under this license. -"Licensed patents" are a contributor's patent claims that read directly on its contribution. +The terms "reproduce," "reproduction," "derivative works," and "distribution" +have the same meaning here as under U.S. copyright law. A "contribution" is +the original software, or any additions or changes to the software. A +"contributor" is any person that distributes its contribution under this +license. "Licensed patents" are a contributor's patent claims that read +directly on its contribution. 2. Grant of Rights -(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create. -(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software. +(A) Copyright Grant- Subject to the terms of this license, including the +license conditions and limitations in section 3, each contributor grants you a +non-exclusive, worldwide, royalty-free copyright license to reproduce its +contribution, prepare derivative works of its contribution, and distribute its +contribution or any derivative works that you create. + +(B) Patent Grant- Subject to the terms of this license, including the license +conditions and limitations in section 3, each contributor grants you a +non-exclusive, worldwide, royalty-free license under its licensed patents to +make, have made, use, sell, offer for sale, import, and/or otherwise dispose +of its contribution in the software or derivative works of the contribution in +the software. 3. Conditions and Limitations -(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. -(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. -(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. -(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. -(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. +(A) No Trademark License- This license does not grant you rights to use any +contributors' name, logo, or trademarks. + +(B) If you bring a patent claim against any contributor over patents that you +claim are infringed by the software, your patent license from such contributor +to the software ends automatically. + +(C) If you distribute any portion of the software, you must retain all +copyright, patent, trademark, and attribution notices that are present in the +software. + +(D) If you distribute any portion of the software in source code form, you may +do so only under this license by including a complete copy of this license +with your distribution. If you distribute any portion of the software in +compiled or object code form, you may only do so under a license that complies +with this license. + +(E) The software is licensed "as-is." You bear the risk of using it. The +contributors give no express warranties, guarantees, or conditions. You may +have additional consumer rights under your local laws which this license +cannot change. To the extent permitted under your local laws, the contributors +exclude the implied warranties of merchantability, fitness for a particular +purpose and non-infringement. diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index e2577e0..5ff0fe7 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -27,24 +27,66 @@ limitations: --- -Microsoft Reciprocal License (MS-RL) +Microsoft Reciprocal License (Ms-RL) -This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software. +This license governs use of the accompanying software. If you use the +software, you accept this license. If you do not accept the license, do not +use the software. 1. Definitions -The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law. -A "contribution" is the original software, or any additions or changes to the software. -A "contributor" is any person that distributes its contribution under this license. -"Licensed patents" are a contributor's patent claims that read directly on its contribution. +The terms "reproduce," "reproduction," "derivative works," and "distribution" +have the same meaning here as under U.S. copyright law. + +A "contribution" is the original software, or any additions or changes to the +software. + +A "contributor" is any person that distributes its contribution under this +license. + +"Licensed patents" are a contributor's patent claims that read directly on its +contribution. 2. Grant of Rights -(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create. -(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software. +(A) Copyright Grant- Subject to the terms of this license, including the +license conditions and limitations in section 3, each contributor grants you a +non-exclusive, worldwide, royalty-free copyright license to reproduce its +contribution, prepare derivative works of its contribution, and distribute its +contribution or any derivative works that you create. + +(B) Patent Grant- Subject to the terms of this license, including the license +conditions and limitations in section 3, each contributor grants you a +non-exclusive, worldwide, royalty-free license under its licensed patents to +make, have made, use, sell, offer for sale, import, and/or otherwise dispose +of its contribution in the software or derivative works of the contribution in +the software. 3. Conditions and Limitations -(A) Reciprocal Grants- For any file you distribute that contains code from the software (in source code or binary format), you must provide recipients the source code to that file along with a copy of this license, which license will govern that file. You may license other files that are entirely your own work and do not contain code from the software under any terms you choose. -(B) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. -(C) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. -(D) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. -(E) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. -(F) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. +(A) Reciprocal Grants- For any file you distribute that contains code from the +software (in source code or binary format), you must provide recipients the +source code to that file along with a copy of this license, which license will +govern that file. You may license other files that are entirely your own work +and do not contain code from the software under any terms you choose. + +(B) No Trademark License- This license does not grant you rights to use any +contributors' name, logo, or trademarks. + +(C) If you bring a patent claim against any contributor over patents that you +claim are infringed by the software, your patent license from such contributor +to the software ends automatically. + +(D) If you distribute any portion of the software, you must retain all +copyright, patent, trademark, and attribution notices that are present in the +software. + +(E) If you distribute any portion of the software in source code form, you may +do so only under this license by including a complete copy of this license +with your distribution. If you distribute any portion of the software in +compiled or object code form, you may only do so under a license that complies +with this license. + +(F) The software is licensed "as-is." You bear the risk of using it. The +contributors give no express warranties, guarantees, or conditions. You may +have additional consumer rights under your local laws which this license +cannot change. To the extent permitted under your local laws, the contributors +exclude the implied warranties of merchantability, fitness for a particular +purpose and non-infringement. From 644782b5507b6b19151e2a776a248f768cb52048 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Nov 2017 19:29:02 -0800 Subject: [PATCH 090/144] clearbsd from https://github.com/github/choosealicense.com/pull/553/commits/f4c8baf53599c86c200a4a334571170085ef4e45 --- _licenses/bsd-3-clause-clear.txt | 38 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt index 9a8266b..6f499b8 100644 --- a/_licenses/bsd-3-clause-clear.txt +++ b/_licenses/bsd-3-clause-clear.txt @@ -27,7 +27,7 @@ limitations: The Clear BSD License -Copyright (c) [year], [fullname] +Copyright (c) [year] [fullname] All rights reserved. Redistribution and use in source and binary forms, with or without @@ -35,25 +35,25 @@ modification, are permitted (subject to the limitations in the disclaimer below) provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. +list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. -* Neither the name of the copyright holder nor the names of its contributors may be used - to endorse or promote products derived from this software without specific - prior written permission. +* Neither the name of [fullname] nor the names of its contributors may be used +to endorse or promote products derived from this software without specific +prior written permission. -NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS -LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. +NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY +THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. From 48b00a5a6b76609c6f8531c9b8a696edd937a085 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 20 Nov 2017 12:02:53 -0800 Subject: [PATCH 091/144] update license texts from #489, avoid EPL-1.0 skip --- _licenses/afl-3.0.txt | 52 +++++++------- _licenses/bsd-3-clause-clear.txt | 16 ++--- _licenses/epl-1.0.txt | 113 ++++++++++++++++--------------- _licenses/ms-pl.txt | 66 +++++++++--------- _licenses/ms-rl.txt | 77 ++++++++++----------- spec/license_wrap_spec.rb | 1 - 6 files changed, 164 insertions(+), 161 deletions(-) diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index 1a14b55..11e4616 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -34,23 +34,25 @@ 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; -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; -d) to perform the Original Work publicly; and -e) to display the Original Work publicly. + 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; + + 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 + 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 @@ -68,19 +70,19 @@ copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. -4) Exclusions From License Grant. Neither the names of Licensor, nor the names -of any contributors to the Original Work, nor any of their trademarks or -service marks, may be used to endorse or promote products derived from this -Original Work without express prior permission of the Licensor. Except as -expressly stated herein, nothing in this License grants any license to -Licensor’s trademarks, copyrights, patents, trade secrets or any other -intellectual property. No patent license is granted to make, use, sell, offer -for sale, have made, or import embodiments of any patent claims other than the -licensed claims defined in Section 2. No license is granted to the trademarks -of Licensor even if such marks are included in the Original Work. Nothing in -this License shall be interpreted to prohibit Licensor from licensing under -terms different from this License any Original Work that Licensor otherwise -would have a right to license. + 4) Exclusions From License Grant. Neither the names of Licensor, nor the + names of any contributors to the Original Work, nor any of their trademarks + or service marks, may be used to endorse or promote products derived from + this Original Work without express prior permission of the Licensor. Except + as expressly stated herein, nothing in this License grants any license to + Licensor’s trademarks, copyrights, patents, trade secrets or any other + intellectual property. No patent license is granted to make, use, sell, offer + for sale, have made, or import embodiments of any patent claims other than + the licensed claims defined in Section 2. No license is granted to the + trademarks of Licensor even if such marks are included in the Original Work. + Nothing in this License shall be interpreted to prohibit Licensor from + licensing under terms different from this License any Original Work that + Licensor otherwise would have a right to license. 5) External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt index 6f499b8..3853f4a 100644 --- a/_licenses/bsd-3-clause-clear.txt +++ b/_licenses/bsd-3-clause-clear.txt @@ -34,16 +34,16 @@ Redistribution and use in source and binary forms, with or without modification, are permitted (subject to the limitations in the disclaimer below) provided that the following conditions are met: -* Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. -* Neither the name of [fullname] nor the names of its contributors may be used -to endorse or promote products derived from this software without specific -prior written permission. + * Neither the name of [fullname] nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 6884897..b8dadda 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -41,21 +41,19 @@ CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS "Contribution" means: + a) in the case of the initial Contributor, the initial code and + documentation distributed under this Agreement, and + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; -a) in the case of the initial Contributor, the initial code and documentation - distributed under this Agreement, and -b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - - where such changes and/or additions to the Program originate from and are - distributed by that particular Contributor. A Contribution 'originates' - from a Contributor if it was added to the Program by such Contributor - itself or anyone acting on such Contributor's behalf. Contributions do not - include additions to the Program which: (i) are separate modules of - software distributed in conjunction with the Program under their own - license agreement, and (ii) are not derivative works of the Program. - +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or +anyone acting on such Contributor's behalf. Contributions do not include +additions to the Program which: (i) are separate modules of software +distributed in conjunction with the Program under their own license agreement, +and (ii) are not derivative works of the Program. "Contributor" means any person or entity that distributes the Program. "Licensed Patents" mean patent claims licensable by a Contributor which are @@ -69,12 +67,14 @@ Agreement. including all Contributors. 2. GRANT OF RIGHTS - a) Subject to the terms of this Agreement, each Contributor hereby grants + + a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. - b) Subject to the terms of this Agreement, each Contributor hereby grants + + b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and @@ -84,56 +84,60 @@ including all Contributors. combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - c) Recipient understands that although each Contributor grants the licenses - to its Contributions set forth herein, no assurances are provided by any - Contributor that the Program does not infringe the patent or other - intellectual property rights of any other entity. Each Contributor - disclaims any liability to Recipient for claims brought by any other - entity based on infringement of intellectual property rights or + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the patent + or other intellectual property rights of any other entity. Each + Contributor disclaims any liability to Recipient for claims brought by + any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. - d) Each Contributor represents that to its knowledge it has sufficient + + d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 3. REQUIREMENTS - A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - a) it complies with the terms and conditions of this Agreement; and - b) its license agreement: - i) effectively disclaims on behalf of all Contributors all warranties - and conditions, express and implied, including warranties or - conditions of title and non-infringement, and implied warranties or - conditions of merchantability and fitness for a particular purpose; - ii) effectively excludes on behalf of all Contributors all liability for - damages, including direct, indirect, special, incidental and - consequential damages, such as lost profits; - iii) states that any provisions which differ from this Agreement are - offered by that Contributor alone and not by any other party; and - iv) states that source code for the Program is available from such - Contributor, and informs licensees how to obtain it in a reasonable - manner on or through a medium customarily used for software exchange. + a) it complies with the terms and conditions of this Agreement; and + + b) its license agreement: + i) effectively disclaims on behalf of all Contributors all + warranties and conditions, express and implied, including warranties + or conditions of title and non-infringement, and implied warranties + or conditions of merchantability and fitness for a particular + purpose; + ii) effectively excludes on behalf of all Contributors all liability + for damages, including direct, indirect, special, incidental and + consequential damages, such as lost profits; + iii) states that any provisions which differ from this Agreement are + offered by that Contributor alone and not by any other party; and + iv) states that source code for the Program is available from such + Contributor, and informs licensees how to obtain it in a reasonable + manner on or through a medium customarily used for software + exchange. When the Program is made available in source code form: - a) it must be made available under this Agreement; and - b) a copy of this Agreement must be included with each copy of the Program. - Contributors may not remove or alter any copyright notices contained - within the Program. + a) it must be made available under this Agreement; and + + b) a copy of this Agreement must be included with each copy of the + Program. +Contributors may not remove or alter any copyright notices contained within +the Program. Each Contributor must identify itself as the originator of its Contribution, -if -any, in a manner that reasonably allows subsequent Recipients to identify the -originator of the Contribution. +if any, in a manner that reasonably allows subsequent Recipients to identify +the originator of the Contribution. 4. COMMERCIAL DISTRIBUTION - Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who @@ -148,12 +152,11 @@ Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property -infringement. In order to qualify, an Indemnified Contributor must: -a) promptly notify the Commercial Contributor in writing of such claim, and -b) allow the Commercial Contributor to control, and cooperate with the -Commercial Contributor in, the defense and any related settlement -negotiations. The Indemnified Contributor may participate in any such claim at -its own expense. +infringement. In order to qualify, an Indemnified Contributor must: a) +promptly notify the Commercial Contributor in writing of such claim, and b) +allow the Commercial Contributor to control, and cooperate with the Commercial +Contributor in, the defense and any related settlement negotiations. The +Indemnified Contributor may participate in any such claim at its own expense. For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If @@ -166,7 +169,6 @@ court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. 5. NO WARRANTY - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, @@ -179,7 +181,6 @@ or loss of data, programs or equipment, and unavailability or interruption of operations. 6. DISCLAIMER OF LIABILITY - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION @@ -233,5 +234,5 @@ Program not expressly granted under this Agreement are reserved. This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year -after the cause of action arose. Each party waives its rights to a jury trial in -any resulting litigation. +after the cause of action arose. Each party waives its rights to a jury trial +in any resulting litigation. diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt index 7e493c9..472fd95 100644 --- a/_licenses/ms-pl.txt +++ b/_licenses/ms-pl.txt @@ -31,7 +31,7 @@ This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software. -1. Definitions +1. Definitions The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law. A "contribution" is the original software, or any additions or changes to the software. A @@ -39,41 +39,41 @@ the original software, or any additions or changes to the software. A license. "Licensed patents" are a contributor's patent claims that read directly on its contribution. -2. Grant of Rights -(A) Copyright Grant- Subject to the terms of this license, including the -license conditions and limitations in section 3, each contributor grants you a -non-exclusive, worldwide, royalty-free copyright license to reproduce its -contribution, prepare derivative works of its contribution, and distribute its -contribution or any derivative works that you create. +2. Grant of Rights + (A) Copyright Grant- Subject to the terms of this license, including the + license conditions and limitations in section 3, each contributor grants + you a non-exclusive, worldwide, royalty-free copyright license to + reproduce its contribution, prepare derivative works of its contribution, + and distribute its contribution or any derivative works that you create. -(B) Patent Grant- Subject to the terms of this license, including the license -conditions and limitations in section 3, each contributor grants you a -non-exclusive, worldwide, royalty-free license under its licensed patents to -make, have made, use, sell, offer for sale, import, and/or otherwise dispose -of its contribution in the software or derivative works of the contribution in -the software. + (B) Patent Grant- Subject to the terms of this license, including the + license conditions and limitations in section 3, each contributor grants + you a non-exclusive, worldwide, royalty-free license under its licensed + patents to make, have made, use, sell, offer for sale, import, and/or + otherwise dispose of its contribution in the software or derivative works + of the contribution in the software. -3. Conditions and Limitations -(A) No Trademark License- This license does not grant you rights to use any -contributors' name, logo, or trademarks. +3. Conditions and Limitations + (A) No Trademark License- This license does not grant you rights to use + any contributors' name, logo, or trademarks. -(B) If you bring a patent claim against any contributor over patents that you -claim are infringed by the software, your patent license from such contributor -to the software ends automatically. + (B) If you bring a patent claim against any contributor over patents that + you claim are infringed by the software, your patent license from such + contributor to the software ends automatically. -(C) If you distribute any portion of the software, you must retain all -copyright, patent, trademark, and attribution notices that are present in the -software. + (C) If you distribute any portion of the software, you must retain all + copyright, patent, trademark, and attribution notices that are present in + the software. -(D) If you distribute any portion of the software in source code form, you may -do so only under this license by including a complete copy of this license -with your distribution. If you distribute any portion of the software in -compiled or object code form, you may only do so under a license that complies -with this license. + (D) If you distribute any portion of the software in source code form, + you may do so only under this license by including a complete copy of + this license with your distribution. If you distribute any portion of the + software in compiled or object code form, you may only do so under a + license that complies with this license. -(E) The software is licensed "as-is." You bear the risk of using it. The -contributors give no express warranties, guarantees, or conditions. You may -have additional consumer rights under your local laws which this license -cannot change. To the extent permitted under your local laws, the contributors -exclude the implied warranties of merchantability, fitness for a particular -purpose and non-infringement. + (E) The software is licensed "as-is." You bear the risk of using it. The + contributors give no express warranties, guarantees, or conditions. You + may have additional consumer rights under your local laws which this + license cannot change. To the extent permitted under your local laws, the + contributors exclude the implied warranties of merchantability, fitness + for a particular purpose and non-infringement. diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index 5ff0fe7..e015f13 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -33,7 +33,7 @@ This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software. -1. Definitions +1. Definitions The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law. @@ -46,47 +46,48 @@ license. "Licensed patents" are a contributor's patent claims that read directly on its contribution. -2. Grant of Rights -(A) Copyright Grant- Subject to the terms of this license, including the -license conditions and limitations in section 3, each contributor grants you a -non-exclusive, worldwide, royalty-free copyright license to reproduce its -contribution, prepare derivative works of its contribution, and distribute its -contribution or any derivative works that you create. +2. Grant of Rights + (A) Copyright Grant- Subject to the terms of this license, including the + license conditions and limitations in section 3, each contributor grants + you a non-exclusive, worldwide, royalty-free copyright license to + reproduce its contribution, prepare derivative works of its contribution, + and distribute its contribution or any derivative works that you create. -(B) Patent Grant- Subject to the terms of this license, including the license -conditions and limitations in section 3, each contributor grants you a -non-exclusive, worldwide, royalty-free license under its licensed patents to -make, have made, use, sell, offer for sale, import, and/or otherwise dispose -of its contribution in the software or derivative works of the contribution in -the software. + (B) Patent Grant- Subject to the terms of this license, including the + license conditions and limitations in section 3, each contributor grants + you a non-exclusive, worldwide, royalty-free license under its licensed + patents to make, have made, use, sell, offer for sale, import, and/or + otherwise dispose of its contribution in the software or derivative works + of the contribution in the software. -3. Conditions and Limitations -(A) Reciprocal Grants- For any file you distribute that contains code from the -software (in source code or binary format), you must provide recipients the -source code to that file along with a copy of this license, which license will -govern that file. You may license other files that are entirely your own work -and do not contain code from the software under any terms you choose. +3. Conditions and Limitations + (A) Reciprocal Grants- For any file you distribute that contains code + from the software (in source code or binary format), you must provide + recipients the source code to that file along with a copy of this + license, which license will govern that file. You may license other files + that are entirely your own work and do not contain code from the software + under any terms you choose. -(B) No Trademark License- This license does not grant you rights to use any -contributors' name, logo, or trademarks. + (B) No Trademark License- This license does not grant you rights to use + any contributors' name, logo, or trademarks. -(C) If you bring a patent claim against any contributor over patents that you -claim are infringed by the software, your patent license from such contributor -to the software ends automatically. + (C) If you bring a patent claim against any contributor over patents that + you claim are infringed by the software, your patent license from such + contributor to the software ends automatically. -(D) If you distribute any portion of the software, you must retain all -copyright, patent, trademark, and attribution notices that are present in the -software. + (D) If you distribute any portion of the software, you must retain all + copyright, patent, trademark, and attribution notices that are present in + the software. -(E) If you distribute any portion of the software in source code form, you may -do so only under this license by including a complete copy of this license -with your distribution. If you distribute any portion of the software in -compiled or object code form, you may only do so under a license that complies -with this license. + (E) If you distribute any portion of the software in source code form, + you may do so only under this license by including a complete copy of + this license with your distribution. If you distribute any portion of the + software in compiled or object code form, you may only do so under a + license that complies with this license. -(F) The software is licensed "as-is." You bear the risk of using it. The -contributors give no express warranties, guarantees, or conditions. You may -have additional consumer rights under your local laws which this license -cannot change. To the extent permitted under your local laws, the contributors -exclude the implied warranties of merchantability, fitness for a particular -purpose and non-infringement. + (F) The software is licensed "as-is." You bear the risk of using it. The + contributors give no express warranties, guarantees, or conditions. You + may have additional consumer rights under your local laws which this + license cannot change. To the extent permitted under your local laws, the + contributors exclude the implied warranties of merchantability, fitness + for a particular purpose and non-infringement. diff --git a/spec/license_wrap_spec.rb b/spec/license_wrap_spec.rb index 334c792..c687a77 100644 --- a/spec/license_wrap_spec.rb +++ b/spec/license_wrap_spec.rb @@ -18,7 +18,6 @@ describe 'word wrapping' do end end msg = "Longest line is #{max_line_length} characters: #{max_line}" - skip msg if max_line_length > 78 && max_line_length < 81 expect(max_line_length).to be <= 78, msg end end From 775a2f2920ecf43a4f6f3966e2984a878e1aa367 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 20 Nov 2017 12:20:33 -0800 Subject: [PATCH 092/144] rm spurious indent, unnecessary field --- _licenses/afl-3.0.txt | 26 +++++++++++++------------- _licenses/bsd-3-clause-clear.txt | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index 11e4616..37f08f9 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -70,19 +70,19 @@ copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. - 4) Exclusions From License Grant. Neither the names of Licensor, nor the - names of any contributors to the Original Work, nor any of their trademarks - or service marks, may be used to endorse or promote products derived from - this Original Work without express prior permission of the Licensor. Except - as expressly stated herein, nothing in this License grants any license to - Licensor’s trademarks, copyrights, patents, trade secrets or any other - intellectual property. No patent license is granted to make, use, sell, offer - for sale, have made, or import embodiments of any patent claims other than - the licensed claims defined in Section 2. No license is granted to the - trademarks of Licensor even if such marks are included in the Original Work. - Nothing in this License shall be interpreted to prohibit Licensor from - licensing under terms different from this License any Original Work that - Licensor otherwise would have a right to license. +4) Exclusions From License Grant. Neither the names of Licensor, nor the names +of any contributors to the Original Work, nor any of their trademarks or +service marks, may be used to endorse or promote products derived from this +Original Work without express prior permission of the Licensor. Except as +expressly stated herein, nothing in this License grants any license to +Licensor’s trademarks, copyrights, patents, trade secrets or any other +intellectual property. No patent license is granted to make, use, sell, offer +for sale, have made, or import embodiments of any patent claims other than the +licensed claims defined in Section 2. No license is granted to the trademarks +of Licensor even if such marks are included in the Original Work. Nothing in +this License shall be interpreted to prohibit Licensor from licensing under +terms different from this License any Original Work that Licensor otherwise +would have a right to license. 5) External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt index 3853f4a..1fd8552 100644 --- a/_licenses/bsd-3-clause-clear.txt +++ b/_licenses/bsd-3-clause-clear.txt @@ -41,9 +41,9 @@ below) provided that the following conditions are met: notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of [fullname] nor the names of its contributors may be - used to endorse or promote products derived from this software without - specific prior written permission. + * Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND From f4b5e20cba5e5d07cda51978e6e614b2b57dae99 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 20 Nov 2017 12:56:03 -0800 Subject: [PATCH 093/144] @benbalter review comments --- spec/license_wrap_spec.rb | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/spec/license_wrap_spec.rb b/spec/license_wrap_spec.rb index c687a77..9ab174d 100644 --- a/spec/license_wrap_spec.rb +++ b/spec/license_wrap_spec.rb @@ -3,22 +3,12 @@ require 'spec_helper' describe 'word wrapping' do - Dir["#{licenses_path}/*.txt"].each do |file| - context "the #{File.basename(file, '.txt')} license" do - it 'does not wrap at line length 78' do - file_content = File.read(file, encoding: 'utf-8') - license_text = file_content.match(/\A(?:---\n.*\n---\n+)?(.*)/m)[1] - max_line_length = 0 - max_line = '' - license_text.lines.each do |line| - line.chomp! - if line.length > max_line_length - max_line_length = line.length - max_line = line - end - end - msg = "Longest line is #{max_line_length} characters: #{max_line}" - expect(max_line_length).to be <= 78, msg + licenses.each do |license| + context "the #{license['slug']} license" do + it 'wraps at line length 78' do + max_line = license['content'].lines.max_by { |line| line.chomp!.length } + msg = "Longest line is #{max_line.length} characters: #{max_line}" + expect(max_line.length).to be <= 78, msg end end end From 3532d9cbedccff4d5ce22f3e63ab450082dc9aa5 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 24 Nov 2017 14:15:52 -0800 Subject: [PATCH 094/144] Add EPL-2.0 --- _licenses/epl-1.0.txt | 3 +- _licenses/epl-2.0.txt | 309 +++++++++++++++++++++++++++++++++++++ spec/license_shown_spec.rb | 2 +- 3 files changed, 311 insertions(+), 3 deletions(-) create mode 100644 _licenses/epl-2.0.txt diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index b8dadda..b36cad3 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -1,9 +1,8 @@ --- title: Eclipse Public License 1.0 spdx-id: EPL-1.0 -redirect_from: /licenses/eclipse/ source: https://www.eclipse.org/legal/epl-v10.html -hidden: false +hidden: true description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones. diff --git a/_licenses/epl-2.0.txt b/_licenses/epl-2.0.txt new file mode 100644 index 0000000..c4c0bda --- /dev/null +++ b/_licenses/epl-2.0.txt @@ -0,0 +1,309 @@ +--- +title: Eclipse Public License 2.0 +spdx-id: EPL-2.0 +redirect_from: /licenses/eclipse/ +source: https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt +hidden: false + +description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones. + +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 + +permissions: + - commercial-use + - distribution + - modifications + - patent-use + - private-use + +conditions: + - disclose-source + - include-copyright + - same-license + +limitations: + - liability + - warranty + +--- + +Eclipse Public License - v 2.0 + + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. + +"Contributor" means any person or entity that Distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which +are necessarily infringed by the use or sale of its Contribution alone +or when combined with the Program. + +"Program" means the Contributions Distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the + rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to grant + the copyright license set forth in this Agreement. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). + +3. REQUIREMENTS + +3.1 If a Contributor Distributes the Program in any form, then: + + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and + + b) a copy of this Agreement must be included with each copy of + the Program. + +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities +with respect to end users, business partners and the like. While this +license is intended to facilitate the commercial use of the Program, +the Contributor who includes the Program in a commercial product +offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes +the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits +and other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program +in a commercial product offering. The obligations in this section do not +apply to any claims or Losses relating to any actual or alleged +intellectual property infringement. In order to qualify, an Indemnified +Contributor must: a) promptly notify the Commercial Contributor in +writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those performance +claims and warranties, and if a court requires any other Contributor to +pay any damages as a result, the Commercial Contributor must pay +those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF +TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR +PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all +risks associated with its exercise of rights under this Agreement, +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs +or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS +SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software +or hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably practicable. +However, Recipient's obligations under this Agreement and any licenses +granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, +but in order to avoid inconsistency the Agreement is copyrighted and +may only be modified in the following manner. The Agreement Steward +reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement +Steward has the right to modify this Agreement. The Eclipse Foundation +is the initial Agreement Steward. The Eclipse Foundation may assign the +responsibility to serve as the Agreement Steward to a suitable separate +entity. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be +Distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to Distribute the Program (including its +Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted +under this Agreement are reserved. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set forth +in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), +version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + + You may add additional accurate notices of copyright ownership. diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb index adf631f..8ef6725 100644 --- a/spec/license_shown_spec.rb +++ b/spec/license_shown_spec.rb @@ -10,7 +10,7 @@ describe 'shown licenses' do apache-2.0 bsd-2-clause bsd-3-clause - epl-1.0 + epl-2.0 gpl-2.0 gpl-3.0 lgpl-2.1 From 764906715176b53843e73ef57956aabff7692cd4 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 25 Nov 2017 16:16:11 -0800 Subject: [PATCH 095/144] Test examples provided in 'using:' would be detected by licensee --- Gemfile | 1 + spec/license_meta_spec.rb | 29 ++++++++++++++++++++++++++++- spec/spec_helper.rb | 1 - 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 84fd12d..c92472d 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ end group :test do gem 'html-proofer', '~> 3.0' + gem 'licensee' gem 'nokogiri' gem 'rake' gem 'rspec' diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index b705913..6604066 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +require 'licensee' require 'spec_helper' describe 'license meta' do @@ -19,6 +20,8 @@ describe 'license meta' do expect(missing).to be_empty end + examples = raw_fields['using'] || [] + it 'using contains 3 examples' do legacy = [ 'afl-3.0', @@ -43,9 +46,33 @@ describe 'license meta' do 'zlib' ] skip 'added before 3 using examples required' if legacy.include?(license['slug']) - examples = raw_fields['using'] || [] expect(examples.length).to eq(3) end + + context 'licensee detects using examples' do + module Licensee + class License + class << self + def license_dir + dir = ::File.dirname(__FILE__) + ::File.expand_path '../_licenses', dir + end + end + end + end + + examples.each do |example| + example_url = example.values[0] + if example_url.index('https://github.com/') == 0 + example_url.gsub!(%r{\Ahttps://github.com/(\w+/\w+)/blob/(\w+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2') + end + content = open(example_url).read + detected = Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license + it example_url do + expect(detected.key).to eq(license['slug']) + end + end + end end end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ab89492..4070ccf 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'jekyll' -require 'open-uri' require 'json' require 'open-uri' require 'nokogiri' From 0e2a2653bdaeb110f13e2d5620db4368c4c7edf7 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 25 Nov 2017 19:56:20 -0800 Subject: [PATCH 096/144] path item can include - --- spec/license_meta_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 6604066..5642532 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -64,7 +64,7 @@ describe 'license meta' do examples.each do |example| example_url = example.values[0] if example_url.index('https://github.com/') == 0 - example_url.gsub!(%r{\Ahttps://github.com/(\w+/\w+)/blob/(\w+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2') + example_url.gsub!(%r{\Ahttps://github.com/([\w-]+/[\w-]+)/blob/([\w-]+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2') end content = open(example_url).read detected = Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license From 642783cf4b034681929b973722bd7648123a1ccd Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 25 Nov 2017 20:15:01 -0800 Subject: [PATCH 097/144] GPLv2 examples that can be detected --- _licenses/gpl-2.0.txt | 5 +++-- spec/license_meta_spec.rb | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 506fcea..6f0d042 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -13,8 +13,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: - - Linux: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/COPYING - - WordPress: https://github.com/WordPress/WordPress/blob/master/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/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 5642532..4420927 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -35,7 +35,6 @@ describe 'license meta' do 'cc-by-4.0', 'cc-by-sa-4.0', 'eupl-1.1', - 'gpl-2.0', 'lgpl-2.1', 'lgpl-3.0', 'lppl-1.3c', From 5130f12df10f01e597fca147064cda3577e1ebff Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 25 Nov 2017 20:27:20 -0800 Subject: [PATCH 098/144] Update GPLv3 examples --- _licenses/gpl-3.0.txt | 2 +- spec/license_meta_spec.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index a533d7f..6011db0 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -14,9 +14,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: + - 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 - - Privacy Badger: https://github.com/EFForg/privacybadgerfirefox/blob/master/LICENSE permissions: - commercial-use diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 4420927..a3923ad 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -64,6 +64,8 @@ describe 'license meta' do example_url = example.values[0] if example_url.index('https://github.com/') == 0 example_url.gsub!(%r{\Ahttps://github.com/([\w-]+/[\w-]+)/blob/([\w-]+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2') + elsif example_url.index('https://git.savannah.gnu.org/') == 0 || example_url.index('https://git.gnome.org/') == 0 + example_url.gsub!(%r{/tree/}, '/plain/') end content = open(example_url).read detected = Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license From 1a841848b3ad25af2dc2da39083358ca7d65d116 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 25 Nov 2017 20:32:19 -0800 Subject: [PATCH 099/144] ECL-2.0 examples --- _licenses/ecl-2.0.txt | 2 +- spec/license_meta_spec.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index ccc9267..2b0be47 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -12,7 +12,7 @@ note: The Apereo Foundation recommends taking the additional step of adding a bo using: - Sakai: https://github.com/sakaiproject/sakai/blob/master/LICENSE - OAE: https://github.com/oaeproject/Hilary/blob/master/LICENSE - - Opencast: https://bitbucket.org/opencast-community/opencast/src/905077ba5e6483f8c49869a1fc13bf9268790a79/LICENSE?at=develop + - Opencast: https://bitbucket.org/opencast-community/opencast/src/905077ba5e6483f8c49869a1fc13bf9268790a79/LICENSE permissions: - commercial-use diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index a3923ad..6c6400d 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -66,6 +66,8 @@ describe 'license meta' do example_url.gsub!(%r{\Ahttps://github.com/([\w-]+/[\w-]+)/blob/([\w-]+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2') elsif example_url.index('https://git.savannah.gnu.org/') == 0 || example_url.index('https://git.gnome.org/') == 0 example_url.gsub!(%r{/tree/}, '/plain/') + elsif example_url.index('https://bitbucket.org/') == 0 + example_url.gsub!(%r{/src/}, '/raw/') end content = open(example_url).read detected = Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license From d0caabb71edd06451ddc807cf9358e33ec9e813c Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 25 Nov 2017 20:38:49 -0800 Subject: [PATCH 100/144] ISC examples --- _licenses/isc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/isc.txt b/_licenses/isc.txt index 2d8f0e1..8e34275 100644 --- a/_licenses/isc.txt +++ b/_licenses/isc.txt @@ -8,7 +8,7 @@ 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: - - documentation.js: https://github.com/documentationjs/documentation/blob/master/LICENSE + - Helix: https://github.com/tildeio/helix/blob/master/LICENSE - Node.js semver: https://github.com/npm/node-semver/blob/master/LICENSE - OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/master/LICENSE.md From 1cca51a1287f32c67d321f2d58c3ee54d225a572 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 25 Nov 2017 20:44:51 -0800 Subject: [PATCH 101/144] MIT --- _licenses/mit.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/mit.txt b/_licenses/mit.txt index 68784c8..5104ab2 100644 --- a/_licenses/mit.txt +++ b/_licenses/mit.txt @@ -10,9 +10,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: - - jQuery: https://github.com/jquery/jquery/blob/master/LICENSE.txt + - Babel: https://github.com/babel/babel/blob/master/LICENSE - .NET Core: https://github.com/dotnet/corefx/blob/master/LICENSE.TXT - - Rails: https://github.com/rails/rails/blob/master/activerecord/MIT-LICENSE + - Rails: https://github.com/rails/rails/blob/master/MIT-LICENSE permissions: - commercial-use From 2c9fa4907e318df197fbb1e9ea1802512b26f5bc Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 25 Nov 2017 20:57:24 -0800 Subject: [PATCH 102/144] don't attempt heavily templated NCSA and PostgreSQL for now --- spec/license_meta_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 6c6400d..d7896bf 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -72,6 +72,7 @@ describe 'license meta' do content = open(example_url).read detected = Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license it example_url do + skip 'NCSA and PostgreSQL licenses hard to detect' if %(ncsa postgresql).include?(license['slug']) expect(detected.key).to eq(license['slug']) end end From 8630a017f8b2a3c0d6e8e1741ceb6c655d567439 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 27 Nov 2017 12:56:25 -0800 Subject: [PATCH 103/144] @benbalter review suggestions --- spec/license_meta_spec.rb | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index d7896bf..37a123e 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -60,20 +60,27 @@ describe 'license meta' do end end + slug = license['slug'] + examples.each do |example| example_url = example.values[0] - if example_url.index('https://github.com/') == 0 - example_url.gsub!(%r{\Ahttps://github.com/([\w-]+/[\w-]+)/blob/([\w-]+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2') - elsif example_url.index('https://git.savannah.gnu.org/') == 0 || example_url.index('https://git.gnome.org/') == 0 - example_url.gsub!(%r{/tree/}, '/plain/') - elsif example_url.index('https://bitbucket.org/') == 0 - example_url.gsub!(%r{/src/}, '/raw/') - end - content = open(example_url).read - detected = Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license - it example_url do - skip 'NCSA and PostgreSQL licenses hard to detect' if %(ncsa postgresql).include?(license['slug']) - expect(detected.key).to eq(license['slug']) + + context "the #{example_url} URL" do + let(:content) { open(example_url).read } + let(:detected) { Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license } + + if example_url.start_with?('https://github.com/') + example_url.gsub!(%r{\Ahttps://github.com/([\w-]+/[\w-]+)/blob/([\w-]+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2') + elsif example_url.start_with?('https://git.savannah.gnu.org/', 'https://git.gnome.org/') + example_url.gsub!(%r{/tree/}, '/plain/') + elsif example_url.start_with?('https://bitbucket.org/') + example_url.gsub!(%r{/src/}, '/raw/') + end + + it "is a #{slug} license" do + skip 'NCSA and PostgreSQL licenses hard to detect' if %(ncsa postgresql).include?(slug) + expect(detected.key).to eq(slug) + end end end end From 6d535b774afef6f495cba61a3e1b237dfd497257 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 26 Dec 2017 13:15:29 -0800 Subject: [PATCH 104/144] NCSA "developed by" ordering "Development Group" comes before "Name of Institution", so `project` should come before `fullname` as these most closely correspond. As noted in https://github.com/spdx/license-list-XML/pull/556 --- _licenses/ncsa.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index ce26d43..93b99b7 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -32,8 +32,8 @@ University of Illinois/NCSA Open Source License Copyright (c) [year] [fullname]. All rights reserved. -Developed by: [fullname] - [project] +Developed by: [project] + [fullname] [project_url] Permission is hereby granted, free of charge, to any person From 43d7e40bc2234130161163ba049bfbdb7e46d4c6 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 29 Dec 2017 13:15:57 -0800 Subject: [PATCH 105/144] update ruby to current pages version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b42a5e..fe5828b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ script: "./script/cibuild" #environment language: ruby rvm: - - 2.4.0 + - 2.4.2 addons: apt: From 102887fbeb75fb53f49c303856cb87359405c6c1 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 29 Dec 2017 14:30:08 -0800 Subject: [PATCH 106/144] use SPDX license list 3.0 --- _licenses/bsd-2-clause.txt | 2 +- _licenses/bsd-3-clause-clear.txt | 2 +- _licenses/bsd-3-clause.txt | 2 +- spec/spec_helper.rb | 11 ++++++++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index 524d663..1bcd590 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -1,5 +1,5 @@ --- -title: BSD 2-clause "Simplified" License +title: BSD 2-Clause "Simplified" License spdx-id: BSD-2-Clause redirect_from: /licenses/bsd/ source: https://opensource.org/licenses/BSD-2-Clause diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt index 1fd8552..30b8289 100644 --- a/_licenses/bsd-3-clause-clear.txt +++ b/_licenses/bsd-3-clause-clear.txt @@ -1,5 +1,5 @@ --- -title: BSD 3-clause Clear License +title: BSD 3-Clause Clear License spdx-id: BSD-3-Clause-Clear source: https://spdx.org/licenses/BSD-3-Clause-Clear.html diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index e644905..fc804a7 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -1,5 +1,5 @@ --- -title: BSD 3-clause "New" or "Revised" License +title: BSD 3-Clause "New" or "Revised" License spdx-id: BSD-3-Clause source: https://opensource.org/licenses/BSD-3-Clause hidden: false diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4070ccf..9912e62 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -71,8 +71,13 @@ def rule?(tag, group) end def spdx_list - url = 'https://raw.githubusercontent.com/sindresorhus/spdx-license-list/master/spdx.json' - SpecHelper.spdx ||= JSON.parse(open(url).read) + SpecHelper.spdx ||= begin + url = 'https://spdx.org/licenses/licenses.json' + list = JSON.parse(open(url).read)['licenses'] + list.each_with_object({}) do |values, memo| + memo[values['licenseId']] = values + end + end end def spdx_ids @@ -86,7 +91,7 @@ end def osi_approved_licenses SpecHelper.osi_approved_licenses ||= begin licenses = {} - list = spdx_list.select { |_id, meta| meta['osiApproved'] } + list = spdx_list.select { |_id, meta| meta['isOsiApproved'] } list.each do |id, meta| licenses[id.downcase] = meta['name'] end From f2aabb80576ab12c92c5c8b802a8dea2b03e0668 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 29 Dec 2017 15:18:11 -0800 Subject: [PATCH 107/144] 2 more examples --- _licenses/epl-2.0.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_licenses/epl-2.0.txt b/_licenses/epl-2.0.txt index c4c0bda..d61bd4d 100644 --- a/_licenses/epl-2.0.txt +++ b/_licenses/epl-2.0.txt @@ -10,7 +10,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 Ditto: https://github.com/eclipse/ditto/blob/master/LICENSE - Eclipse SmartHome: https://github.com/eclipse/smarthome/blob/master/LICENSE + - SUMO: https://github.com/DLR-TS/sumo/blob/master/COPYING permissions: - commercial-use From 2459e4ff99b522850c106f74e1f990f8aaa4b057 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 30 Dec 2017 15:38:31 -0800 Subject: [PATCH 108/144] add test that this project's license detected as MIT --- spec/license_meta_spec.rb | 12 ------------ spec/self_license_spec.rb | 11 +++++++++++ spec/spec_helper.rb | 12 ++++++++++++ 3 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 spec/self_license_spec.rb diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 37a123e..df2957c 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'licensee' require 'spec_helper' describe 'license meta' do @@ -49,17 +48,6 @@ describe 'license meta' do end context 'licensee detects using examples' do - module Licensee - class License - class << self - def license_dir - dir = ::File.dirname(__FILE__) - ::File.expand_path '../_licenses', dir - end - end - end - end - slug = license['slug'] examples.each do |example| diff --git a/spec/self_license_spec.rb b/spec/self_license_spec.rb new file mode 100644 index 0000000..178c9be --- /dev/null +++ b/spec/self_license_spec.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +require 'spec_helper' + +context 'licensee detects this project' do + let(:detected) { Licensee::project('.').license } + + it "license as MIT" do + expect(detected.key).to eq('mit') + end +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9912e62..e66a9a1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,6 +2,7 @@ require 'jekyll' require 'json' +require 'licensee' require 'open-uri' require 'nokogiri' @@ -138,3 +139,14 @@ end def approved_licenses (osi_approved_licenses.keys + fsf_approved_licenses.keys + od_approved_licenses.keys).flatten.uniq.sort end + +module Licensee + class License + class << self + def license_dir + dir = ::File.dirname(__FILE__) + ::File.expand_path '../_licenses', dir + end + end + end +end From 28fa8ca52141e6d443297e0595d5434da1611dbe Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 30 Dec 2017 15:42:15 -0800 Subject: [PATCH 109/144] rename and redirect no-license to no-permission avodiing licensee false negative --- no-license.md => no-permission.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename no-license.md => no-permission.md (97%) diff --git a/no-license.md b/no-permission.md similarity index 97% rename from no-license.md rename to no-permission.md index 688f1d2..3b85c5e 100644 --- a/no-license.md +++ b/no-permission.md @@ -1,7 +1,9 @@ --- layout: default -permalink: no-license/ -redirect_from: /licenses/no-license/ +permalink: no-permission/ +redirect_from: + - /no-license/ + - /licenses/no-license/ 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." --- From c3f9bea85262509abdf07a3092b4100793081081 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 30 Dec 2017 15:46:13 -0800 Subject: [PATCH 110/144] change no-license internal links --- existing.md | 2 +- index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/existing.md b/existing.md index e6c6dc0..d4387b6 100644 --- a/existing.md +++ b/existing.md @@ -4,7 +4,7 @@ permalink: /existing/ title: Existing projects and communities --- -If you're contributing to or extending an existing project, it's almost always easiest to continue using that project's license. Look for a file called `LICENSE` or `COPYING`, or a notice in the project's `README` to find out what that license is. If you can't find a license, [ask](/no-license/#for-users). +If you're contributing to or extending an existing project, it's almost always easiest to continue using that project's license. Look for a file called `LICENSE` or `COPYING`, or a notice in the project's `README` to find out what that license is. If you can't find a license, [ask](/no-permission/#for-users). Depending on how you're building on an existing project and what its license is, using the existing project's license for your own might not just be the easiest thing to do, but a condition on which your permission to build on the existing project rests: see the "same license" condition of [some licenses](/licenses/). diff --git a/index.html b/index.html index 8f70441..a11992e 100644 --- a/index.html +++ b/index.html @@ -70,7 +70,7 @@ permalink: /

  • I don’t want to choose a license.

    - You don’t have to. + You don’t have to.

    • From a093c99d3c5b29004f21b2c1f6e5c834ac0f6c4b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 30 Dec 2017 15:48:07 -0800 Subject: [PATCH 111/144] rubocop --- spec/self_license_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/self_license_spec.rb b/spec/self_license_spec.rb index 178c9be..83fe270 100644 --- a/spec/self_license_spec.rb +++ b/spec/self_license_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' context 'licensee detects this project' do - let(:detected) { Licensee::project('.').license } + let(:detected) { Licensee.project('.').license } - it "license as MIT" do + it 'license as MIT' do expect(detected.key).to eq('mit') end end From f3988a7faa202a7e0607f4bc132450cc4231dfee Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 31 Dec 2017 10:03:56 -0800 Subject: [PATCH 112/144] SPDX license list 3.0 uses -or-later and -only over + and no modifier Reflect that in sidebar instructions for *GPL as seen e.g. at https://choosealicense.com/licenses/agpl-3.0/ --- _includes/sidebar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 9b4bacc..aef5124 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -1,7 +1,7 @@
    Copy license text to clipboard - +

    How to apply this license

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

    Optional: Add {{ page.spdx-id }}{% if xgpl %}+{% endif %}{% if xgpl %} (or {{ page.spdx-id }} 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.

    +

    Optional: 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.source %} From e630ac7f29b59ed2a73b4cab201e673556d8f66b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 2 Jan 2018 14:24:52 -0800 Subject: [PATCH 113/144] project_url field --- README.md | 1 + _data/fields.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 87c5bb6..5cf6ebf 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ The licenses on choosealicense.com are regularly imported to GitHub.com to be us * `project` - The repository name * `description` - The description of the repository * `year` - The current year +* `project_url` - The repository URL or other project website ## License properties diff --git a/_data/fields.yml b/_data/fields.yml index 0b5f45d..e239043 100644 --- a/_data/fields.yml +++ b/_data/fields.yml @@ -21,3 +21,6 @@ - name: year description: The current year + +- name: project_url + description: The repository URL or other project website From d7bf3ac98a8a0b1e52731539dd25fbe56c9ed91b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 2 Jan 2018 14:25:04 -0800 Subject: [PATCH 114/144] Revert "rm no longer relevant test" This reverts commit 5e7b07f998e9264092b8e1274f99605ead412138. --- spec/license_fields_spec.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 spec/license_fields_spec.rb diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb new file mode 100644 index 0000000..af0a177 --- /dev/null +++ b/spec/license_fields_spec.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'license fillable fields' do + licenses.each do |license| + context "The #{license['title']} license" do + it 'should only contain supported fillable fields' do + matches = license['content'][0, 1000].scan(/\[([a-z]+)\]/) + extra_fields = matches.flatten - (fields.map { |f| f['name'] }) + expect(extra_fields).to be_empty + end + end + end +end From 316bd0b828f90959475e58b423823bf1e342b27f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 2 Jan 2018 14:35:04 -0800 Subject: [PATCH 115/144] match _ fields, require preceding space (ex CECILL-2.1) --- spec/license_fields_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb index af0a177..4856f35 100644 --- a/spec/license_fields_spec.rb +++ b/spec/license_fields_spec.rb @@ -6,7 +6,7 @@ describe 'license fillable fields' do licenses.each do |license| context "The #{license['title']} license" do it 'should only contain supported fillable fields' do - matches = license['content'][0, 1000].scan(/\[([a-z]+)\]/) + matches = license['content'][1, 1000].scan(/\s+\[([a-z_]+)\]/) extra_fields = matches.flatten - (fields.map { |f| f['name'] }) expect(extra_fields).to be_empty end From 1e715f44b1b022215420e0d904b116af70d67ecb Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 2 Jan 2018 18:09:38 -0800 Subject: [PATCH 116/144] project_url -> projecturl --- README.md | 2 +- _data/fields.yml | 2 +- _licenses/ncsa.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5cf6ebf..24c54d7 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ The licenses on choosealicense.com are regularly imported to GitHub.com to be us * `project` - The repository name * `description` - The description of the repository * `year` - The current year -* `project_url` - The repository URL or other project website +* `projecturl` - The repository URL or other project website ## License properties diff --git a/_data/fields.yml b/_data/fields.yml index e239043..4e55d42 100644 --- a/_data/fields.yml +++ b/_data/fields.yml @@ -22,5 +22,5 @@ - name: year description: The current year -- name: project_url +- name: projecturl description: The repository URL or other project website diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 93b99b7..0897884 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -34,7 +34,7 @@ Copyright (c) [year] [fullname]. All rights reserved. Developed by: [project] [fullname] - [project_url] + [projecturl] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files From c51d2e956e9c6fd64b2825700d2a59bc8ac4ed5e Mon Sep 17 00:00:00 2001 From: Sheel Bedi Date: Wed, 3 Jan 2018 03:37:33 -0600 Subject: [PATCH 117/144] Update License year to 2018 --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index a08a18f..4b26f77 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2013-2017 GitHub, Inc. and contributors +Copyright (c) 2013-2018 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 af78adb4fe661781dbc7c34957949c71d0f29261 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 3 Jan 2018 11:08:38 -0800 Subject: [PATCH 118/144] spec_helper: Restore case-insensitive matching in find_spdx The previous case-insensitive matching was removed in e5f46faa (test required spdx-ids against data from spdx, 2016-05-25, #418). That commit was designed [1] to allow case-sensitive matching as discussed in [2]. But while I'm in favor of case-sensitive keys in spdx_list, the case-sensitive match breaks script/check-approval which downcases its argument since it was added in 8e56bb83 (add script/check-approval, 2016-01-18, #318). There are more notes on SPDX's plans for case sensitivity in [3], so we should see a clearer policy there soon. I'm arguing for case-sensitive *display* with optional case-insensitive matching. I am optimistic that the SPDX will at least agree not to register short IDs that only differ by case, which is all we need to make this case-insensitive match safe here. [1]: https://github.com/github/choosealicense.com/pull/418#issuecomment-221404630 [2]: https://github.com/benbalter/licensee/issues/72 [3]: https://github.com/spdx/spdx-spec/issues/63 --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e66a9a1..c8c2a52 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -86,7 +86,7 @@ def spdx_ids end def find_spdx(license) - spdx_list.find { |name, _properties| name == license } + spdx_list.find { |name, _properties| name.casecmp(license).zero? } end def osi_approved_licenses From 84a7bbbf968406403bcd57d3ebd4973ca6989cc9 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 3 Jan 2018 11:17:19 -0800 Subject: [PATCH 119/144] spec_helper: Extract FSF approval from wking.github.io/fsf-api Ideally the FSF would be maintaining the API (or any API), but until someone can talk them into that I think we can save work by collaborating on the mock API. Using a JSON API also allows us to drop the Nokogiri dependency. The parens feel excessive, and I'm not familiar with Ruby, so they might be. However, removing the parens from the libre check resulted in: $ ./script/check-approval ISC ./script/check-approval:8:in `require_relative': /.../choosealicense.com/spec/spec_helper.rb:108: syntax error, unexpected tSTRING_BEG, expecting keyword_then or ';' or '\n' (SyntaxError) ...gs') && meta['tags'].include? 'libre' ... ^ /.../choosealicense.com/spec/spec_helper.rb:116: syntax error, unexpected keyword_end, expecting end-of-input from ./script/check-approval:8:in `
    ' --- Gemfile | 1 - spec/spec_helper.rb | 23 +++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index c92472d..6677662 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,6 @@ end group :test do gem 'html-proofer', '~> 3.0' gem 'licensee' - gem 'nokogiri' gem 'rake' gem 'rspec' gem 'rubocop' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c8c2a52..2fb5fd8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,7 +4,6 @@ require 'jekyll' require 'json' require 'licensee' require 'open-uri' -require 'nokogiri' module SpecHelper class << self @@ -102,23 +101,15 @@ end def fsf_approved_licenses SpecHelper.fsf_approved_licenses ||= begin - url = 'https://www.gnu.org/licenses/license-list.en.html' - doc = Nokogiri::HTML(open(url).read) - list = doc.css('.green dt') + url = 'https://wking.github.io/fsf-api/licenses-full.json' + object = JSON.parse(open(url).read) licenses = {} - list.each do |license| - a = license.css('a').find { |link| !link.text.nil? && !link.text.empty? && link.attr('id') } - next if a.nil? - id = a.attr('id').downcase - name = a.text.strip - licenses[id] = name + object.each_value do |meta| + next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre') + meta['identifiers']['spdx'].each do |identifier| + licenses[identifier.downcase] = meta['name'] + end end - - # FSF approved the Clear BSD, but doesn't use its SPDX ID or Name - if licenses.keys.include? 'clearbsd' - licenses['bsd-3-clause-clear'] = licenses['clearbsd'] - end - licenses end end From 45369acf791426004f7f0f5da7346523fe279399 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 3 Jan 2018 10:46:57 -0800 Subject: [PATCH 120/144] check-approval: Fix missing license_ids variable Avoid: $ ./script/check-approval MIT ./script/check-approval:55:in `
    ': undefined local variable or method `license_ids' for main:Object (NameError) The license_ids line was added in e505eb8f (check if license is aleady a license, 2016-01-18, #318), but license_ids was removed from the helper in b99e7ab0 (replace 'id' variables with 'spdx_lcase' to minimize confusion, 2016-06-01, #424). This commit restores the old code locally, since this script is the only consumer. --- script/check-approval | 1 + 1 file changed, 1 insertion(+) diff --git a/script/check-approval b/script/check-approval index 6b491db..6451818 100755 --- a/script/check-approval +++ b/script/check-approval @@ -52,6 +52,7 @@ approvals.each do |approver, licenses| rows << ["#{approver} approved", licenses.include?(license)] end +license_ids = licenses.map { |l| l['id'] } current = license_ids.include?(license) rows << ['Current license', current] From 372765db8168049724df3582b6b54122114a5acb Mon Sep 17 00:00:00 2001 From: Matti Schneider Date: Thu, 4 Jan 2018 17:59:16 +1300 Subject: [PATCH 121/144] List three projects using EUPL 1.2 --- _licenses/eupl-1.2.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index d50a0b1..dd38161 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -8,6 +8,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: + - Pi-hole: https://github.com/pi-hole/pi-hole/blob/master/LICENSE + - OpenStaticAnalyzer: https://github.com/sed-inf-u-szeged/OpenStaticAnalyzer/blob/master/LICENSE + - AethysRotation: https://github.com/SimCMinMax/AethysRotation/blob/master/LICENSE permissions: - commercial-use From 4863d6e8630ac99ae4524dabe82547691a48ff28 Mon Sep 17 00:00:00 2001 From: Matti Schneider Date: Fri, 5 Jan 2018 09:44:26 +1300 Subject: [PATCH 122/144] fixup! Line wrap at 78 characters --- _licenses/eupl-1.2.txt | 258 ----------------------------------------- 1 file changed, 258 deletions(-) diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index dd38161..30188bf 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -307,261 +307,3 @@ Appendix covered Source Code from exclusive appropriation. — All other changes or additions to this Appendix require the production of a new EUPL version. - -— ‘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, 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 person. - -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: -— 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. -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. - -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. - -5. -Obligations of the Licensee - -The grant of the rights mentioned above is -subject to some restrictions and 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 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. -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. -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 reproducing the content of the copyright -notice. - -6. Chain of Authorship - -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 time You accept -the Licence, the original Licensor and subsequent Contributors grant You a -licence to their contributions to the Work, under the terms of this -Licence. - -7. Disclaimer of Warranty - -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. -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. - -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. - -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 -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. - -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. - -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. - -13. Miscellaneous - -Without prejudice of Article 9 above, the -Licence represents the complete agreement between the Parties as to the -Work. -If any provision of the Licence is invalid or unenforceable under -applicable 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. -All linguistic -versions of this Licence, approved by the European Commission, have identical -value. Parties can take advantage of the linguistic version of their -choice. - -14. Jurisdiction - -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, -— 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 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, 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. From b0239b1610c02ec577a7eb5b2385ed4f2b9bfb36 Mon Sep 17 00:00:00 2001 From: Matti Schneider Date: Fri, 5 Jan 2018 10:39:25 +1300 Subject: [PATCH 123/144] Reference projects with unmodified license text Licensee gem requires the text to not have any prefix --- _licenses/eupl-1.2.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index 30188bf..4c57892 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -8,8 +8,8 @@ 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: - - Pi-hole: https://github.com/pi-hole/pi-hole/blob/master/LICENSE - - OpenStaticAnalyzer: https://github.com/sed-inf-u-szeged/OpenStaticAnalyzer/blob/master/LICENSE + - ZoneMTA: https://github.com/zone-eu/zone-mta + - WildDuck: https://github.com/nodemailer/wildduck/blob/master/LICENSE - AethysRotation: https://github.com/SimCMinMax/AethysRotation/blob/master/LICENSE permissions: From 52a36d095ffa862d9dba46ee4c63a9ac6366e9a5 Mon Sep 17 00:00:00 2001 From: Matti Schneider Date: Fri, 5 Jan 2018 10:43:53 +1300 Subject: [PATCH 124/144] fixup! Reference projects with unmodified license text --- _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 4c57892..9e865b8 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -8,7 +8,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: - - ZoneMTA: https://github.com/zone-eu/zone-mta + - ZoneMTA: https://github.com/zone-eu/zone-mta/blob/master/LICENSE - WildDuck: https://github.com/nodemailer/wildduck/blob/master/LICENSE - AethysRotation: https://github.com/SimCMinMax/AethysRotation/blob/master/LICENSE From 570ef6d1e0d0ad649a925b1133f6f7f5022f72dc Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 4 Jan 2018 14:07:37 -0800 Subject: [PATCH 125/144] sort examples --- _licenses/eupl-1.2.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index 9e865b8..550ffe7 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -8,9 +8,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: - - ZoneMTA: https://github.com/zone-eu/zone-mta/blob/master/LICENSE - - WildDuck: https://github.com/nodemailer/wildduck/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 From 2b16dbd1e24810894dce027c3ef82dc2d17fca3f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 10 Jan 2018 17:31:01 -0800 Subject: [PATCH 126/144] Update rust package license metadata link As noted by @wking at https://github.com/github/choosealicense.com/pull/563/files#r160834170 --- _includes/sidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 9b4bacc..6ca4bbe 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -14,7 +14,7 @@ {% endif %} {% assign xgpl = false %} {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %} -

    Optional: Add {{ page.spdx-id }}{% if xgpl %}+{% endif %}{% if xgpl %} (or {{ page.spdx-id }} 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.

    +

    Optional: Add {{ page.spdx-id }}{% if xgpl %}+{% endif %}{% if xgpl %} (or {{ page.spdx-id }} 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.source %} From a03e61a993347cab3a8a7a8b78b93bca8e5d988a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 16 Feb 2018 09:09:15 +0000 Subject: [PATCH 127/144] CONTRIBUTING: note license. This is to be more explicit about the contribution process and license. --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 592b0d5..69b966d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,6 +2,8 @@ We love Pull Requests! Your contributions help make ChooseALicense.com great. +Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE.md). + 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 From adb35c0c823def75d0a10bfb6f5952fb99ca5ba8 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 14 Mar 2018 18:45:10 -0700 Subject: [PATCH 128/144] Rubocop 0.53 doesn't like kernel#open use more specific OpenURI.open_uri instead https://github.com/bbatsov/rubocop/blob/841569b305808e279a814c9823da30e8d1d0649a/manual/cops_security.md#securityopen Not sure this is really a problem for tests, but easiest to just change. --- spec/license_meta_spec.rb | 2 +- spec/spec_helper.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index df2957c..e9067a5 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -54,7 +54,7 @@ describe 'license meta' do example_url = example.values[0] context "the #{example_url} URL" do - let(:content) { open(example_url).read } + let(:content) { OpenURI.open_uri(example_url).read } let(:detected) { Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license } if example_url.start_with?('https://github.com/') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2fb5fd8..1c309b1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -73,7 +73,7 @@ end def spdx_list SpecHelper.spdx ||= begin url = 'https://spdx.org/licenses/licenses.json' - list = JSON.parse(open(url).read)['licenses'] + list = JSON.parse(OpenURI.open_uri(url).read)['licenses'] list.each_with_object({}) do |values, memo| memo[values['licenseId']] = values end @@ -102,7 +102,7 @@ end def fsf_approved_licenses SpecHelper.fsf_approved_licenses ||= begin url = 'https://wking.github.io/fsf-api/licenses-full.json' - object = JSON.parse(open(url).read) + object = JSON.parse(OpenURI.open_uri(url).read) licenses = {} object.each_value do |meta| next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre') @@ -117,7 +117,7 @@ end def od_approved_licenses SpecHelper.od_approved_licenses ||= begin url = 'http://licenses.opendefinition.org/licenses/groups/od.json' - data = open(url).read + data = OpenURI.open_uri(url).read data = JSON.parse(data) licenses = {} data.each do |id, meta| From c89376ae18e010164a63f9d8871ef818ae79cb9a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 28 Mar 2018 09:51:49 -0700 Subject: [PATCH 129/144] Remove obsolete CLA instructions Followup to #573, fixes #576 --- CONTRIBUTING.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 69b966d..3165304 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,8 +45,6 @@ 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! -You will be asked to sign the [GitHub Contributor License Agreement](https://cla.github.com/) for this project when you make your first pull request. - 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). ## Testing From 24fbf6685ddd05682f73bcea3d85477c696a56a2 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 5 Jan 2018 16:18:59 -0800 Subject: [PATCH 130/144] spec_helper: Adjust to new 'licenses' key in the FSF API The old root object has been moved under 'licenses' with wking/fsf-api@8398a357 (pull: Add JSON-LD markup, 2018-01-04, wking/fsf-api#12) for better forward/backward compatibility. Unfortunately, this results in another one-time incompatible change, which this commit accommodates. The protection from future changes (which should be rare) isn't great, because we're still parsing the document as JSON. There is at least one JSON-LD parser for Ruby [1], but I've stuck with vanilla JSON to avoid pullling in an external dependency just for this rather peripheral functionality. [1]: https://github.com/ruby-rdf/json-ld/ --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1c309b1..4275e00 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -104,7 +104,7 @@ def fsf_approved_licenses url = 'https://wking.github.io/fsf-api/licenses-full.json' object = JSON.parse(OpenURI.open_uri(url).read) licenses = {} - object.each_value do |meta| + object['licenses'].each_value do |meta| next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre') meta['identifiers']['spdx'].each do |identifier| licenses[identifier.downcase] = meta['name'] From 3ea34240f10109163b70246d6935ee68655333bd Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Tue, 10 Apr 2018 09:06:28 -0500 Subject: [PATCH 131/144] Adding the Universal Permissive License 1.0. Signed-off-by: Avi Miller --- _licenses/upl-1.0.txt | 65 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 _licenses/upl-1.0.txt diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt new file mode 100644 index 0000000..4e425ec --- /dev/null +++ b/_licenses/upl-1.0.txt @@ -0,0 +1,65 @@ +--- +title: The Universal Permissive License (UPL), Version 1.0 +spdx-id: UPL-1.0 +source: https://oss.oracle.com/licenses/upl/ +featured: true +hidden: false + +description: A permissive, OSI and FSF approved, GPL compatible license, expressly allowing attribution with just a copyright notice and a short form link rather than the full text of the license. Includes an express grant of patent rights. Licensed works and modifications may be distributed under different terms and without source code, and the patent grant may also optionally be expanded to larger works to permit use as a contributor license agreement. + +how: Insert the license or a link to it along with a copyright notice into your source file(s), and/or create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license and your copyright notice into the file. + +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: + - ODPI: https://github.com/oracle/odpi + - Souffle: https://github.com/souffle-lang/souffle + - Graal: https://github.com/oracle/graal + +permissions: + - commercial-use + - modifications + - distribution + - patent-use + - private-use + +conditions: + - include-copyright + +limitations: + - liability + - warranty + +--- + +Copyright (c) + +The Universal Permissive License (UPL), Version 1.0 + +Subject to the condition set forth below, permission is hereby granted to any person +obtaining a copy of this software, associate documentation and/or data (collectively +the "Software"), free of charge and under any and all copyright rights in the Software, +and any and all patent rights owned or freely licensable by each licensor hereunder +covering either (i) the unmodified Software as contributed to or provided by such +licensor, or (ii) the Larger 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 is contributed +by such licensors), + +without restriction, including without limitation the rights to copy, create derivative +works of, display, perform, and distribute the Software and make, use, sell, offer for +sale, import, export, have made, and have sold the Software and the Larger Work(s), +and to sublicense the foregoing rights on either these or other terms. + +This license is subject to the following condition: +The above copyright notice and either this complete permission notice or at a minimum a +reference to the UPL must be included in all copies or substantial portions of the Software. + +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. \ No newline at end of file From 119bff740ade8a6942b708c2a41c541f6fc0dd62 Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Tue, 10 Apr 2018 11:19:49 -0500 Subject: [PATCH 132/144] Updating upl-1.0.txt based on Travis failures. Fixing title attribute first to confirm I understand the failure messages. Signed-off-by: Avi Miller --- _licenses/upl-1.0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index 4e425ec..56223ea 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -1,5 +1,5 @@ --- -title: The Universal Permissive License (UPL), Version 1.0 +title: Universal Permissive License v1.0 spdx-id: UPL-1.0 source: https://oss.oracle.com/licenses/upl/ featured: true @@ -62,4 +62,4 @@ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PA 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. \ No newline at end of file +DEALINGS IN THE SOFTWARE. From da9fae28865334a47bab4fb5cb396f860b705de8 Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Tue, 10 Apr 2018 11:27:26 -0500 Subject: [PATCH 133/144] Fixed word wrap to 78 characters or less. Signed-off-by: Avi Miller --- _licenses/upl-1.0.txt | 46 +++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index 56223ea..04fc1a7 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -36,30 +36,34 @@ Copyright (c) The Universal Permissive License (UPL), Version 1.0 -Subject to the condition set forth below, permission is hereby granted to any person -obtaining a copy of this software, associate documentation and/or data (collectively -the "Software"), free of charge and under any and all copyright rights in the Software, -and any and all patent rights owned or freely licensable by each licensor hereunder -covering either (i) the unmodified Software as contributed to or provided by such -licensor, or (ii) the Larger Works (as defined below), to deal in both +Subject to the condition set forth below, permission is hereby granted to any +person obtaining a copy of this software, associate documentation and/or data +(collectively the "Software"), free of charge and under any and all copyright +rights in the Software, and any and all patent rights owned or freely +licensable by each licensor hereunder covering either (i) the unmodified +Software as contributed to or provided by such licensor, or (ii) the Larger +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 is contributed -by such licensors), +(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 +is contributed by such licensors), -without restriction, including without limitation the rights to copy, create derivative -works of, display, perform, and distribute the Software and make, use, sell, offer for -sale, import, export, have made, and have sold the Software and the Larger Work(s), -and to sublicense the foregoing rights on either these or other terms. +without restriction, including without limitation the rights to copy, create +derivative works of, display, perform, and distribute the Software and make, +use, sell, offer for sale, import, export, have made, and have sold the +Software and the Larger Work(s), and to sublicense the foregoing rights on +either these or other terms. This license is subject to the following condition: -The above copyright notice and either this complete permission notice or at a minimum a -reference to the UPL must be included in all copies or substantial portions of the Software. +The above copyright notice and either this complete permission notice or at +a minimum a reference to the UPL must be included in all copies or +substantial portions of the Software. -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. +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 4ccea129e30c24d60eaf0db7d7bbbcf6bb4b6e91 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 10 Apr 2018 10:18:43 -0700 Subject: [PATCH 134/144] use defaults --- _licenses/upl-1.0.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index 04fc1a7..753fe5b 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -2,8 +2,6 @@ title: Universal Permissive License v1.0 spdx-id: UPL-1.0 source: https://oss.oracle.com/licenses/upl/ -featured: true -hidden: false description: A permissive, OSI and FSF approved, GPL compatible license, expressly allowing attribution with just a copyright notice and a short form link rather than the full text of the license. Includes an express grant of patent rights. Licensed works and modifications may be distributed under different terms and without source code, and the patent grant may also optionally be expanded to larger works to permit use as a contributor license agreement. From 62437700ddae91786cd5154958eb107d7f825543 Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Tue, 10 Apr 2018 13:13:01 -0500 Subject: [PATCH 135/144] Updating the "using" section to list projects that are only licensed under the UPL, instead of being dual licensed. Signed-off-by: Avi Miller --- _licenses/upl-1.0.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index 04fc1a7..8fc8dc5 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -12,9 +12,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: - - ODPI: https://github.com/oracle/odpi - - Souffle: https://github.com/souffle-lang/souffle - - Graal: https://github.com/oracle/graal + - WebLogic Kubernetes Operator: https://github.com/oracle/weblogic-kubernetes-operator + - Oracle Product Images for Docker: https://github.com/oracle/docker-images + - Oracle Product Boxes for Vagrant: https://github.com/oracle/vagrant-boxes permissions: - commercial-use From 37429ccd9c6b0242206b05cb5be290bb2171ff9f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 10 Apr 2018 14:35:57 -0700 Subject: [PATCH 136/144] examples should link to LICENSE files --- _licenses/upl-1.0.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index 7e9d446..e390804 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -10,9 +10,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: - - WebLogic Kubernetes Operator: https://github.com/oracle/weblogic-kubernetes-operator - - Oracle Product Images for Docker: https://github.com/oracle/docker-images - - Oracle Product Boxes for Vagrant: https://github.com/oracle/vagrant-boxes + - WebLogic Kubernetes Operator: https://github.com/oracle/weblogic-kubernetes-operator/blob/master/LICENSE + - Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/master/LICENSE + - Oracle Product Boxes for Vagrant: https://github.com/oracle/vagrant-boxes/blob/master/LICENSE permissions: - commercial-use @@ -31,9 +31,9 @@ limitations: --- Copyright (c) - + The Universal Permissive License (UPL), Version 1.0 - + Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this software, associate documentation and/or data (collectively the "Software"), free of charge and under any and all copyright @@ -41,27 +41,27 @@ rights in the Software, and any and all patent rights owned or freely licensable by each licensor hereunder covering either (i) the unmodified Software as contributed to or provided by such licensor, or (ii) the Larger 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 is contributed by such licensors), - + without restriction, including without limitation the rights to copy, create derivative works of, display, perform, and distribute the Software and make, use, sell, offer for sale, import, export, have made, and have sold the Software and the Larger Work(s), and to sublicense the foregoing rights on either these or other terms. - + This license is subject to the following condition: The above copyright notice and either this complete permission notice or at a minimum a reference to the UPL must be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + +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. +SOFTWARE. From b4db996481de3f265b877edf6c5b6a66c3ad4391 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 12 Apr 2018 11:30:29 -0700 Subject: [PATCH 137/144] UPL-1.0 (c) line use [year] and [fullname] fields --- _licenses/upl-1.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index e390804..eab17b0 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -30,7 +30,7 @@ limitations: --- -Copyright (c) +Copyright (c) [year] [fullname] The Universal Permissive License (UPL), Version 1.0 From 326b883abac7163b2ea3e727b5309273f9dbf312 Mon Sep 17 00:00:00 2001 From: Gram Date: Wed, 18 Apr 2018 16:54:07 +0500 Subject: [PATCH 138/144] Actualize CC-BY licenses names https://creativecommons.org/licenses/by/4.0/legalcode --- _licenses/cc-by-4.0.txt | 2 +- _licenses/cc-by-sa-4.0.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index 35beda5..41b3a2b 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -1,5 +1,5 @@ --- -title: Creative Commons Attribution 4.0 +title: Creative Commons Attribution 4.0 International spdx-id: CC-BY-4.0 source: https://creativecommons.org/licenses/by/4.0/legalcode.txt diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index ec3451d..c098290 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -1,5 +1,5 @@ --- -title: Creative Commons Attribution Share Alike 4.0 +title: Creative Commons Attribution Share Alike 4.0 International spdx-id: CC-BY-SA-4.0 source: https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt From 5aa36a304d22fae0d400c40af7ac4d41d7478963 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 24 Apr 2018 16:21:39 -0700 Subject: [PATCH 139/144] update apache-2.0 examples to pass tests --- _licenses/apache-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index bcd63fa..dbb2d06 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -13,8 +13,8 @@ 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 at the very end of the license in the appendix. using: - - Elasticsearch: https://github.com/elastic/elasticsearch/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: From 278bae2316a7a1ea68f76667cf201364f5546510 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 24 Apr 2018 16:43:47 -0700 Subject: [PATCH 140/144] test handle repo name with . in it --- spec/license_meta_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index e9067a5..664cbef 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -58,7 +58,7 @@ describe 'license meta' do let(:detected) { Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license } if example_url.start_with?('https://github.com/') - example_url.gsub!(%r{\Ahttps://github.com/([\w-]+/[\w-]+)/blob/([\w-]+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2') + example_url.gsub!(%r{\Ahttps://github.com/([\w-]+/[\w\.-]+)/blob/([\w-]+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2') elsif example_url.start_with?('https://git.savannah.gnu.org/', 'https://git.gnome.org/') example_url.gsub!(%r{/tree/}, '/plain/') elsif example_url.start_with?('https://bitbucket.org/') From 9f263936b2fa01a1ed13cb0bab154c0916294c91 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 22 May 2018 13:39:44 -0700 Subject: [PATCH 141/144] http->https for misc links outside of license texts artistic-2.0 source changed because perlfoundation website timing out --- CONTRIBUTING.md | 8 ++++---- README.md | 10 +++++----- _data/meta.yml | 6 +++--- _includes/sidebar.html | 2 +- _licenses/artistic-2.0.txt | 2 +- _licenses/bsl-1.0.txt | 2 +- _licenses/eupl-1.2.txt | 4 ++-- _licenses/osl-3.0.txt | 2 +- non-software.md | 2 +- spec/license_bom_spec.rb | 2 +- spec/spec_helper.rb | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3165304..cc487c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,23 +10,23 @@ 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](http://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 -Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or , and there are several requirements for a license to be [cataloged](http://choosealicense.com/appendix/) on the site: +Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or , and there are several requirements for a license to be [cataloged](https://choosealicense.com/appendix/) on the site: 1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license). 2. The license must be listed on one of the following approved lists of licenses: * [List of OSI approved licenses](https://opensource.org/licenses/alphabetical) * [GNU's list of free licenses](https://www.gnu.org/licenses/license-list.en.html) (*note: the license must be listed in one of the three "free" categories*) - * [Open Definition's list of conformant licenses](http://opendefinition.org/licenses/) (non-code) + * [Open Definition's list of conformant licenses](https://opendefinition.org/licenses/) (non-code) 3. A [GitHub code search](https://github.com/search?q=MIT+filename%3ALICENSE&type=Code) must reveal at least *1,000* public repositories using the license 4. Identification of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that could be detected by [licensee](https://github.com/benbalter/licensee) if it knew about the license If your proposed license meets the above criteria, here's a few other things to keep in mind as you propose the license's addition: -* Is the license already cataloged? See for a list of all of the licenses known by the site. +* Is the license already cataloged? See for a list of all of the licenses known by the site. * Licenses live in the `/_licenses` folder. * The license files should be in the format of `_licenses/[lowercased-spdx-id].txt` (e.g., `_licenses/mit.txt`) * Each license has both [required and optional metadata](https://github.com/github/choosealicense.com#license-metadata) that should be included. diff --git a/README.md b/README.md index 24c54d7..4e50a86 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Like a Choose Your Own Adventure site, but only much less interesting. A lot of repositories on GitHub.com don't have a license. GitHub provides a license chooser, but if you don't know anything about licenses, how are you supposed to make an informed decision? -[ChooseALicense.com](http://www.choosealicense.com "Choose A Licence website") is designed to help people make an informed decision about licenses by demystifying license choices through non-judgmental guidance. +[ChooseALicense.com](https://www.choosealicense.com "Choose A Licence website") is designed to help people make an informed decision about licenses by demystifying license choices through non-judgmental guidance. ## Immediate Goals @@ -39,8 +39,8 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc #### Required fields -* `title` - The license full name specified by http://spdx.org/licenses/ -* `spdx-id` - Short identifier specified by http://spdx.org/licenses/ +* `title` - The license full name specified by https://spdx.org/licenses/ +* `spdx-id` - Short identifier specified by https://spdx.org/licenses/ * `source` - The URL to the license source text * `description` - A human-readable description of the license * `how` - Instructions on how to implement the license @@ -52,7 +52,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc #### Optional fields * `featured` - Whether the license should be featured on the main page (defaults to false) -* `hidden` - Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true) +* `hidden` - Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](https://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true) * `nickname` - Customary short name if applicable (e.g, GPLv3) * `note` - Additional information about the licenses * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs @@ -104,4 +104,4 @@ The license properties (rules) are stored as a bulleted list within the licenses ## License -The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](http://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](http://opensource.org/licenses/mit-license.php). +The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](https://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](https://opensource.org/licenses/mit-license.php). diff --git a/_data/meta.yml b/_data/meta.yml index 6e6de7b..a85a46a 100644 --- a/_data/meta.yml +++ b/_data/meta.yml @@ -2,11 +2,11 @@ # The available fields are: - name: title - description: The license full name specified by http://spdx.org/licenses/ + description: The license full name specified by https://spdx.org/licenses/ required: true - name: spdx-id - description: Short identifier specified by http://spdx.org/licenses/ + description: Short identifier specified by https://spdx.org/licenses/ required: true - name: source @@ -44,7 +44,7 @@ required: false - name: hidden - description: Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true) + description: Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](https://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true) required: false - name: nickname diff --git a/_includes/sidebar.html b/_includes/sidebar.html index a1218b5..42821e8 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -14,7 +14,7 @@ {% endif %} {% assign xgpl = false %} {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %} -

    Optional: 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.

    +

    Optional: 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.source %} diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt index 8b84ce1..af0f87d 100644 --- a/_licenses/artistic-2.0.txt +++ b/_licenses/artistic-2.0.txt @@ -2,7 +2,7 @@ title: Artistic License 2.0 spdx-id: Artistic-2.0 redirect_from: /licenses/artistic/ -source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt +source: https://spdx.org/licenses/Artistic-2.0.html description: Heavily favored by the Perl community, the Artistic license requires that modified versions of the software do not prevent users from running the standard version. diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt index cbc71b2..e2f16bf 100644 --- a/_licenses/bsl-1.0.txt +++ b/_licenses/bsl-1.0.txt @@ -7,7 +7,7 @@ description: A simple permissive license only requiring preservation of copyrigh 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: Boost recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the [Boost Software License FAQ](http://www.boost.org/users/license.html#FAQ). +note: Boost recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the [Boost Software License FAQ](https://www.boost.org/users/license.html#FAQ). using: diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index 550ffe7..1cb6c34 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -1,7 +1,7 @@ --- title: European Union Public License 1.2 spdx-id: EUPL-1.2 -source: http://eur-lex.europa.eu/legal-content/TXT/?uri=CELEX%3A32017D0863 +source: https://eur-lex.europa.eu/legal-content/TXT/?uri=CELEX%3A32017D0863 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. @@ -127,7 +127,7 @@ limitations thereto. The grant of the rights mentioned above is subject to some restrictions and 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 diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index d973ace..6e02d23 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -7,7 +7,7 @@ description: OSL 3.0 is a copyleft license that does not require reciprocal 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. Files licensed under OSL 3.0 must also include the notice "Licensed under the Open Software License version 3.0" adjacent to the copyright notice. -note: OSL 3.0's author has provided an explanation behind the creation of the license. +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 diff --git a/non-software.md b/non-software.md index 091fa22..ac245df 100644 --- a/non-software.md +++ b/non-software.md @@ -8,7 +8,7 @@ Open source software licenses can be used for non-software works, and often are ### Data, media, etc. -[CC0-1.0](/licenses/cc0-1.0/), [CC-BY-4.0](/licenses/cc-by-4.0/), and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are [open](http://opendefinition.org) licenses used for non-software material ranging from datasets to videos. Note that CC-BY-4.0 and CC-BY-SA-4.0 should [not be used for software](https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software). +[CC0-1.0](/licenses/cc0-1.0/), [CC-BY-4.0](/licenses/cc-by-4.0/), and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are [open](https://opendefinition.org) licenses used for non-software material ranging from datasets to videos. Note that CC-BY-4.0 and CC-BY-SA-4.0 should [not be used for software](https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software). ### Documentation diff --git a/spec/license_bom_spec.rb b/spec/license_bom_spec.rb index 0b316bd..b1c282b 100644 --- a/spec/license_bom_spec.rb +++ b/spec/license_bom_spec.rb @@ -7,7 +7,7 @@ describe 'byte order marks' do context "the #{File.basename(file, '.txt')} license" do it 'does not begin with a byte order mark' do bom = File.open(file).read.start_with?("\u0000EF\u0000BB\u0000BF") - msg = 'License file begins with a Byte Order Mark. See http://stackoverflow.com/a/1068700.' + msg = 'License file begins with a Byte Order Mark. See https://stackoverflow.com/a/1068700.' expect(bom).to eql(false), msg end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4275e00..49286b2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -116,7 +116,7 @@ end def od_approved_licenses SpecHelper.od_approved_licenses ||= begin - url = 'http://licenses.opendefinition.org/licenses/groups/od.json' + url = 'https://licenses.opendefinition.org/licenses/groups/od.json' data = OpenURI.open_uri(url).read data = JSON.parse(data) licenses = {} From a62569352811cbb365a4ec3a63c582839b95f2f4 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 14 Jun 2018 15:29:04 -0700 Subject: [PATCH 142/144] https in fsf links in licenses --- _licenses/agpl-3.0.txt | 2 +- _licenses/gpl-3.0.txt | 2 +- _licenses/lgpl-3.0.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index 8369752..d95a9bc 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -37,7 +37,7 @@ limitations: GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index 6011db0..dc709be 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -40,7 +40,7 @@ limitations: GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index f14e7f1..f3b785f 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -36,7 +36,7 @@ limitations: GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. From 71e135627c49371114751a56d335f93d03449cf2 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 14 Jun 2018 15:36:00 -0700 Subject: [PATCH 143/144] appears opencast moved to github (bitbucket license url gets login, http://www.opencast.org/software/download points to github repo) --- _licenses/ecl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index 2b0be47..447eb23 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -12,7 +12,7 @@ note: The Apereo Foundation recommends taking the additional step of adding a bo using: - Sakai: https://github.com/sakaiproject/sakai/blob/master/LICENSE - OAE: https://github.com/oaeproject/Hilary/blob/master/LICENSE - - Opencast: https://bitbucket.org/opencast-community/opencast/src/905077ba5e6483f8c49869a1fc13bf9268790a79/LICENSE + - Opencast: https://github.com/opencast/opencast/blob/develop/LICENSE permissions: - commercial-use From cb3a73de2ab02f4dc4c528b75a84f541d2dd8fd9 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 14 Jun 2018 15:44:52 -0700 Subject: [PATCH 144/144] https for www.gnu.org as well --- _licenses/agpl-3.0.txt | 4 ++-- _licenses/gpl-3.0.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index d95a9bc..56158e2 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -679,7 +679,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -694,4 +694,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -. +. diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index dc709be..995d85f 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -684,7 +684,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -703,11 +703,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. +.