From 4e62d749b06e867669fe9c9b240487cfce0f2577 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 18 Nov 2019 10:21:22 -0800 Subject: [PATCH 1/5] Add include-copyright--source condition to more precisely describe bsl-1.0 and zlib --- README.md | 1 + _data/rules.yml | 3 +++ _licenses/bsl-1.0.txt | 2 +- _licenses/zlib.txt | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7b6b860..473e9b9 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,7 @@ The license properties (rules) are stored as a bulleted list within the licenses #### Conditions * `include-copyright` - A copy of the license and copyright notice must be included with the software. +* `include-copyright--source` - A copy of the license and copyright notice must be included with the software in source form, but is not required for binaries. * `document-changes` - Changes made to the code must be documented. * `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. diff --git a/_data/rules.yml b/_data/rules.yml index 3a20f10..1f315b6 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -19,6 +19,9 @@ conditions: - description: A copy of the license and copyright notice must be included with the software. label: License and copyright notice tag: include-copyright +- description: A copy of the license and copyright notice must be included with the software in source form, but is not required for binaries. + label: License and copyright notice for source + tag: include-copyright--source - description: Changes made to the code must be documented. label: State changes tag: document-changes diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt index e595a5c..ae37c9a 100644 --- a/_licenses/bsl-1.0.txt +++ b/_licenses/bsl-1.0.txt @@ -17,7 +17,7 @@ permissions: - private-use conditions: - - include-copyright + - include-copyright--source limitations: - liability diff --git a/_licenses/zlib.txt b/_licenses/zlib.txt index 0be8fd0..9ed25ed 100644 --- a/_licenses/zlib.txt +++ b/_licenses/zlib.txt @@ -15,7 +15,7 @@ permissions: - private-use conditions: - - include-copyright + - include-copyright--source - document-changes limitations: From 08ec1de7249a14cad57df0a7b268576e2c98434b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 18 Nov 2019 10:32:39 -0800 Subject: [PATCH 2/5] Add BSL-1.0 and Zlib examples --- _licenses/bsl-1.0.txt | 3 +++ _licenses/zlib.txt | 3 +++ spec/license_meta_spec.rb | 4 +--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt index ae37c9a..8da7d01 100644 --- a/_licenses/bsl-1.0.txt +++ b/_licenses/bsl-1.0.txt @@ -9,6 +9,9 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of 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: + - Boost: https://github.com/boostorg/boost/blob/master/LICENSE_1_0.txt + - Catch2: https://github.com/catchorg/Catch2/blob/master/LICENSE.txt + - DMD: https://github.com/dlang/dmd/blob/master/LICENSE.txt permissions: - commercial-use diff --git a/_licenses/zlib.txt b/_licenses/zlib.txt index 9ed25ed..706b1b5 100644 --- a/_licenses/zlib.txt +++ b/_licenses/zlib.txt @@ -7,6 +7,9 @@ description: A short permissive license, compatible with GPL. Requires altered s how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. using: + - GLFW: https://github.com/glfw/glfw/blob/master/LICENSE.md + - Portainer: https://github.com/portainer/portainer/blob/develop/LICENSE + - TinyXML-2: https://github.com/leethomason/tinyxml2/blob/master/LICENSE.txt permissions: - commercial-use diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index f5d58c6..02b7c8d 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -27,7 +27,6 @@ describe 'license meta' do 'agpl-3.0', 'artistic-2.0', 'bsd-3-clause-clear', - 'bsl-1.0', 'cc0-1.0', 'cc-by-4.0', 'cc-by-sa-4.0', @@ -38,8 +37,7 @@ describe 'license meta' do 'ms-pl', 'ms-rl', 'ofl-1.1', - 'wtfpl', - 'zlib' + 'wtfpl' ] skip 'added before 3 using examples required' if legacy.include?(license['slug']) expect(examples.length).to eq(3) From ffb3a73623724d20cf3cd1793daec2dbd11cabeb Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 26 Jun 2019 22:59:11 -0700 Subject: [PATCH 3/5] Add the BSD-4-Clause license This adds the BSD-4-clause license type. 1. SPDX Identifier: https://spdx.org/licenses/BSD-4-Clause.html 2. GNU's list of free licenses: https://www.gnu.org/licenses/license-list.en.html#OriginalBSD and FSF approved 3. Over 1000 projects: https://github.com/search?q=BSD+4-Clause+filename%3ALICENSE&type=Code 4. Yosemite Blockchain, pwolfgang/querybuilder and PMSPAUR-public use the BSD-4-clause license This is based on the previous work of: https://github.com/github/choosealicense.com/pull/511 Signed-off-by: Alistair Francis --- _licenses/bsd-4-clause.txt | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 _licenses/bsd-4-clause.txt diff --git a/_licenses/bsd-4-clause.txt b/_licenses/bsd-4-clause.txt new file mode 100644 index 0000000..c6ee0f3 --- /dev/null +++ b/_licenses/bsd-4-clause.txt @@ -0,0 +1,62 @@ +--- +title: BSD 4-Clause "Original" or "Old" License +spdx-id: BSD-4-Clause +hidden: true + +description: A permissive license similar to the BSD 3-Clause License, but with a 4th clause (known as the "advertising clause") that requires an acknowledgment of the original source in all advertising material. + +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: + - Yosemite Blockchain: https://github.com/YosemiteLabs/yosemite-public-blockchain/blob/master/LICENSE + - querybuilder: https://github.com/pwolfgang/querybuilder/blob/master/LICENSE + - PMSPAUR-public: https://github.com/ArthurGodet/PMSPAUR-public/blob/88b6d0fd172950a7e5e1cc595d180565cfaa5462/LICENSE + +permissions: + - commercial-use + - modifications + - distribution + - private-use + +conditions: + - include-copyright + +limitations: + - liability + - warranty + +--- + +BSD 4-Clause License + +Copyright (c) [year], [fullname] +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. 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. + +3. All advertising materials mentioning features or use of this software must + display the following acknowledgement: + This product includes software developed by [project]. + +4. 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. + +THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "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 COPYRIGHT HOLDER 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 e23d58b255cab0d80ae6b0f9acae2f53778e5980 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Sat, 23 Nov 2019 14:06:16 -0800 Subject: [PATCH 4/5] WIP: Bump licensee to the master branch This PR: https://github.com/licensee/licensee/pull/391 added support for detecting the BSD 4-Clause license. Bump the local licensee to use the master branch in order to correctly detect BSD 4-Clause licenses. Signed-off-by: Alistair Francis --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 6677662..afe5a46 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ end group :test do gem 'html-proofer', '~> 3.0' - gem 'licensee' + gem 'licensee', git: 'https://github.com/licensee/licensee.git', branch: 'master' gem 'rake' gem 'rspec' gem 'rubocop' From c6c26b797fe36608403cb4aa067c70a93ce4e46e Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 23 Nov 2019 14:24:42 -0800 Subject: [PATCH 5/5] Master branch for example so if use case changes tests will detect --- _licenses/bsd-4-clause.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/bsd-4-clause.txt b/_licenses/bsd-4-clause.txt index c6ee0f3..d749105 100644 --- a/_licenses/bsd-4-clause.txt +++ b/_licenses/bsd-4-clause.txt @@ -10,7 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: - Yosemite Blockchain: https://github.com/YosemiteLabs/yosemite-public-blockchain/blob/master/LICENSE - querybuilder: https://github.com/pwolfgang/querybuilder/blob/master/LICENSE - - PMSPAUR-public: https://github.com/ArthurGodet/PMSPAUR-public/blob/88b6d0fd172950a7e5e1cc595d180565cfaa5462/LICENSE + - PMSPAUR-public: https://github.com/ArthurGodet/PMSPAUR-public/blob/master/LICENSE permissions: - commercial-use