From 779a921a563d136f5ade5873f3a9199427ba0e7f Mon Sep 17 00:00:00 2001 From: Frieder Bluemle Date: Tue, 26 Oct 2021 11:46:28 -0700 Subject: [PATCH 1/7] Lowercase npm --- community.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community.md b/community.md index b653323..f4ea7d9 100644 --- a/community.md +++ b/community.md @@ -16,7 +16,7 @@ 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/) * [Cloud Native Computing Foundation](https://github.com/cncf/toc/blob/master/process/project_proposals.adoc) dictates [Apache License 2.0](/licenses/apache-2.0/) by default * [GNU](https://www.gnu.org/licenses/license-recommendations.html) recommends [GNU GPLv3](/licenses/gpl-3.0/) for most programs -* [NPM packages](https://libraries.io/search?platforms=NPM) overwhelmingly use the [MIT](/licenses/mit/) or the very similar [ISC](/licenses/isc) licenses +* [npm packages](https://libraries.io/search?platforms=npm) overwhelmingly use the [MIT](/licenses/mit/) or the very similar [ISC](/licenses/isc) licenses * [OpenBSD](https://www.openbsd.org/policy.html) prefers the [ISC License](/licenses/isc/) * [Rust](https://rust-lang.github.io/api-guidelines/necessities.html#crate-and-its-dependencies-have-a-permissive-license-c-permissive) crates are overwhelmingly licensed under both [MIT](/licenses/mit/) and [Apache License 2.0](/licenses/apache-2.0/) * [WordPress](https://wordpress.org/about/license/) plugins and themes must be [GNU GPLv2](/licenses/gpl-2.0/) (or later) From 96017b3035d4090de5ad8115767a7bfded2364d8 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 26 Oct 2021 12:53:24 -0700 Subject: [PATCH 2/7] Update example use URL for UPL-1.0 File was renamed. --- _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 6c53e79..e856f1b 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -9,7 +9,7 @@ how: Insert the license or a link to it along with a copyright notice into your note: It is recommended to add a link to the license and copyright notice at the top of each source file, example text can be found at https://oss.oracle.com/licenses/upl/. using: - Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/master/LICENSE + Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/main/LICENSE.txt Skater: https://github.com/oracle/Skater/blob/master/LICENSE Soufflé: https://github.com/souffle-lang/souffle/blob/master/LICENSE From 0375fbda0771fed8d1947fbb323ae28eeea309c7 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Tue, 30 Nov 2021 13:36:07 +0100 Subject: [PATCH 3/7] Fix misplaced blank line in cc-by-sa-4.0 In order to preserver consistency, the blank line should go after the enumeration item, not within. --- _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 b392785..c453889 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -335,8 +335,8 @@ apply to Your use of the Licensed Material: contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, - including for purposes of Section 3(b); and + c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. From 74912ba63d66ebe9cd71edf8cc215586d038067e Mon Sep 17 00:00:00 2001 From: Tyler887 Date: Wed, 5 Jan 2022 12:28:41 +0000 Subject: [PATCH 4/7] Update LICENSE.md --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index a295749..579d3e7 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2013-2021 GitHub, Inc. and contributors +Copyright (c) 2013-2022 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 20d853259a9412aa7a0d6f6d9bc0f098f38266d9 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 5 Jan 2022 17:50:10 -0800 Subject: [PATCH 5/7] rubocop suggestions --- script/check-approval | 2 +- spec/license_bom_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/check-approval b/script/check-approval index 5312766..4574c2d 100755 --- a/script/check-approval +++ b/script/check-approval @@ -11,7 +11,7 @@ require 'colored' require 'fuzzy_match' # Display usage instructions -puts File.open(__FILE__).read.scan(/^# .*/)[0...3].join("\n").gsub(/^# /, '') if ARGV.count != 1 +puts File.read(__FILE__).scan(/^# .*/)[0...3].join("\n").gsub(/^# /, '') if ARGV.count != 1 class TrueClass def to_s diff --git a/spec/license_bom_spec.rb b/spec/license_bom_spec.rb index b1c282b..384c604 100644 --- a/spec/license_bom_spec.rb +++ b/spec/license_bom_spec.rb @@ -6,7 +6,7 @@ describe 'byte order marks' do 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") + bom = File.read(file).start_with?("\u0000EF\u0000BB\u0000BF") msg = 'License file begins with a Byte Order Mark. See https://stackoverflow.com/a/1068700.' expect(bom).to eql(false), msg end From f1a7e33d19f52524ec122e7597ef6ef93d8645d1 Mon Sep 17 00:00:00 2001 From: Tyler887 Date: Sat, 22 Jan 2022 09:03:27 +0000 Subject: [PATCH 6/7] Remove "all rights reserved" --- _licenses/bsd-2-clause.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index 9d72d20..3c96161 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -31,7 +31,6 @@ limitations: BSD 2-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: From 164971616db63c13100a92caee010c95d5aae9b3 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 22 Jan 2022 13:49:06 -0800 Subject: [PATCH 7/7] Reflect https://github.com/spdx/license-list-XML/pull/1363/commits/44691632d2191337cf05b95d9a3d363816c4bb33 --- _licenses/bsd-3-clause.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index ab09aca..fb80171 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -30,7 +30,6 @@ limitations: BSD 3-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: