From 824a6b4d76dd4600ed4613f747c3d7f4a139d13d Mon Sep 17 00:00:00 2001 From: James Farrell Date: Tue, 28 Jan 2025 22:48:26 +0000 Subject: [PATCH] License validation tweaks for webpki. 1) Tweak ISC license Change author --> authors and eliminate a stray space. It now correctly recognizes crates/inotify/LICENSE, and the other ISC licensed crates (inotify, inotify-sys, libloading, untrusted) are still detected correctly due to fuzzy matching. 2. Find crates/webpki/third-party/chromium/LICENSE. These two changes make webpki pass license validation. Test: ./crate_tool fix-licenses inotify inotify-sys libloading untrusted webpki Change-Id: Ie7188d042c59e13006f2d28b732036c1ac7eda7f --- .../license_checker/src/license_file_finder.rs | 1 + tools/external_crates/license_checker/src/licenses/ISC.txt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/external_crates/license_checker/src/license_file_finder.rs b/tools/external_crates/license_checker/src/license_file_finder.rs index 4c6a6f11c4e..549776217a3 100644 --- a/tools/external_crates/license_checker/src/license_file_finder.rs +++ b/tools/external_crates/license_checker/src/license_file_finder.rs @@ -31,6 +31,7 @@ static LICENSE_GLOBS: &[&str] = &[ "COPYING", "license", "license.*", + "third-party/chromium/LICENSE", ]; pub(crate) fn find_license_files( diff --git a/tools/external_crates/license_checker/src/licenses/ISC.txt b/tools/external_crates/license_checker/src/licenses/ISC.txt index c6c2f5e2208..6b2b5b19d1f 100644 --- a/tools/external_crates/license_checker/src/licenses/ISC.txt +++ b/tools/external_crates/license_checker/src/licenses/ISC.txt @@ -1,10 +1,10 @@ -Permission to use, copy, modify, and /or distribute this software for +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF