The following commit has been merged in the master branch:
commit 3ad99ae9fd995f266757b9f44030e7ec4ebf5d9e
Author: Pawel Hajdan, Jr <[email protected]>
Date: Thu Nov 3 16:34:30 2011 +0100
Recognize more variations of MIT/X11 license.
This is a part of an effort to make Chromium project sources
pass licensecheck: http://code.google.com/p/chromium/issues/detail?id=28291
Signed-off-by: Paweł Hajdan, Jr <[email protected]>
Signed-off-by: James McCoy <[email protected]>
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 461de28..4266296 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -437,9 +437,9 @@ sub parselicense($) {
$license = "QPL $license";
}
- if ($licensetext =~
/http:\/\/opensource\.org\/licenses\/mit-license\.php/) {
+ if ($licensetext =~ /opensource\.org\/licenses\/mit-license\.php/) {
$license = "MIT/X11 (BSD like) $license";
- } elsif ($licensetext =~ /Permission is hereby granted, free of charge, to
any person obtaining a copy of this software and associated documentation files
\(the Software\), to deal in the Software/) {
+ } elsif ($licensetext =~ /Permission is hereby granted, free of charge, to
any person obtaining a copy of this software and(\/or)? associated
documentation files \(the (Software|Materials)\), to deal in the
(Software|Materials)/) {
$license = "MIT/X11 (BSD like) $license";
} elsif ($licensetext =~ /Permission is hereby granted, without written
agreement and without license or royalty fees, to use, copy, modify, and
distribute this software and its documentation for any purpose/) {
$license = "MIT/X11 (BSD like) $license";
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
