Commit 971cc68d authored by thestig@chromium.org's avatar thestig@chromium.org

checklicenses: Recognize the Independent JPEG Group's license.

BUG=98313,374943
NOTRY=true

Review URL: https://codereview.chromium.org/294763003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271712 0039d316-1c4b-4281-b951-d872f2087c98
parent 554803b6
...@@ -497,6 +497,10 @@ sub parselicense($) { ...@@ -497,6 +497,10 @@ sub parselicense($) {
$license = "MIT/X11 (BSD like) $license"; $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/){ if ($licensetext =~ /the University of Illinois Open Source License/){
$license = "University of Illinois/NCSA Open Source License (BSD like) $license"; $license = "University of Illinois/NCSA Open Source License (BSD like) $license";
} }
......
...@@ -58,6 +58,7 @@ WHITELISTED_LICENSES = [ ...@@ -58,6 +58,7 @@ WHITELISTED_LICENSES = [
'GPL (v2 or later) with libtool exception', 'GPL (v2 or later) with libtool exception',
'GPL (v3 or later) with Bison parser exception', 'GPL (v3 or later) with Bison parser exception',
'GPL with Bison parser exception', 'GPL with Bison parser exception',
'Independent JPEG Group License',
'ISC', 'ISC',
'LGPL (unversioned/unknown version)', 'LGPL (unversioned/unknown version)',
'LGPL (v2)', 'LGPL (v2)',
...@@ -206,9 +207,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { ...@@ -206,9 +207,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'third_party/libjingle/source/talk': [ # http://crbug.com/98310 'third_party/libjingle/source/talk': [ # http://crbug.com/98310
'UNKNOWN', 'UNKNOWN',
], ],
'third_party/libjpeg': [ # http://crbug.com/98313
'UNKNOWN',
],
'third_party/libjpeg_turbo': [ # http://crbug.com/98314 'third_party/libjpeg_turbo': [ # http://crbug.com/98314
'UNKNOWN', 'UNKNOWN',
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment