Index: third_party/devscripts/licensecheck.pl |
diff --git a/third_party/devscripts/licensecheck.pl b/third_party/devscripts/licensecheck.pl |
index f7be5c5c0d6f37c806c8450fda4774e00459bf86..be54e959fac5a52c1f11b42db637b192ef8fc263 100755 |
--- a/third_party/devscripts/licensecheck.pl |
+++ b/third_party/devscripts/licensecheck.pl |
@@ -437,7 +437,7 @@ sub parselicense($) { |
if ($licensetext =~ /version ([^, ]+?)[.,]? (?:\(?only\)?.? )?(?:of the GNU (Affero )?General Public License )?(as )?published by the Free Software Foundation/i or |
$licensetext =~ /GNU (?:Affero )?General Public License (?:as )?published by the Free Software Foundation; version ([^, ]+?)[.,]? /i or |
- $licensetext =~ /GNU (?:Affero )?General Public License,? [Vv]ersion (\d+(?:\.\d+)?)[ \.]/) { |
+ $licensetext =~ /GNU (?:Affero )?General Public License,? [Vv](?:ersion )?(\d+(?:\.\d+)?)[ \.,]/) { |
$gplver = " (v$1)"; |
} elsif ($licensetext =~ /either version ([^ ]+)(?: of the License)?, or \(at your option\) any later version/) { |
$gplver = " (v$1 or later)"; |
@@ -468,10 +468,10 @@ sub parselicense($) { |
if ($licensetext =~ /is free software.? you (can|may) redistribute it and\/or modify it under the terms of (?:version [^ ]+ (?:\(?only\)? )?of )?the GNU General Public License/i) { |
$license = "GPL$gplver$extrainfo $license"; |
- } elsif ($licensetext =~ /is distributed under the terms of the GNU General Public License,/ |
+ } elsif ($licensetext =~ /under the terms of the GNU General Public License/i |
and $gplver) { |
$license = "GPL$gplver$extrainfo $license"; |
- } elsif ($licensetext =~ /is distributed.*terms.*[^L]GPL/) { |
+ } elsif ($licensetext =~ /terms.*[^L]GPL/) { |
if ($gplver) { |
$license = "GPL$gplver$extrainfo $license"; |
} else { |
@@ -512,7 +512,7 @@ sub parselicense($) { |
} else { |
$license = "BSD $license"; |
} |
- } elsif ($licensetext =~ /Use of this source code is governed by a BSD-style license/) { |
+ } elsif ($licensetext =~ /a BSD-style license/i) { |
$license = "BSD-like $license"; |
} elsif ($licensetext =~ /BSD terms apply/) { |
$license = "BSD-like $license"; |