[PATCH 3/4] spot another BSD-3-clause wording

Philip Hands phil at hands.com
Mon Jan 14 11:49:15 UTC 2013


---
 scripts/licensecheck.pl |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 9a66e30..3ea562f 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -353,6 +353,7 @@ sub parse_copyright {
 	    $copyright = $match;
 	}
     }
+    }
 
     return $copyright;
 }
@@ -498,7 +499,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 .*? may not|Neither the names? .*? nor the names of (its|their|other) contributors may) be used to endorse or promote products derived from this software/i) {
+	} elsif ($licensetext =~ /(The name .*? may not|Neither the (names? .*?|authors?) nor the names of (its|their|other|any) 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";
-- 
1.7.10.4




More information about the devscripts-devel mailing list