From 4c708932f94cca2eeb959851107b59c5a05f347d Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Fri, 22 Apr 2022 16:45:32 -0700 Subject: [PATCH 1/7] Update ICU and license checks --- DEPS | 2 +- tools/licenses/data/unicode | 82 ++++++++++++++++++-------------- tools/licenses/lib/licenses.dart | 15 +++++- tools/licenses/lib/main.dart | 63 +++++++++++++++++++----- tools/licenses/lib/patterns.dart | 30 ++++++------ 5 files changed, 127 insertions(+), 65 deletions(-) diff --git a/DEPS b/DEPS index f835d603ca363..7404f703eb779 100644 --- a/DEPS +++ b/DEPS @@ -160,7 +160,7 @@ deps = { # Chromium-style dependencies. 'src/third_party/icu': - Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '1fa4e3959ec6637182b7318ac1d382799454806d', + Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'f43d5654c25f3b2a202257da0906f3b7c6d2dc44', 'src/third_party/khronos': Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '7122230e90547962e0f0c627f62eeed3c701f275', diff --git a/tools/licenses/data/unicode b/tools/licenses/data/unicode index 4636e4cf4bc18..192a068a857b5 100644 --- a/tools/licenses/data/unicode +++ b/tools/licenses/data/unicode @@ -1,47 +1,55 @@ -Unicode® Terms of Use -For the general privacy policy governing access to this site, see the Unicode Privacy Policy. For trademark usage, see the Unicode® Consortium Name and Trademark Usage Policy. +Unicode® Copyright and Terms of Use +For the general privacy policy governing access to this site, see the Unicode Privacy Policy. -A. Unicode Copyright. -1. Copyright © 1991-2017 Unicode, Inc. All rights reserved. -2. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein. -3. Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files solely for informational purposes and in the creation of products supporting the Unicode Standard, subject to the Terms and Conditions herein. -4. Further specifications of rights and restrictions pertaining to the use of the particular set of data files known as the "Unicode Character Database" can be found in the License. -5. Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page. The online code charts carry specific restrictions. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use. -6. No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site. -7. Modification is not permitted with respect to this document. All copies of this document must be verbatim. -B. Restricted Rights Legend. Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement. -C. Warranties and Disclaimers. -1. This publication and/or website may include technical or typographical errors or other inaccuracies . Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time. +A. Unicode Copyright +1. Copyright © 1991-2022 Unicode, Inc. All rights reserved. +B. Definitions +Unicode Data Files ("DATA FILES") include all data files under the directories: +https://www.unicode.org/Public/ +https://www.unicode.org/reports/ +https://www.unicode.org/ivd/data/ + +Unicode Data Files do not include PDF online code charts under the directory: +https://www.unicode.org/Public/ + +Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard +or any source code or compiled code under the directories: +https://www.unicode.org/Public/PROGRAMS/ +https://www.unicode.org/Public/cldr/ +http://site.icu-project.org/download/ +C. Terms of Use +1. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein. +2. Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein. +3. Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License. +4. Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page. +5. The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart. +6. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use. +7. No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site. +8. Modification is not permitted with respect to this document. All copies of this document must be verbatim. +D. Restricted Rights Legend +1. Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement. +E.Warranties and Disclaimers +1. This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time. 2. If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase. -3. EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE. -D. Waiver of Damages. In no event shall Unicode or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives. -E. Trademarks & Logos. +3. EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE. +F. Waiver of Damages +1. In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives. +G. Trademarks & Logos 1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names. -2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. -3. All third party trademarks referenced herein are the property of their respective owners. -F. Miscellaneous. -1. Jurisdiction and Venue. This server is operated from a location in the State of California, United States of America. Unicode makes no representation that the materials are appropriate for use in other locations. If you access this server from other locations, you are responsible for compliance with local laws. This Agreement, all use of this site and any claims and damages resulting from use of this site are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this site shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum. -2. Modification by Unicode Unicode shall have the right to modify this Agreement at any time by posting it to this site. The user may not assign any part of this Agreement without Unicode’s prior written consent. +3. The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. +4. All third party trademarks referenced herein are the property of their respective owners. +H. Miscellaneous +1. Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum. +2. Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.’s prior written consent. 3. Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode’s net income. 4. Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect. -5. Entire Agreement. This Agreement constitutes the entire agreement between the parties. +5. Entire Agreement. This Agreement constitutes the entire agreement between the parties. EXHIBIT 1 UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE -Unicode Data Files include all data files under the directories -http://www.unicode.org/Public/, http://www.unicode.org/reports/, -http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and -http://www.unicode.org/utility/trac/browser/. - -Unicode Data Files do not include PDF online code charts under the -directory http://www.unicode.org/Public/. - -Software includes any source code published in the Unicode Standard -or under the directories -http://www.unicode.org/Public/, http://www.unicode.org/reports/, -http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and -http://www.unicode.org/utility/trac/browser/. +See Terms of Use +for definitions of Unicode Inc.’s Data Files and Software. NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S @@ -53,8 +61,8 @@ THE DATA FILES OR SOFTWARE. COPYRIGHT AND PERMISSION NOTICE -Copyright © 1991-2017 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in http://www.unicode.org/copyright.html. +Copyright © 1991-2022 Unicode, Inc. All rights reserved. +Distributed under the Terms of Use in https://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation diff --git a/tools/licenses/lib/licenses.dart b/tools/licenses/lib/licenses.dart index 2faabcc8ef467..d2cae9eb13cdf 100644 --- a/tools/licenses/lib/licenses.dart +++ b/tools/licenses/lib/licenses.dart @@ -307,6 +307,7 @@ abstract class License implements Comparable { body = system.File('data/mit').readAsStringSync(); type = LicenseType.mit; break; + case 'Unicode-DFS-2016': // SPDX ID case 'https://www.unicode.org/copyright.html': case 'http://www.unicode.org/copyright.html': body = system.File('data/unicode').readAsStringSync(); @@ -757,6 +758,16 @@ Iterable<_PartialLicenseMatch> _findLicenseBlocks(String body, RegExp pattern, i conditions.trim().contains('\n') || resplitCopyright.length < 70 || conditions.length > 15) { + print(''); + print('RESPLIT COPYRIGHT: $resplitCopyright'); + print('CONDITIONS: $conditions'); + print('RESPLIT COPYRIGHT CONTAINS NEWLINE? ${resplitCopyright.trim().contains('\n')}'); + print('CONDITIONS CONTAINS NEWLINE? ${conditions.trim().contains('\n')}'); + print('RESPLIT COPYRIGHT LENGTH: ${resplitCopyright.length}'); + print('CONDITIONS LENGTH: ${conditions.length}'); + print('CURRENT REGEX: $pattern'); + print('CURRENT STACK TRACE:'); + print(StackTrace.current); throw 'potential license text caught in _findLicenseBlocks copyright dragnet:\n---\n$conditions\n---\nundecorated copyrights was:\n---\n$undecoratedCopyrights\n---\ncopyrights was:\n---\n$copyrights\n---\nblock was:\n---\n${body.substring(start, match.end)}\n---'; } } @@ -870,8 +881,8 @@ License _dereferenceLicense(int groupIndex, String Function(int index) group, Mu License result = pattern.checkLocalFirst ? parentDirectory.nearestLicenseWithName(group(groupIndex)) : null; if (result == null) { String suffix = ''; - if (pattern.versionIndicies != null && pattern.versionIndicies.containsKey(groupIndex)) - suffix = ':${group(pattern.versionIndicies[groupIndex])}'; + if (pattern.versionIndices != null && pattern.versionIndices.containsKey(groupIndex)) + suffix = ':${group(pattern.versionIndices[groupIndex])}'; result = License.fromUrl('${group(groupIndex)}$suffix', origin: origin); } return result; diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index e84f0f103e5fd..0c00ddc7a9455 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -571,16 +571,22 @@ class _RepositoryIcuLicenseFile extends _RepositoryLicenseFile { final List _licenses; static final RegExp _pattern = RegExp( - r'^COPYRIGHT AND PERMISSION NOTICE \(ICU 58 and later\)\n+' - r'( *Copyright (?:.|\n)+?)\n+' // 1 + r'^UNICODE, INC\. LICENSE AGREEMENT - DATA FILES AND SOFTWARE\n+' + r'( *See Terms of Use (?:.|\n)+?)\n+' // 1 + r'-+\n' + r'\n' r'Third-Party Software Licenses\n+' r' *This section contains third-party software notices and/or additional\n' r' *terms for licensed third-party software components included within ICU\n' r' *libraries\.\n+' - r' *1\. ICU License - ICU 1.8.1 to ICU 57.1[ \n]+?' + r'-+\n' + r'\n' + r' *ICU License - ICU 1\.8\.1 to ICU 57.1[ \n]+?' r' *COPYRIGHT AND PERMISSION NOTICE\n+' - r'(Copyright (?:.|\n)+?)\n+' //2 - r' *2\. Chinese/Japanese Word Break Dictionary Data \(cjdict\.txt\)\n+' + r'(Copyright (?:.|\n)+?)\n+' // 2 + r'-+\n' + r'\n' + r'Chinese/Japanese Word Break Dictionary Data \(cjdict\.txt\)\n+' r' # The Google Chrome software developed by Google is licensed under\n?' r' # the BSD license\. Other software included in this distribution is\n?' r' # provided under other licenses, as set forth below\.\n' @@ -624,20 +630,44 @@ class _RepositoryIcuLicenseFile extends _RepositoryLicenseFile { r' #\n' r' # +---------------COPYING\.ipadic-----END----------------------------------\n' r'\n' - r' *3\. Lao Word Break Dictionary Data \(laodict\.txt\)\n' + r'-+\n' + r'\n' + r' *Lao Word Break Dictionary Data \(laodict\.txt\)\n' r'\n' r'( # +Copyright(?:.|\n)+?)\n' // 8 r'\n' - r' *4\. Burmese Word Break Dictionary Data \(burmesedict\.txt\)\n' + r'-+\n' + r'\n' + r' *Burmese Word Break Dictionary Data \(burmesedict\.txt\)\n' r'\n' r'( # +Copyright(?:.|\n)+?)\n' // 9 r'\n' - r' *5\. Time Zone Database\n' + r'-+\n' + r'\n' + r' *Time Zone Database\n' r'((?:.|\n)+)\n' // 10 r'\n' - r' *6\. Google double-conversion\n' + r'-+\n' + r'\n' + r' *Google double-conversion\n' + r'\n' + r'(Copyright(?:.|\n)+)\n' // 11 r'\n' - r'(Copyright(?:.|\n)+)\n$', // 11 + r'-+\n' + r'\n' + r' *File: aclocal\.m4 \(only for ICU4C\)\n' + r' *Section: pkg\.m4 - Macros to locate and utilise pkg-config\.\n+' + r'(Copyright (?:.|\n)+?)\n' // 12 + r'\n' + r'-+\n' + r'\n' + r' *File: config\.guess \(only for ICU4C\)\n+' + r'(This file is free software(?:.|\n)+?)\n' // 13 + r'\n' + r'-+\n' + r'\n' + r' *File: install-sh \(only for ICU4C\)\n+' + r'(Copyright(?:.|\n)+?)\n$', // 14 multiLine: true, caseSensitive: false ); @@ -645,6 +675,11 @@ class _RepositoryIcuLicenseFile extends _RepositoryLicenseFile { static final RegExp _unexpectedHash = RegExp(r'^.+ #', multiLine: true); static final RegExp _newlineHash = RegExp(r' # ?'); + static const String gplExemptionExplanation = + '(The condition for the exception is fulfilled because\n' + 'ICU4C includes a configuration script generated by Autoconf,\n' + 'namely the `configure` script.)'; + static String _dewrap(String s) { if (!s.startsWith(' # ')) return s; @@ -659,9 +694,12 @@ class _RepositoryIcuLicenseFile extends _RepositoryLicenseFile { final Match match = _pattern.firstMatch(io.readString()); if (match == null) throw 'could not parse ICU license file'; - assert(match.groupCount == 11); + assert(match.groupCount == 14); if (match.group(10).contains(copyrightMentionPattern) || match.group(11).contains('7.')) throw 'unexpected copyright in ICU license file'; + if (!match.group(12).contains(gplExemptionExplanation) || !match.group(13).contains(gplExemptionExplanation)) { + throw 'did not find GPL exemption in GPL-licensed files'; + } final List result = [ License.fromBodyAndType(_dewrap(match.group(1)), LicenseType.unknown, origin: io.fullName), License.fromBodyAndType(_dewrap(match.group(2)), LicenseType.icu, origin: io.fullName), @@ -673,6 +711,9 @@ class _RepositoryIcuLicenseFile extends _RepositoryLicenseFile { License.fromBodyAndType(_dewrap(match.group(8)), LicenseType.bsd, origin: io.fullName), License.fromBodyAndType(_dewrap(match.group(9)), LicenseType.bsd, origin: io.fullName), License.fromBodyAndType(_dewrap(match.group(11)), LicenseType.bsd, origin: io.fullName), + // Matches 12 and 13 are for the GPL3 license. However, they are covered by an exemption + // (they are exempt because ICU4C includes a configuration script generated by Autoconf) + License.fromBodyAndType(_dewrap(match.group(14)), LicenseType.mit, origin: io.fullName), ]; return result; } diff --git a/tools/licenses/lib/patterns.dart b/tools/licenses/lib/patterns.dart index beeb4a8eac714..d758986cb0b10 100644 --- a/tools/licenses/lib/patterns.dart +++ b/tools/licenses/lib/patterns.dart @@ -85,6 +85,7 @@ final List copyrightStatementPatterns = [ RegExp(r'^ *others\.?$', caseSensitive: false), RegExp(r'^for more details\.$', caseSensitive: false), RegExp(r'^ *For more info read ([^ ]+)$', caseSensitive: false), + RegExp(r'^ *For terms of use, see ([^ ]+)$', caseSensitive: false), RegExp(r'^(?:Google )?Author\(?s?\)?: .+', caseSensitive: false), RegExp(r'^Written by .+', caseSensitive: false), RegExp(r'^Originally written by .+', caseSensitive: false), @@ -628,7 +629,7 @@ class MultipleVersionedLicenseReferencePattern { this.firstPrefixIndex, this.indentPrefixIndex, this.licenseIndices, - this.versionIndicies, + this.versionIndices, this.checkLocalFirst = true, this.pattern }); @@ -637,7 +638,7 @@ class MultipleVersionedLicenseReferencePattern { final int indentPrefixIndex; final List licenseIndices; final bool checkLocalFirst; - final Map versionIndicies; + final Map versionIndices; final RegExp pattern; } @@ -663,7 +664,7 @@ final List csReferencesByUrl = [3], - versionIndicies: const { 3:4 }, + versionIndices: const { 3:4 }, checkLocalFirst: false, pattern: RegExp( kIndent + r'Licensed under the (Academic Free License) version (3\.0)', @@ -798,7 +799,7 @@ final List csReferencesByUrl = [3], - versionIndicies: const {3:4}, + versionIndices: const {3:4}, checkLocalFirst: false, pattern: RegExp( kIndent + @@ -816,7 +817,7 @@ final List csReferencesByUrl = [5, 6], - versionIndicies: const {5:3, 6:4}, + versionIndices: const {5:3, 6:4}, pattern: RegExp( kIndent + r'This file is part of the GNU ISO C\+\+ Library\. +This library is free *\n' @@ -849,7 +850,7 @@ final List csReferencesByUrl = [5, 6], - versionIndicies: const {5:3, 6:4}, + versionIndices: const {5:3, 6:4}, pattern: RegExp( kIndent + r'This file is part of the GNU ISO C\+\+ Library\. +This library is free *\n' @@ -882,7 +883,7 @@ final List csReferencesByUrl = [6, 4], - versionIndicies: const {6:3, 4:5}, + versionIndices: const {6:3, 4:5}, pattern: RegExp( kIndent + r'This file is part of the GNU ISO C\+\+ Library\. +This library is free *\n' @@ -914,7 +915,7 @@ final List csReferencesByUrl = [5, 6], - versionIndicies: const {5:3, 6:4}, + versionIndices: const {5:3, 6:4}, pattern: RegExp( kIndent + r'This file is part of GCC. *\n' @@ -948,7 +949,7 @@ final List csReferencesByUrl = [5, 6], - versionIndicies: const { 5:3, 6:4 }, + versionIndices: const { 5:3, 6:4 }, pattern: RegExp( kIndent + r'This file is part of GCC. *\n' @@ -982,7 +983,7 @@ final List csReferencesByUrl = [4], - versionIndicies: const { 4:3 }, + versionIndices: const { 4:3 }, pattern: RegExp( kIndent + r'This library is free software; you can redistribute it and/or *\n' @@ -1010,7 +1011,7 @@ final List csReferencesByUrl = [4], - versionIndicies: const { 4:3 }, + versionIndices: const { 4:3 }, pattern: RegExp( kIndent + r'Licensed under the Academic Free License version 2.0 *\n' @@ -1041,7 +1042,7 @@ final List csReferencesByUrl = [4], - versionIndicies: const { 4:3 }, + versionIndices: const { 4:3 }, pattern: RegExp( kIndent + r'This Source Code Form is subject to the terms of the Mozilla Public *\n' @@ -1058,7 +1059,7 @@ final List csReferencesByUrl = [3], // 5 is lgpl, which we're actively not selecting - versionIndicies: const { 3:4 }, // 5:6 for lgpl + versionIndices: const { 3:4 }, // 5:6 for lgpl pattern: RegExp( kIndent + r'(?:Version: [GMPL/012. ]+ *\n' @@ -1112,7 +1113,7 @@ final List csReferencesByUrl = [4], - versionIndicies: const { 4:3 }, + versionIndices: const { 4:3 }, pattern: RegExp( kIndent + r'This library is free software; you can redistribute it and/or *\n' @@ -1207,6 +1208,7 @@ final List csReferencesByUrl = Date: Fri, 22 Apr 2022 16:52:01 -0700 Subject: [PATCH 2/7] nits --- tools/licenses/lib/licenses.dart | 10 ---------- tools/licenses/lib/patterns.dart | 1 - 2 files changed, 11 deletions(-) diff --git a/tools/licenses/lib/licenses.dart b/tools/licenses/lib/licenses.dart index d2cae9eb13cdf..1d9a662d95d7c 100644 --- a/tools/licenses/lib/licenses.dart +++ b/tools/licenses/lib/licenses.dart @@ -758,16 +758,6 @@ Iterable<_PartialLicenseMatch> _findLicenseBlocks(String body, RegExp pattern, i conditions.trim().contains('\n') || resplitCopyright.length < 70 || conditions.length > 15) { - print(''); - print('RESPLIT COPYRIGHT: $resplitCopyright'); - print('CONDITIONS: $conditions'); - print('RESPLIT COPYRIGHT CONTAINS NEWLINE? ${resplitCopyright.trim().contains('\n')}'); - print('CONDITIONS CONTAINS NEWLINE? ${conditions.trim().contains('\n')}'); - print('RESPLIT COPYRIGHT LENGTH: ${resplitCopyright.length}'); - print('CONDITIONS LENGTH: ${conditions.length}'); - print('CURRENT REGEX: $pattern'); - print('CURRENT STACK TRACE:'); - print(StackTrace.current); throw 'potential license text caught in _findLicenseBlocks copyright dragnet:\n---\n$conditions\n---\nundecorated copyrights was:\n---\n$undecoratedCopyrights\n---\ncopyrights was:\n---\n$copyrights\n---\nblock was:\n---\n${body.substring(start, match.end)}\n---'; } } diff --git a/tools/licenses/lib/patterns.dart b/tools/licenses/lib/patterns.dart index d758986cb0b10..a6aa9ef78f229 100644 --- a/tools/licenses/lib/patterns.dart +++ b/tools/licenses/lib/patterns.dart @@ -1208,7 +1208,6 @@ final List csReferencesByUrl = Date: Fri, 22 Apr 2022 17:09:11 -0700 Subject: [PATCH 3/7] Update license goldens --- ci/licenses_golden/licenses_third_party | 270 ++++++++++++++++-------- ci/licenses_golden/tool_signature | 2 +- 2 files changed, 183 insertions(+), 89 deletions(-) diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 492cba48ae3a8..4b5d2718a72fd 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: e06f47cf3959bf07037eb44f5410c5e0 +Signature: beb55515d1720afc766b054b0976aae6 UNUSED LICENSES: @@ -18479,8 +18479,6 @@ ORIGIN: ../../../third_party/dart/runtime/third_party/double-conversion/COPYING TYPE: LicenseType.bsd FILE: ../../../third_party/icu/DIR_METADATA FILE: ../../../third_party/icu/android/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl_extra.dat FILE: ../../../third_party/icu/cast/brkitr.patch FILE: ../../../third_party/icu/cast/icudtl.dat FILE: ../../../third_party/icu/chromeos/icudtl.dat @@ -18509,9 +18507,8 @@ FILE: ../../../third_party/icu/patches/isvalidenum.patch FILE: ../../../third_party/icu/patches/khmer-dictbe.patch FILE: ../../../third_party/icu/patches/locale1.patch FILE: ../../../third_party/icu/patches/locale_google.patch -FILE: ../../../third_party/icu/patches/lstmbe-header.patch FILE: ../../../third_party/icu/patches/restrace.patch -FILE: ../../../third_party/icu/patches/unused-var.patch +FILE: ../../../third_party/icu/patches/unused-var-unary-operators.patch FILE: ../../../third_party/icu/patches/wordbrk.patch FILE: ../../../third_party/icu/patches/wpo.patch FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu @@ -18609,8 +18606,6 @@ ORIGIN: ../../../third_party/icu/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/icu/DIR_METADATA FILE: ../../../third_party/icu/android/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl_extra.dat FILE: ../../../third_party/icu/cast/brkitr.patch FILE: ../../../third_party/icu/cast/icudtl.dat FILE: ../../../third_party/icu/chromeos/icudtl.dat @@ -18639,9 +18634,8 @@ FILE: ../../../third_party/icu/patches/isvalidenum.patch FILE: ../../../third_party/icu/patches/khmer-dictbe.patch FILE: ../../../third_party/icu/patches/locale1.patch FILE: ../../../third_party/icu/patches/locale_google.patch -FILE: ../../../third_party/icu/patches/lstmbe-header.patch FILE: ../../../third_party/icu/patches/restrace.patch -FILE: ../../../third_party/icu/patches/unused-var.patch +FILE: ../../../third_party/icu/patches/unused-var-unary-operators.patch FILE: ../../../third_party/icu/patches/wordbrk.patch FILE: ../../../third_party/icu/patches/wpo.patch FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu @@ -18749,8 +18743,6 @@ ORIGIN: ../../../third_party/icu/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/icu/DIR_METADATA FILE: ../../../third_party/icu/android/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl_extra.dat FILE: ../../../third_party/icu/cast/brkitr.patch FILE: ../../../third_party/icu/cast/icudtl.dat FILE: ../../../third_party/icu/chromeos/icudtl.dat @@ -18779,9 +18771,8 @@ FILE: ../../../third_party/icu/patches/isvalidenum.patch FILE: ../../../third_party/icu/patches/khmer-dictbe.patch FILE: ../../../third_party/icu/patches/locale1.patch FILE: ../../../third_party/icu/patches/locale_google.patch -FILE: ../../../third_party/icu/patches/lstmbe-header.patch FILE: ../../../third_party/icu/patches/restrace.patch -FILE: ../../../third_party/icu/patches/unused-var.patch +FILE: ../../../third_party/icu/patches/unused-var-unary-operators.patch FILE: ../../../third_party/icu/patches/wordbrk.patch FILE: ../../../third_party/icu/patches/wpo.patch FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu @@ -18884,8 +18875,6 @@ ORIGIN: ../../../third_party/icu/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/icu/DIR_METADATA FILE: ../../../third_party/icu/android/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl_extra.dat FILE: ../../../third_party/icu/cast/brkitr.patch FILE: ../../../third_party/icu/cast/icudtl.dat FILE: ../../../third_party/icu/chromeos/icudtl.dat @@ -18914,9 +18903,8 @@ FILE: ../../../third_party/icu/patches/isvalidenum.patch FILE: ../../../third_party/icu/patches/khmer-dictbe.patch FILE: ../../../third_party/icu/patches/locale1.patch FILE: ../../../third_party/icu/patches/locale_google.patch -FILE: ../../../third_party/icu/patches/lstmbe-header.patch FILE: ../../../third_party/icu/patches/restrace.patch -FILE: ../../../third_party/icu/patches/unused-var.patch +FILE: ../../../third_party/icu/patches/unused-var-unary-operators.patch FILE: ../../../third_party/icu/patches/wordbrk.patch FILE: ../../../third_party/icu/patches/wpo.patch FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu @@ -19018,8 +19006,6 @@ ORIGIN: ../../../third_party/icu/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/icu/DIR_METADATA FILE: ../../../third_party/icu/android/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl_extra.dat FILE: ../../../third_party/icu/cast/brkitr.patch FILE: ../../../third_party/icu/cast/icudtl.dat FILE: ../../../third_party/icu/chromeos/icudtl.dat @@ -19048,9 +19034,8 @@ FILE: ../../../third_party/icu/patches/isvalidenum.patch FILE: ../../../third_party/icu/patches/khmer-dictbe.patch FILE: ../../../third_party/icu/patches/locale1.patch FILE: ../../../third_party/icu/patches/locale_google.patch -FILE: ../../../third_party/icu/patches/lstmbe-header.patch FILE: ../../../third_party/icu/patches/restrace.patch -FILE: ../../../third_party/icu/patches/unused-var.patch +FILE: ../../../third_party/icu/patches/unused-var-unary-operators.patch FILE: ../../../third_party/icu/patches/wordbrk.patch FILE: ../../../third_party/icu/patches/wpo.patch FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu @@ -19157,8 +19142,6 @@ ORIGIN: ../../../third_party/icu/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/icu/DIR_METADATA FILE: ../../../third_party/icu/android/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl_extra.dat FILE: ../../../third_party/icu/cast/brkitr.patch FILE: ../../../third_party/icu/cast/icudtl.dat FILE: ../../../third_party/icu/chromeos/icudtl.dat @@ -19187,9 +19170,8 @@ FILE: ../../../third_party/icu/patches/isvalidenum.patch FILE: ../../../third_party/icu/patches/khmer-dictbe.patch FILE: ../../../third_party/icu/patches/locale1.patch FILE: ../../../third_party/icu/patches/locale_google.patch -FILE: ../../../third_party/icu/patches/lstmbe-header.patch FILE: ../../../third_party/icu/patches/restrace.patch -FILE: ../../../third_party/icu/patches/unused-var.patch +FILE: ../../../third_party/icu/patches/unused-var-unary-operators.patch FILE: ../../../third_party/icu/patches/wordbrk.patch FILE: ../../../third_party/icu/patches/wpo.patch FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu @@ -19292,8 +19274,6 @@ ORIGIN: ../../../third_party/icu/LICENSE TYPE: LicenseType.icu FILE: ../../../third_party/icu/DIR_METADATA FILE: ../../../third_party/icu/android/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl_extra.dat FILE: ../../../third_party/icu/cast/brkitr.patch FILE: ../../../third_party/icu/cast/icudtl.dat FILE: ../../../third_party/icu/chromeos/icudtl.dat @@ -19322,9 +19302,8 @@ FILE: ../../../third_party/icu/patches/isvalidenum.patch FILE: ../../../third_party/icu/patches/khmer-dictbe.patch FILE: ../../../third_party/icu/patches/locale1.patch FILE: ../../../third_party/icu/patches/locale_google.patch -FILE: ../../../third_party/icu/patches/lstmbe-header.patch FILE: ../../../third_party/icu/patches/restrace.patch -FILE: ../../../third_party/icu/patches/unused-var.patch +FILE: ../../../third_party/icu/patches/unused-var-unary-operators.patch FILE: ../../../third_party/icu/patches/wordbrk.patch FILE: ../../../third_party/icu/patches/wpo.patch FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu @@ -19420,14 +19399,114 @@ All trademarks and registered trademarks mentioned herein are the property of their respective owners. ==================================================================================================== +==================================================================================================== +LIBRARY: icu +ORIGIN: ../../../third_party/icu/LICENSE +TYPE: LicenseType.mit +FILE: ../../../third_party/icu/DIR_METADATA +FILE: ../../../third_party/icu/android/icudtl.dat +FILE: ../../../third_party/icu/cast/brkitr.patch +FILE: ../../../third_party/icu/cast/icudtl.dat +FILE: ../../../third_party/icu/chromeos/icudtl.dat +FILE: ../../../third_party/icu/chromeos/icudtl.dat.hash +FILE: ../../../third_party/icu/common/icudtb.dat +FILE: ../../../third_party/icu/common/icudtl.dat +FILE: ../../../third_party/icu/flutter/brkitr.patch +FILE: ../../../third_party/icu/flutter/icudtl.dat +FILE: ../../../third_party/icu/fuzzers/fuzzer_utils.h +FILE: ../../../third_party/icu/fuzzers/icu_appendable_fuzzer.cc +FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_fuzzer.cc +FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_utf32_fuzzer.cc +FILE: ../../../third_party/icu/fuzzers/icu_number_format_fuzzer.cc +FILE: ../../../third_party/icu/fuzzers/icu_to_case_fuzzer.cc +FILE: ../../../third_party/icu/fuzzers/icu_ucasemap_fuzzer.cc +FILE: ../../../third_party/icu/ios/icudtl.dat +FILE: ../../../third_party/icu/patches/ardatepattern.patch +FILE: ../../../third_party/icu/patches/atomic_template_instantiation.patch +FILE: ../../../third_party/icu/patches/cjdict.patch +FILE: ../../../third_party/icu/patches/configure.patch +FILE: ../../../third_party/icu/patches/data_symb.patch +FILE: ../../../third_party/icu/patches/fuchsia.patch +FILE: ../../../third_party/icu/patches/gb_table.patch +FILE: ../../../third_party/icu/patches/iso2022jp.patch +FILE: ../../../third_party/icu/patches/isvalidenum.patch +FILE: ../../../third_party/icu/patches/khmer-dictbe.patch +FILE: ../../../third_party/icu/patches/locale1.patch +FILE: ../../../third_party/icu/patches/locale_google.patch +FILE: ../../../third_party/icu/patches/restrace.patch +FILE: ../../../third_party/icu/patches/unused-var-unary-operators.patch +FILE: ../../../third_party/icu/patches/wordbrk.patch +FILE: ../../../third_party/icu/patches/wpo.patch +FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu +FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan.icu +FILE: ../../../third_party/icu/source/data/in/nfc.nrm +FILE: ../../../third_party/icu/source/data/in/nfkc.nrm +FILE: ../../../third_party/icu/source/data/in/nfkc_cf.nrm +FILE: ../../../third_party/icu/source/data/in/pnames.icu +FILE: ../../../third_party/icu/source/data/in/ubidi.icu +FILE: ../../../third_party/icu/source/data/in/ucase.icu +FILE: ../../../third_party/icu/source/data/in/uemoji.icu +FILE: ../../../third_party/icu/source/data/in/ulayout.icu +FILE: ../../../third_party/icu/source/data/in/unames.icu +FILE: ../../../third_party/icu/source/data/in/uprops.icu +FILE: ../../../third_party/icu/source/data/in/uts46.nrm +FILE: ../../../third_party/icu/source/data/mappings/big5-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/euc-jp-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/euc-kr-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/gb18030.ucm +FILE: ../../../third_party/icu/source/data/mappings/ibm866-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/iso-8859-10-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/iso-8859-13-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/iso-8859-14-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/iso-8859-15-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/iso-8859-16-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/iso-8859-2-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/iso-8859-3-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/iso-8859-4-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/iso-8859-5-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/iso-8859-6-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/iso-8859-7-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/iso-8859-8-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/koi8-r-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/koi8-u-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/macintosh-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/shift_jis-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/windows-1250-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/windows-1251-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/windows-1252-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/windows-1253-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/windows-1254-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/windows-1255-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/windows-1256-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/windows-1257-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/windows-1258-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/windows-874-html.ucm +FILE: ../../../third_party/icu/source/data/mappings/windows-936-2000.ucm +FILE: ../../../third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm +FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsp +FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsw +FILE: ../../../third_party/icu/source/tools/tzcode/asctime.c +FILE: ../../../third_party/icu/source/tools/tzcode/ialloc.c +FILE: ../../../third_party/icu/source/tools/tzcode/localtime.c +FILE: ../../../third_party/icu/source/tools/tzcode/private.h +FILE: ../../../third_party/icu/source/tools/tzcode/scheck.c +FILE: ../../../third_party/icu/source/tools/tzcode/tzfile.h +FILE: ../../../third_party/icu/source/tools/tzcode/tzselect.ksh +FILE: ../../../third_party/icu/source/tools/tzcode/zdump.c +FILE: ../../../third_party/icu/source/tools/tzcode/zic.c +FILE: ../../../third_party/icu/tzres/metaZones.res +FILE: ../../../third_party/icu/tzres/timezoneTypes.res +FILE: ../../../third_party/icu/tzres/zoneinfo64.res +---------------------------------------------------------------------------------------------------- +Copyright 1991 by the Massachusetts Institute of Technology +==================================================================================================== + ==================================================================================================== LIBRARY: icu ORIGIN: ../../../third_party/icu/LICENSE TYPE: LicenseType.unknown FILE: ../../../third_party/icu/DIR_METADATA FILE: ../../../third_party/icu/android/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl_extra.dat FILE: ../../../third_party/icu/cast/brkitr.patch FILE: ../../../third_party/icu/cast/icudtl.dat FILE: ../../../third_party/icu/chromeos/icudtl.dat @@ -19456,9 +19535,8 @@ FILE: ../../../third_party/icu/patches/isvalidenum.patch FILE: ../../../third_party/icu/patches/khmer-dictbe.patch FILE: ../../../third_party/icu/patches/locale1.patch FILE: ../../../third_party/icu/patches/locale_google.patch -FILE: ../../../third_party/icu/patches/lstmbe-header.patch FILE: ../../../third_party/icu/patches/restrace.patch -FILE: ../../../third_party/icu/patches/unused-var.patch +FILE: ../../../third_party/icu/patches/unused-var-unary-operators.patch FILE: ../../../third_party/icu/patches/wordbrk.patch FILE: ../../../third_party/icu/patches/wpo.patch FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu @@ -19533,8 +19611,6 @@ ORIGIN: ../../../third_party/icu/LICENSE TYPE: LicenseType.unknown FILE: ../../../third_party/icu/DIR_METADATA FILE: ../../../third_party/icu/android/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl_extra.dat FILE: ../../../third_party/icu/cast/brkitr.patch FILE: ../../../third_party/icu/cast/icudtl.dat FILE: ../../../third_party/icu/chromeos/icudtl.dat @@ -19563,9 +19639,8 @@ FILE: ../../../third_party/icu/patches/isvalidenum.patch FILE: ../../../third_party/icu/patches/khmer-dictbe.patch FILE: ../../../third_party/icu/patches/locale1.patch FILE: ../../../third_party/icu/patches/locale_google.patch -FILE: ../../../third_party/icu/patches/lstmbe-header.patch FILE: ../../../third_party/icu/patches/restrace.patch -FILE: ../../../third_party/icu/patches/unused-var.patch +FILE: ../../../third_party/icu/patches/unused-var-unary-operators.patch FILE: ../../../third_party/icu/patches/wordbrk.patch FILE: ../../../third_party/icu/patches/wpo.patch FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu @@ -19707,8 +19782,6 @@ ORIGIN: ../../../third_party/icu/LICENSE TYPE: LicenseType.unknown FILE: ../../../third_party/icu/DIR_METADATA FILE: ../../../third_party/icu/android/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl.dat -FILE: ../../../third_party/icu/android_small/icudtl_extra.dat FILE: ../../../third_party/icu/cast/brkitr.patch FILE: ../../../third_party/icu/cast/icudtl.dat FILE: ../../../third_party/icu/chromeos/icudtl.dat @@ -19737,9 +19810,8 @@ FILE: ../../../third_party/icu/patches/isvalidenum.patch FILE: ../../../third_party/icu/patches/khmer-dictbe.patch FILE: ../../../third_party/icu/patches/locale1.patch FILE: ../../../third_party/icu/patches/locale_google.patch -FILE: ../../../third_party/icu/patches/lstmbe-header.patch FILE: ../../../third_party/icu/patches/restrace.patch -FILE: ../../../third_party/icu/patches/unused-var.patch +FILE: ../../../third_party/icu/patches/unused-var-unary-operators.patch FILE: ../../../third_party/icu/patches/wordbrk.patch FILE: ../../../third_party/icu/patches/wpo.patch FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu @@ -19803,7 +19875,20 @@ FILE: ../../../third_party/icu/tzres/metaZones.res FILE: ../../../third_party/icu/tzres/timezoneTypes.res FILE: ../../../third_party/icu/tzres/zoneinfo64.res ---------------------------------------------------------------------------------------------------- -Copyright © 1991-2020 Unicode, Inc. All rights reserved. +See Terms of Use +for definitions of Unicode Inc.’s Data Files and Software. + +NOTICE TO USER: Carefully read the following legal agreement. +BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S +DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), +YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. +IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE +THE DATA FILES OR SOFTWARE. + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 1991-2022 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in https://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining @@ -19841,8 +19926,6 @@ LIBRARY: icu ORIGIN: ../../../third_party/icu/filters/android.json + ../../../third_party/dart/runtime/third_party/double-conversion/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/icu/filters/android.json -FILE: ../../../third_party/icu/filters/android_extra.json -FILE: ../../../third_party/icu/filters/android_small.json FILE: ../../../third_party/icu/filters/cast.json FILE: ../../../third_party/icu/filters/chromeos.json FILE: ../../../third_party/icu/filters/common.json @@ -19959,7 +20042,7 @@ ORIGIN: ../../../third_party/icu/source/common/unicode/appendable.h TYPE: LicenseType.icu FILE: ../../../third_party/icu/APIChangeReport.html FILE: ../../../third_party/icu/source/Doxyfile.in -FILE: ../../../third_party/icu/source/common/BUILD.unused +FILE: ../../../third_party/icu/source/common/BUILD.bazel FILE: ../../../third_party/icu/source/common/appendable.cpp FILE: ../../../third_party/icu/source/common/bmpset.cpp FILE: ../../../third_party/icu/source/common/bmpset.h @@ -20414,6 +20497,8 @@ FILE: ../../../third_party/icu/source/data/dtd/cldr-35.1/common/dtd/ldml.dtd FILE: ../../../third_party/icu/source/data/dtd/cldr-35.1/common/dtd/ldmlICU.dtd FILE: ../../../third_party/icu/source/data/dtd/cldr-40/common/dtd/ldml.dtd FILE: ../../../third_party/icu/source/data/dtd/cldr-40/common/dtd/ldmlICU.dtd +FILE: ../../../third_party/icu/source/data/dtd/cldr/common/dtd/ldml.dtd +FILE: ../../../third_party/icu/source/data/dtd/cldr/common/dtd/ldmlICU.dtd FILE: ../../../third_party/icu/source/data/icupkg.inc.in FILE: ../../../third_party/icu/source/data/lang/LOCALE_DEPS.json FILE: ../../../third_party/icu/source/data/locales/LOCALE_DEPS.json @@ -20609,7 +20694,7 @@ FILE: ../../../third_party/icu/source/data/mappings/windows-950-2000.ucm FILE: ../../../third_party/icu/source/data/misc/icudata.rc FILE: ../../../third_party/icu/source/data/rbnf/LOCALE_DEPS.json FILE: ../../../third_party/icu/source/data/region/LOCALE_DEPS.json -FILE: ../../../third_party/icu/source/data/unidata/norm2/BUILD.unused +FILE: ../../../third_party/icu/source/data/unidata/norm2/BUILD.bazel FILE: ../../../third_party/icu/source/data/unit/LOCALE_DEPS.json FILE: ../../../third_party/icu/source/data/zone/LOCALE_DEPS.json FILE: ../../../third_party/icu/source/extra/scrptrun/scrptrun.cpp @@ -20621,7 +20706,7 @@ FILE: ../../../third_party/icu/source/extra/uconv/uconv.1.in FILE: ../../../third_party/icu/source/extra/uconv/uconv.cpp FILE: ../../../third_party/icu/source/extra/uconv/unicode/uwmsg.h FILE: ../../../third_party/icu/source/extra/uconv/uwmsg.c -FILE: ../../../third_party/icu/source/i18n/BUILD.unused +FILE: ../../../third_party/icu/source/i18n/BUILD.bazel FILE: ../../../third_party/icu/source/i18n/alphaindex.cpp FILE: ../../../third_party/icu/source/i18n/anytrans.cpp FILE: ../../../third_party/icu/source/i18n/anytrans.h @@ -21070,6 +21155,7 @@ FILE: ../../../third_party/icu/source/i18n/unicode/ulistformatter.h FILE: ../../../third_party/icu/source/i18n/unicode/ulocdata.h FILE: ../../../third_party/icu/source/i18n/unicode/umsg.h FILE: ../../../third_party/icu/source/i18n/unicode/unirepl.h +FILE: ../../../third_party/icu/source/i18n/unicode/unounclass.h FILE: ../../../third_party/icu/source/i18n/unicode/unum.h FILE: ../../../third_party/icu/source/i18n/unicode/unumberformatter.h FILE: ../../../third_party/icu/source/i18n/unicode/unumberrangeformatter.h @@ -21149,7 +21235,7 @@ FILE: ../../../third_party/icu/source/io/uscanf_p.cpp FILE: ../../../third_party/icu/source/io/ustdio.cpp FILE: ../../../third_party/icu/source/io/ustream.cpp FILE: ../../../third_party/icu/source/python/icutools/databuilder/filtration_schema.json -FILE: ../../../third_party/icu/source/stubdata/BUILD.unused +FILE: ../../../third_party/icu/source/stubdata/BUILD.bazel FILE: ../../../third_party/icu/source/stubdata/stubdata.cpp FILE: ../../../third_party/icu/source/tools/ctestfw/ctest.c FILE: ../../../third_party/icu/source/tools/ctestfw/datamap.cpp @@ -21185,7 +21271,7 @@ FILE: ../../../third_party/icu/source/tools/gencolusb/extract_unsafe_backwards.c FILE: ../../../third_party/icu/source/tools/gencolusb/verify_uset.cpp FILE: ../../../third_party/icu/source/tools/gendict/gendict.1.in FILE: ../../../third_party/icu/source/tools/gendict/gendict.cpp -FILE: ../../../third_party/icu/source/tools/gennorm2/BUILD.unused +FILE: ../../../third_party/icu/source/tools/gennorm2/BUILD.bazel FILE: ../../../third_party/icu/source/tools/gennorm2/extradata.cpp FILE: ../../../third_party/icu/source/tools/gennorm2/extradata.h FILE: ../../../third_party/icu/source/tools/gennorm2/gennorm2.cpp @@ -21243,7 +21329,7 @@ FILE: ../../../third_party/icu/source/tools/pkgdata/pkgdata.1.in FILE: ../../../third_party/icu/source/tools/pkgdata/pkgdata.cpp FILE: ../../../third_party/icu/source/tools/pkgdata/pkgtypes.c FILE: ../../../third_party/icu/source/tools/pkgdata/pkgtypes.h -FILE: ../../../third_party/icu/source/tools/toolutil/BUILD.unused +FILE: ../../../third_party/icu/source/tools/toolutil/BUILD.bazel FILE: ../../../third_party/icu/source/tools/toolutil/collationinfo.cpp FILE: ../../../third_party/icu/source/tools/toolutil/collationinfo.h FILE: ../../../third_party/icu/source/tools/toolutil/dbgutil.cpp @@ -21296,30 +21382,49 @@ FILE: ../../../third_party/icu/source/tools/tzcode/icuzones FILE: ../../../third_party/icu/source/tools/tzcode/tz2icu.cpp FILE: ../../../third_party/icu/source/tools/tzcode/tz2icu.h ---------------------------------------------------------------------------------------------------- -Unicode® Terms of Use -For the general privacy policy governing access to this site, see the Unicode Privacy Policy. For trademark usage, see the Unicode® Consortium Name and Trademark Usage Policy. - -A. Unicode Copyright. -1. Copyright © 1991-2017 Unicode, Inc. All rights reserved. -2. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein. -3. Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files solely for informational purposes and in the creation of products supporting the Unicode Standard, subject to the Terms and Conditions herein. -4. Further specifications of rights and restrictions pertaining to the use of the particular set of data files known as the "Unicode Character Database" can be found in the License. -5. Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page. The online code charts carry specific restrictions. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use. -6. No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site. -7. Modification is not permitted with respect to this document. All copies of this document must be verbatim. -B. Restricted Rights Legend. Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement. -C. Warranties and Disclaimers. -1. This publication and/or website may include technical or typographical errors or other inaccuracies . Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time. +Unicode® Copyright and Terms of Use +For the general privacy policy governing access to this site, see the Unicode Privacy Policy. + +A. Unicode Copyright +1. Copyright © 1991-2022 Unicode, Inc. All rights reserved. +B. Definitions +Unicode Data Files ("DATA FILES") include all data files under the directories: +https://www.unicode.org/Public +https://www.unicode.org/reports +https://www.unicode.org/ivd/data + +Unicode Data Files do not include PDF online code charts under the directory: +https://www.unicode.org/Public + +Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard +or any source code or compiled code under the directories: +https://www.unicode.org/Public/PROGRAMS +https://www.unicode.org/Public/cldr +http://site.icu-project.org/download +C. Terms of Use +1. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein. +2. Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein. +3. Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License. +4. Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page. +5. The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart. +6. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use. +7. No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site. +8. Modification is not permitted with respect to this document. All copies of this document must be verbatim. +D. Restricted Rights Legend +1. Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement. +E.Warranties and Disclaimers +1. This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time. 2. If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase. -3. EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE. -D. Waiver of Damages. In no event shall Unicode or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives. -E. Trademarks & Logos. +3. EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE. +F. Waiver of Damages +1. In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives. +G. Trademarks & Logos 1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names. -2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. -3. All third party trademarks referenced herein are the property of their respective owners. -F. Miscellaneous. -1. Jurisdiction and Venue. This server is operated from a location in the State of California, United States of America. Unicode makes no representation that the materials are appropriate for use in other locations. If you access this server from other locations, you are responsible for compliance with local laws. This Agreement, all use of this site and any claims and damages resulting from use of this site are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this site shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum. -2. Modification by Unicode Unicode shall have the right to modify this Agreement at any time by posting it to this site. The user may not assign any part of this Agreement without Unicode’s prior written consent. +3. The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. +4. All third party trademarks referenced herein are the property of their respective owners. +H. Miscellaneous +1. Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum. +2. Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.’s prior written consent. 3. Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode’s net income. 4. Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect. 5. Entire Agreement. This Agreement constitutes the entire agreement between the parties. @@ -21327,19 +21432,8 @@ F. Miscellaneous. EXHIBIT 1 UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE -Unicode Data Files include all data files under the directories -http://www.unicode.org/Public/, http://www.unicode.org/reports/, -http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and -http://www.unicode.org/utility/trac/browser/. - -Unicode Data Files do not include PDF online code charts under the -directory http://www.unicode.org/Public/. - -Software includes any source code published in the Unicode Standard -or under the directories -http://www.unicode.org/Public/, http://www.unicode.org/reports/, -http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and -http://www.unicode.org/utility/trac/browser/. +See Terms of Use +for definitions of Unicode Inc.’s Data Files and Software. NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S @@ -21351,8 +21445,8 @@ THE DATA FILES OR SOFTWARE. COPYRIGHT AND PERMISSION NOTICE -Copyright © 1991-2017 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in http://www.unicode.org/copyright.html. +Copyright © 1991-2022 Unicode, Inc. All rights reserved. +Distributed under the Terms of Use in https://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation @@ -26253,4 +26347,4 @@ freely, subject to the following restrictions: misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. ==================================================================================================== -Total license count: 410 +Total license count: 411 diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 4fc620e641ef2..f45a524f5c435 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: ab4ac2e953b109e0283c3f939ddae746 +Signature: 256f0befb69482d8f762ca1e73269330 From 219dde47e6b7dc2d0dfff4189a1566a570df7a91 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Fri, 22 Apr 2022 17:15:16 -0700 Subject: [PATCH 4/7] rename --- tools/licenses/lib/main.dart | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index 0c00ddc7a9455..eae70e701bd2e 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -675,7 +675,15 @@ class _RepositoryIcuLicenseFile extends _RepositoryLicenseFile { static final RegExp _unexpectedHash = RegExp(r'^.+ #', multiLine: true); static final RegExp _newlineHash = RegExp(r' # ?'); - static const String gplExemptionExplanation = + static const String gplExceptionExplanation = + 'As a special exception to the GNU General Public License, if you\n' + 'distribute this file as part of a program that contains a\n' + 'configuration script generated by Autoconf, you may include it under\n' + 'the same distribution terms that you use for the rest of that\n' + 'program. This Exception is an additional permission under section 7\n' + 'of the GNU General Public License, version 3 ("GPLv3").\n' + '\n' + '\n' '(The condition for the exception is fulfilled because\n' 'ICU4C includes a configuration script generated by Autoconf,\n' 'namely the `configure` script.)'; @@ -697,8 +705,8 @@ class _RepositoryIcuLicenseFile extends _RepositoryLicenseFile { assert(match.groupCount == 14); if (match.group(10).contains(copyrightMentionPattern) || match.group(11).contains('7.')) throw 'unexpected copyright in ICU license file'; - if (!match.group(12).contains(gplExemptionExplanation) || !match.group(13).contains(gplExemptionExplanation)) { - throw 'did not find GPL exemption in GPL-licensed files'; + if (!match.group(12).contains(gplExceptionExplanation) || !match.group(13).contains(gplExceptionExplanation)) { + throw 'did not find GPL exception in GPL-licensed files'; } final List result = [ License.fromBodyAndType(_dewrap(match.group(1)), LicenseType.unknown, origin: io.fullName), From 94992e2068398ee8f8618f84a986edd4973e09ab Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Tue, 26 Apr 2022 10:10:43 -0700 Subject: [PATCH 5/7] Fix license check --- ci/licenses_golden/tool_signature | 2 +- tools/licenses/lib/main.dart | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index f45a524f5c435..0190f9166d353 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 256f0befb69482d8f762ca1e73269330 +Signature: bd52981f9557cf89c46615a2b4c0dfc7 diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index eae70e701bd2e..6a8fffc94d196 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -675,7 +675,19 @@ class _RepositoryIcuLicenseFile extends _RepositoryLicenseFile { static final RegExp _unexpectedHash = RegExp(r'^.+ #', multiLine: true); static final RegExp _newlineHash = RegExp(r' # ?'); - static const String gplExceptionExplanation = + static const String gplExceptionExplanation1 = + 'As a special exception to the GNU General Public License, if you\n' + 'distribute this file as part of a program that contains a\n' + 'configuration script generated by Autoconf, you may include it under\n' + 'the same distribution terms that you use for the rest of that\n' + 'program.\n' + '\n' + '\n' + '(The condition for the exception is fulfilled because\n' + 'ICU4C includes a configuration script generated by Autoconf,\n' + 'namely the `configure` script.)'; + + static const String gplExceptionExplanation2 = 'As a special exception to the GNU General Public License, if you\n' 'distribute this file as part of a program that contains a\n' 'configuration script generated by Autoconf, you may include it under\n' @@ -705,7 +717,7 @@ class _RepositoryIcuLicenseFile extends _RepositoryLicenseFile { assert(match.groupCount == 14); if (match.group(10).contains(copyrightMentionPattern) || match.group(11).contains('7.')) throw 'unexpected copyright in ICU license file'; - if (!match.group(12).contains(gplExceptionExplanation) || !match.group(13).contains(gplExceptionExplanation)) { + if (!match.group(12).contains(gplExceptionExplanation1) || !match.group(13).contains(gplExceptionExplanation2)) { throw 'did not find GPL exception in GPL-licensed files'; } final List result = [ From f6f53eb999bc5d6940b29235e6b4ecae9b75304f Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Tue, 26 Apr 2022 11:51:09 -0700 Subject: [PATCH 6/7] Update licenses --- ci/licenses_golden/licenses_third_party | 2 +- sky/packages/sky_engine/LICENSE | 101 +++++++++++++++--------- 2 files changed, 64 insertions(+), 39 deletions(-) diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 372c018c79048..0f6f1734aff67 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 29416bd2bd961da5142413096bcf8c2a +Signature: 10303d9ae0e6cfa4a91378cdda7ed55a UNUSED LICENSES: diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 4223982037d93..fb6e9f2b5c654 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -10466,6 +10466,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- icu +Copyright 1991 by the Massachusetts Institute of Technology +-------------------------------------------------------------------------------- +icu + Copyright 1996 Chih-Hao Tsai @ Beckman Institute, University of Illinois c-tsai4@uiuc.edu http://casper.beckman.uiuc.edu/~c-tsai4 @@ -10604,7 +10608,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- icu -Copyright © 1991-2020 Unicode, Inc. All rights reserved. +See Terms of Use +for definitions of Unicode Inc.’s Data Files and Software. + +NOTICE TO USER: Carefully read the following legal agreement. +BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S +DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), +YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. +IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE +THE DATA FILES OR SOFTWARE. + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 1991-2022 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in https://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining @@ -10672,30 +10689,49 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- icu -Unicode® Terms of Use -For the general privacy policy governing access to this site, see the Unicode Privacy Policy. For trademark usage, see the Unicode® Consortium Name and Trademark Usage Policy. - -A. Unicode Copyright. -1. Copyright © 1991-2017 Unicode, Inc. All rights reserved. -2. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein. -3. Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files solely for informational purposes and in the creation of products supporting the Unicode Standard, subject to the Terms and Conditions herein. -4. Further specifications of rights and restrictions pertaining to the use of the particular set of data files known as the "Unicode Character Database" can be found in the License. -5. Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page. The online code charts carry specific restrictions. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use. -6. No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site. -7. Modification is not permitted with respect to this document. All copies of this document must be verbatim. -B. Restricted Rights Legend. Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement. -C. Warranties and Disclaimers. -1. This publication and/or website may include technical or typographical errors or other inaccuracies . Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time. +Unicode® Copyright and Terms of Use +For the general privacy policy governing access to this site, see the Unicode Privacy Policy. + +A. Unicode Copyright +1. Copyright © 1991-2022 Unicode, Inc. All rights reserved. +B. Definitions +Unicode Data Files ("DATA FILES") include all data files under the directories: +https://www.unicode.org/Public +https://www.unicode.org/reports +https://www.unicode.org/ivd/data + +Unicode Data Files do not include PDF online code charts under the directory: +https://www.unicode.org/Public + +Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard +or any source code or compiled code under the directories: +https://www.unicode.org/Public/PROGRAMS +https://www.unicode.org/Public/cldr +http://site.icu-project.org/download +C. Terms of Use +1. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein. +2. Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein. +3. Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License. +4. Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page. +5. The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart. +6. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use. +7. No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site. +8. Modification is not permitted with respect to this document. All copies of this document must be verbatim. +D. Restricted Rights Legend +1. Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement. +E.Warranties and Disclaimers +1. This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time. 2. If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase. -3. EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE. -D. Waiver of Damages. In no event shall Unicode or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives. -E. Trademarks & Logos. +3. EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE. +F. Waiver of Damages +1. In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives. +G. Trademarks & Logos 1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names. -2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. -3. All third party trademarks referenced herein are the property of their respective owners. -F. Miscellaneous. -1. Jurisdiction and Venue. This server is operated from a location in the State of California, United States of America. Unicode makes no representation that the materials are appropriate for use in other locations. If you access this server from other locations, you are responsible for compliance with local laws. This Agreement, all use of this site and any claims and damages resulting from use of this site are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this site shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum. -2. Modification by Unicode Unicode shall have the right to modify this Agreement at any time by posting it to this site. The user may not assign any part of this Agreement without Unicode’s prior written consent. +3. The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. +4. All third party trademarks referenced herein are the property of their respective owners. +H. Miscellaneous +1. Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum. +2. Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.’s prior written consent. 3. Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode’s net income. 4. Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect. 5. Entire Agreement. This Agreement constitutes the entire agreement between the parties. @@ -10703,19 +10739,8 @@ F. Miscellaneous. EXHIBIT 1 UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE -Unicode Data Files include all data files under the directories -http://www.unicode.org/Public/, http://www.unicode.org/reports/, -http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and -http://www.unicode.org/utility/trac/browser/. - -Unicode Data Files do not include PDF online code charts under the -directory http://www.unicode.org/Public/. - -Software includes any source code published in the Unicode Standard -or under the directories -http://www.unicode.org/Public/, http://www.unicode.org/reports/, -http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and -http://www.unicode.org/utility/trac/browser/. +See Terms of Use +for definitions of Unicode Inc.’s Data Files and Software. NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S @@ -10727,8 +10752,8 @@ THE DATA FILES OR SOFTWARE. COPYRIGHT AND PERMISSION NOTICE -Copyright © 1991-2017 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in http://www.unicode.org/copyright.html. +Copyright © 1991-2022 Unicode, Inc. All rights reserved. +Distributed under the Terms of Use in https://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation From 73c2dabc080b253fe47c33ca184ee00f36d111b1 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Tue, 26 Apr 2022 14:08:31 -0700 Subject: [PATCH 7/7] Fix license --- ci/licenses_golden/licenses_third_party | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 0f6f1734aff67..a15e54ed67af4 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 10303d9ae0e6cfa4a91378cdda7ed55a +Signature: fd92ef2f0ad5ce454c390925641fb4ca UNUSED LICENSES: