Index: tools/checklicenses/checklicenses.py |
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py |
index 480ef71a86c0083e9699dac2b0bb894b7744b69d..c51b0780baee19bdbc00c15d6b67ba57a8d47b61 100755 |
--- a/tools/checklicenses/checklicenses.py |
+++ b/tools/checklicenses/checklicenses.py |
@@ -50,8 +50,6 @@ WHITELISTED_LICENSES = [ |
'BSD-like MIT/X11 (BSD like)', |
'BSL (v1.0)', |
- # TODO(phajdan.jr): Make licensecheck not print the comma after 3.1. |
- 'BSL (v1.0) GPL (v3.1,)', |
'GPL (v2 or later) with Bison parser exception', |
'GPL (v2 or later) with libtool exception', |
'GPL (v3 or later) with Bison parser exception', |
@@ -80,6 +78,10 @@ WHITELISTED_LICENSES = [ |
'MIT/X11 (BSD like)', |
'Ms-PL', |
'Public domain', |
+ 'Public domain BSD', |
+ 'Public domain BSD (3 clause)', |
+ 'Public domain BSD-like', |
+ 'Public domain LGPL (v2.1 or later)', |
'libpng', |
'zlib/libpng', |
'SGI Free Software License B', |
@@ -131,18 +133,12 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { |
'BSD (2 clause) GPL (v2 or later)', |
'BSD (3 clause) GPL (v2 or later)', |
'BSL (v1.0) GPL', |
+ 'BSL (v1.0) GPL (v3.1)', |
'GPL', |
'GPL (unversioned/unknown version)', |
'GPL (v2)', |
- |
- # TODO(phajdan.jr): Make licensecheck not print the comma after v2. |
- 'GPL (v2,)', |
- |
'GPL (v2 or later)', |
- |
- # TODO(phajdan.jr): Make licensecheck not print the comma after 3.1. |
- 'GPL (v3.1,)', |
- |
+ 'GPL (v3.1)', |
'GPL (v3 or later)', |
], |
'net/tools/spdyshark': [ |
@@ -226,6 +222,9 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { |
'third_party/hunspell': [ # http://crbug.com/98134 |
'UNKNOWN', |
], |
+ 'third_party/hyphen/hyphen.tex': [ # http://crbug.com/157375 |
+ 'UNKNOWN', |
+ ], |
'third_party/iccjpeg': [ # http://crbug.com/98137 |
'UNKNOWN', |
], |
@@ -315,7 +314,7 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { |
'third_party/ots/tools/ttf-checksum.py': [ # http://code.google.com/p/ots/issues/detail?id=2 |
'UNKNOWN', |
], |
- 'third_party/molokocacao/NSBezierPath+MCAdditions.h': [ # http://crbug.com/98453 |
+ 'third_party/molokocacao': [ # http://crbug.com/98453 |
'UNKNOWN', |
], |
'third_party/npapi/npspy': [ |