Index: third_party/devscripts/chromium-1.patch |
diff --git a/third_party/devscripts/chromium-1.patch b/third_party/devscripts/chromium-1.patch |
index 05cd2ccd40345d355ff4da2b10873ffd4b4f901f..3dd92644ff380bc69f48ae4953c63656971798c0 100644 |
--- a/third_party/devscripts/chromium-1.patch |
+++ b/third_party/devscripts/chromium-1.patch |
@@ -1,6 +1,33 @@ |
---- licensecheck.pl.orig 2011-09-12 15:54:33.369133553 -0700 |
-+++ licensecheck.pl 2011-09-12 16:53:51.189069386 -0700 |
-@@ -406,7 +406,7 @@ |
+--- licensecheck.pl.orig 2011-09-22 10:51:25.934402455 -0700 |
++++ licensecheck.pl 2011-09-22 10:45:54.585545044 -0700 |
+@@ -277,10 +277,6 @@ |
+ while (<F>) { |
+ last if ($. > $opt_lines); |
+ $content .= $_; |
+- $copyright_match = parse_copyright($_); |
+- if ($copyright_match) { |
+- $copyrights{lc("$copyright_match")} = "$copyright_match"; |
+- } |
+ } |
+ close(F); |
+ |
+@@ -298,7 +294,6 @@ |
+ |
+ $license = parselicense($content); |
+ print "$file: "; |
+- print "*No copyright* " unless $copyright; |
+ print $license . "\n"; |
+ print " [Copyright: " . $copyright . "]\n" |
+ if $copyright and $opt_copyright; |
+@@ -398,15 +393,11 @@ |
+ $gplver = " (v$1 or later)"; |
+ } |
+ |
+- if ($licensetext =~ /(?:675 Mass Ave|59 Temple Place|51 Franklin Steet|02139|02111-1307)/i) { |
+- $extrainfo = " (with incorrect FSF address)$extrainfo"; |
+- } |
+- |
+ if ($licensetext =~ /permission (?:is (also granted|given))? to link (the code of )?this program with (any edition of )?(Qt|the Qt library)/i) { |
$extrainfo = " (with Qt exception)$extrainfo" |
} |
@@ -9,7 +36,30 @@ |
$license = "GENERATED FILE"; |
} |
-@@ -437,7 +437,7 @@ |
+@@ -414,20 +405,12 @@ |
+ $license = "LGPL$gplver$extrainfo $license"; |
+ } |
+ |
+- if ($licensetext =~ /is free software.? you can redistribute it and\/or modify it under the terms of the (GNU Affero General Public License|AGPL)/i) { |
+- $license = "AGPL$gplver$extrainfo $license"; |
+- } |
+- |
+ 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"; |
+- } |
+- |
+- if ($licensetext =~ /is distributed under the terms of the GNU General Public License,/ |
++ } elsif ($licensetext =~ /is distributed under the terms of the GNU General Public License,/ |
+ and length $gplver) { |
+ $license = "GPL$gplver$extrainfo $license"; |
+- } |
+- |
+- if ($licensetext =~ /is distributed.*terms.*GPL/) { |
++ } elsif ($licensetext =~ /is distributed.*terms.*GPL/) { |
+ $license = "GPL (unversioned/unknown version) $license"; |
+ } |
+ |
+@@ -437,7 +420,7 @@ |
$license = "QPL $license"; |
} |
@@ -18,29 +68,39 @@ |
$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/) { |
$license = "MIT/X11 (BSD like) $license"; |
-@@ -459,6 +459,12 @@ |
- } |
+@@ -448,15 +431,19 @@ |
} |
-+ if ($licensetext =~ /Use of this source code is governed by a BSD-style license/) { |
+ if ($licensetext =~ /THIS SOFTWARE IS PROVIDED .*AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY/) { |
+- if ($licensetext =~ /All advertising materials mentioning features or use of this software must display the following acknowledge?ment.*This product includes software developed by/i) { |
++ if ($licensetext =~ /All advertising materials mentioning features or use of this software must display the following/) { |
+ $license = "BSD (4 clause) $license"; |
+- } elsif ($licensetext =~ /(The name of .*? may not|Neither the names? of .*? nor the names of (its|their) contributors may) be used to endorse or promote products derived from this software/i) { |
++ } elsif ($licensetext =~ /be used to endorse or promote products derived from this software/) { |
+ $license = "BSD (3 clause) $license"; |
+- } elsif ($licensetext =~ /Redistributions of source code must retain the above copyright notice/i) { |
++ } elsif ($licensetext =~ /Redistributions of source code must retain the above copyright notice/) { |
+ $license = "BSD (2 clause) $license"; |
+ } else { |
+ $license = "BSD $license"; |
+ } |
++ } elsif ($licensetext =~ /Use of this source code is governed by a BSD-style license/) { |
+ $license = "BSD-like $license"; |
-+ } elsif ($licensetext =~ /BSD terms apply.*see.*COPYING.*for details/) { |
++ } elsif ($licensetext =~ /BSD terms apply/) { |
+ $license = "BSD-like $license"; |
-+ } |
-+ |
- if ($licensetext =~ /Mozilla Public License Version ([^ ]+)/) { |
- $license = "MPL (v$1) $license"; |
} |
-@@ -495,7 +501,7 @@ |
+ |
+ if ($licensetext =~ /Mozilla Public License Version ([^ ]+)/) { |
+@@ -495,7 +482,7 @@ |
$license = "SGI Free Software License B $license"; |
} |
- if ($licensetext =~ /is in the public domain/i) { |
-+ if ($licensetext =~ /is.*in the public domain|disclaims copyright/i) { |
++ if ($licensetext =~ /in the public domain/i) { |
$license = "Public domain"; |
} |
-@@ -503,6 +509,10 @@ |
+@@ -503,6 +490,10 @@ |
$license = "CDDL " . ($1 ? "(v$2) " : '') . $license; |
} |
@@ -51,12 +111,24 @@ |
if ($licensetext =~ /Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license \(the \"Software\"\)/ or |
$licensetext =~ /Boost Software License([ ,-]+Version ([^ ]+)?(\.))/i) { |
$license = "BSL " . ($1 ? "(v$2) " : '') . $license; |
-@@ -515,6 +525,8 @@ |
+@@ -515,18 +506,8 @@ |
if ($licensetext =~ /The origin of this software must not be misrepresented.*Altered source versions must be plainly marked as such.*This notice may not be removed or altered from any source distribution/ or |
$licensetext =~ /see copyright notice in zlib\.h/) { |
$license = "zlib/libpng $license"; |
+- } |
+- |
+- if ($licensetext =~ /Do What The Fuck You Want To Public License, Version ([^, ]+)/i) { |
+- $license = "WTFPL (v$1)"; |
+- } |
+- |
+- if ($licensetext =~ /Do what The Fuck You Want To Public License/i) { |
+- $license = "WTFPL"; |
+- } |
+- |
+- if ($licensetext =~ /(License WTFPL|Under (the|a) WTFPL)/i) { |
+- $license = "WTFPL"; |
+ } elsif ($licensetext =~ /This code is released under the libpng license/) { |
+ $license = "libpng $license"; |
} |
- if ($licensetext =~ /Do What The Fuck You Want To Public License, Version ([^, ]+)/i) { |
+ $license = "UNKNOWN" if (!length($license)); |