diff options
| -rwxr-xr-x | third_party/devscripts/licensecheck.pl | 4 | ||||
| -rwxr-xr-x | tools/checklicenses/checklicenses.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/third_party/devscripts/licensecheck.pl b/third_party/devscripts/licensecheck.pl index 0379627..5e03327 100755 --- a/third_party/devscripts/licensecheck.pl +++ b/third_party/devscripts/licensecheck.pl @@ -497,6 +497,10 @@ sub parselicense($) { $license = "MIT/X11 (BSD like) $license"; } + if ($licensetext =~ /This file is part of the Independent JPEG Group(')?s software.*For conditions of distribution and use, see the accompanying README file/i) { + $license = "Independent JPEG Group License $license"; + } + if ($licensetext =~ /the University of Illinois Open Source License/){ $license = "University of Illinois/NCSA Open Source License (BSD like) $license"; } diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py index 73d0763..31e490b 100755 --- a/tools/checklicenses/checklicenses.py +++ b/tools/checklicenses/checklicenses.py @@ -58,6 +58,7 @@ WHITELISTED_LICENSES = [ 'GPL (v2 or later) with libtool exception', 'GPL (v3 or later) with Bison parser exception', 'GPL with Bison parser exception', + 'Independent JPEG Group License', 'ISC', 'LGPL (unversioned/unknown version)', 'LGPL (v2)', @@ -206,9 +207,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { 'third_party/libjingle/source/talk': [ # http://crbug.com/98310 'UNKNOWN', ], - 'third_party/libjpeg': [ # http://crbug.com/98313 - 'UNKNOWN', - ], 'third_party/libjpeg_turbo': [ # http://crbug.com/98314 'UNKNOWN', ], |