Update licensecheck to 2.11.2, which contains upstreamed patches:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=641497
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=647524
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=647526
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=647527

And also a patch by Adam Langley (agl):

http://anonscm.debian.org/gitweb/?p=devscripts/devscripts.git;a=commitdiff;h=917d833db3495bdc1252d3e739e8ef68f5710105

BUG=28291


Review URL: http://codereview.chromium.org/8486004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110366 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 17 insertions, 7 deletions

diff --git a/third_party/devscripts/README.chromium b/third_party/devscripts/README.chromium
index 24d4ad5..1cb08e8 100644
--- a/third_party/devscripts/README.chromium
+++ b/third_party/devscripts/README.chromium
@@ -1,6 +1,6 @@
 Name: devscripts
 URL: http://anonscm.debian.org/gitweb/?p=devscripts/devscripts.git
-Version: 2.11.1
+Version: 2.11.2
 Security Critical: no
 
 Description:
diff --git a/third_party/devscripts/licensecheck.pl b/third_party/devscripts/licensecheck.pl
index 40057cc..901e529 100755
--- a/third_party/devscripts/licensecheck.pl
+++ b/third_party/devscripts/licensecheck.pl
@@ -125,7 +125,7 @@ Adam D. Barratt <adam@adam-barratt.org.uk>
 
 use strict;
 use warnings;
-use Getopt::Long;
+use Getopt::Long qw(:config gnu_getopt);
 use File::Basename;
 
 sub fatal($);
@@ -430,6 +430,8 @@ sub parselicense($) {
 	$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(\/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";
     }
 
     if ($licensetext  =~ /Permission to use, copy, modify, and(\/or)? distribute this software for any purpose with or without fee is hereby granted, provided.*copyright notice.*permission notice.*all copies/) {
diff --git a/third_party/devscripts/licensecheck.pl.orig b/third_party/devscripts/licensecheck.pl.orig
index 5224f69..3a0634a 100644
--- a/third_party/devscripts/licensecheck.pl.orig
+++ b/third_party/devscripts/licensecheck.pl.orig
@@ -125,7 +125,7 @@ Adam D. Barratt <adam@adam-barratt.org.uk>
 
 use strict;
 use warnings;
-use Getopt::Long;
+use Getopt::Long qw(:config gnu_getopt);
 use File::Basename;
 
 sub fatal($);
@@ -406,7 +406,7 @@ sub parselicense($) {
 	$extrainfo = " (with Qt exception)$extrainfo"
     }
 
-    if ($licensetext =~ /(All changes made in this file will be lost|DO NOT (EDIT|delete this file)|Generated by)/i) {
+    if ($licensetext =~ /(All changes made in this file will be lost|DO NOT (EDIT|delete this file)|Generated (automatically|by|from)|generated.*file)/i) {
 	$license = "GENERATED FILE";
     }
 
@@ -437,9 +437,11 @@ 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";
     }
 
@@ -450,7 +452,7 @@ sub parselicense($) {
     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) {
 	    $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 =~ /(The name .*? may not|Neither the names? .*? nor the names of (its|their) contributors may) be used to endorse or promote products derived from this software/i) {
 	    $license = "BSD (3 clause) $license";
 	} elsif ($licensetext =~ /Redistributions of source code must retain the above copyright notice/i) {
 	    $license = "BSD (2 clause) $license";
@@ -503,6 +505,10 @@ sub parselicense($) {
 	$license = "CDDL " . ($1 ? "(v$2) " : '') . $license;
     }
 
+    if ($licensetext =~ /Microsoft Permissive License \(Ms-PL\)/) {
+        $license = "Ms-PL $license";
+    }
+
     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 +521,8 @@ sub parselicense($) {
     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";
+    } 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) {