Merge branch 'gh-pages' into cc0-source-text

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'

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.

_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

_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 <a href="/licenses/bsd-3-clause/">BSD 3-Clause License</a>, 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/master/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.

_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
@@ -17,7 +20,7 @@ permissions:
   - private-use
 
 conditions:
-  - include-copyright
+  - include-copyright--source
 
 limitations:
   - liability

_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
@@ -15,7 +18,7 @@ permissions:
   - private-use
 
 conditions:
-  - include-copyright
+  - include-copyright--source
   - document-changes
 
 limitations:

spec/license_meta_spec.rb

@@ -27,15 +27,13 @@ describe 'license meta' do
           'agpl-3.0',
           'artistic-2.0',
           'bsd-3-clause-clear',
-          'bsl-1.0',
           'eupl-1.1',
           'lgpl-2.1',
           'lgpl-3.0',
           'lppl-1.3c',
           'ms-pl',
           'ms-rl',
-          'wtfpl',
-          'zlib'
+          'wtfpl'
         ]
         skip 'added before 3 using examples required' if legacy.include?(license['slug'])
         expect(examples.length).to eq(3)