From 5b224fbf9a0fc7ec19c667358546d421cceb2551 Mon Sep 17 00:00:00 2001 From: Ben Balter <ben.balter@github.com> Date: Wed, 19 Aug 2015 16:14:26 -0400 Subject: [PATCH 1/5] add clear BSD --- _includes/license-overview.html | 10 +++---- _licenses/bsd-3-clause-clear.txt | 46 ++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 _licenses/bsd-3-clause-clear.txt diff --git a/_includes/license-overview.html b/_includes/license-overview.html index 9a00d6e..32c0b9f 100644 --- a/_includes/license-overview.html +++ b/_includes/license-overview.html @@ -14,8 +14,8 @@ <!-- always show this div, even w/o variations, for proper spacing --> {% if license.tab-slug %} <ul class="nav-pills js-nav-pills"> - {% for variation in site.licenses %} - {% if variation.category and variation.category == license.category %} + {% assign variations = site.licenses | where:"hidden",false | where:"category",license.category %} + {% for variation in variations %} <li{% if license.tab-slug == variation.tab-slug %} class="active"{% endif %}><a href="#{{ variation.tab-slug }}" data-selected-tab="variation-{{ variation.tab-slug }}"> {% if variation.nickname != nil %} {{ variation.nickname }} @@ -23,13 +23,12 @@ {{ variation.title }} {% endif %} </a></li> - {% endif %} {% endfor %} </ul> {% endif %} </div> - {% for variation in site.licenses %} - {% if variation.category and variation.category == license.category %} + {% assign variations = site.licenses | where:"hidden",false | where:"category",license.category %} + {% for variation in variations %} <div {% if variation.tab-slug %}id="{{ variation.tab-slug }}" {% endif %}class="variation-tab {% if variation.tab-slug %}variation-{{ variation.tab-slug }}{% endif %} js-variation-tab{% if license.tab-slug == variation.tab-slug %} active{% endif %}"> <table class="license-rules"> <tr> @@ -59,7 +58,6 @@ </table> <p class="small"><a href="{{ variation.permalink }}">View full {{ variation.title }} license ยป</a></p> </div> - {% endif %} {% endfor %} </div> </div> diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt new file mode 100644 index 0000000..cd2975a --- /dev/null +++ b/_licenses/bsd-3-clause-clear.txt @@ -0,0 +1,46 @@ +--- +layout: license +title: BSD 3-clause Clear License +nickname: Clear BSD +category: BSD +tab-slug: bsd-3-clear +variant: true +permalink: /licenses/bsd-3-clause-clear/ +hidden: true + +description: A permissive license that comes in two variants, the <a href="/licenses/bsd">BSD 2-Clause</a> and <a href="/licenses/bsd-3-clause">BSD 3-Clause</a>. Both have very minute differences to the MIT license. The three clause variant prohibits others from using the name of the project or its contributors to promote derivative works without written consent. + +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work. + +source: https://spdx.org/licenses/BSD-3-Clause-Clear.html + +required: + - include-copyright + +permitted: + - commercial-use + - modifications + - distribution + - sublicense + - private-use + +forbidden: + - no-liability + - trademark-use + +--- + +The Clear BSD License + +Copyright (c) [year], [fullname] +All rights reserved. + +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 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 [project] 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. From d37cb1e96b6d876b1cc44efcb15639b20871ff68 Mon Sep 17 00:00:00 2001 From: Ben Balter <ben.balter@github.com> Date: Wed, 19 Aug 2015 16:19:37 -0400 Subject: [PATCH 2/5] rename ofl so tests pass --- _licenses/{ofl.txt => ofl-1.1.txt} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename _licenses/{ofl.txt => ofl-1.1.txt} (99%) diff --git a/_licenses/ofl.txt b/_licenses/ofl-1.1.txt similarity index 99% rename from _licenses/ofl.txt rename to _licenses/ofl-1.1.txt index b50db57..20ca4a8 100644 --- a/_licenses/ofl.txt +++ b/_licenses/ofl-1.1.txt @@ -72,7 +72,7 @@ new environment. "Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. -PERMISSION & CONDITIONS +PERMISSION AND CONDITIONS Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font From a6110b62e49896b49d00bbd69cd90f870378f186 Mon Sep 17 00:00:00 2001 From: Ben Balter <ben.balter@github.com> Date: Wed, 19 Aug 2015 16:19:59 -0400 Subject: [PATCH 3/5] fix ofl title --- _licenses/ofl-1.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.txt index 20ca4a8..a506c7f 100644 --- a/_licenses/ofl-1.1.txt +++ b/_licenses/ofl-1.1.txt @@ -1,6 +1,6 @@ --- layout: license -title: SIL Open Font License +title: SIL Open Font License 1.1 hidden: true permalink: /licenses/ofl/ From 18ab25149b89295bec3cc537e5df40a0f01d286b Mon Sep 17 00:00:00 2001 From: Ben Balter <ben.balter@github.com> Date: Sat, 22 Aug 2015 16:41:42 -0400 Subject: [PATCH 4/5] add bsd-3-clause-clear to whitelist --- spec/license_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/license_spec.rb b/spec/license_spec.rb index db20cde..fe4b73b 100644 --- a/spec/license_spec.rb +++ b/spec/license_spec.rb @@ -5,6 +5,7 @@ LICENSE_WHITELIST = %w[ unlicense cc0-1.0 wtfpl + bsd-3-clause-clear ] licenses.each do |license| From 38704df34cedcecb4051ca376ffd18949e8796a6 Mon Sep 17 00:00:00 2001 From: Ben Balter <ben.balter@github.com> Date: Sat, 22 Aug 2015 16:44:23 -0400 Subject: [PATCH 5/5] normalize metadata --- _licenses/bsd-3-clause-clear.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt index cd2975a..d6a3379 100644 --- a/_licenses/bsd-3-clause-clear.txt +++ b/_licenses/bsd-3-clause-clear.txt @@ -1,12 +1,11 @@ --- -layout: license title: BSD 3-clause Clear License nickname: Clear BSD +hidden: true + category: BSD tab-slug: bsd-3-clear variant: true -permalink: /licenses/bsd-3-clause-clear/ -hidden: true description: A permissive license that comes in two variants, the <a href="/licenses/bsd">BSD 2-Clause</a> and <a href="/licenses/bsd-3-clause">BSD 3-Clause</a>. Both have very minute differences to the MIT license. The three clause variant prohibits others from using the name of the project or its contributors to promote derivative works without written consent.