[licensecheck] 93/112: Add license pattern ISC to Regexp::Pattern::License::Pattern.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository licensecheck.

commit c0bf9c9d2233e3a84e9e23c061dda2b53be300a3
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Nov 25 13:30:35 2016 +0100

    Add license pattern ISC to Regexp::Pattern::License::Pattern.
---
 lib/App/Licensecheck.pm             |  6 ++----
 lib/Regexp/Pattern/License.pm       |  7 +++++++
 lib/Regexp/Pattern/License/Parts.pm | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index 1ffbad5..fe5780e 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -665,11 +665,9 @@ sub parse_license
 			$gen_license->('mit_old');
 		}
 	}
-
-	# ISC
 	given ($licensetext) {
-		when ( /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/ ) {
-			$gen_license->('ISC');
+		when ( /$L{re}{isc}/) {
+			$gen_license->('isc');
 		}
 	}
 
diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index c59de5f..4a85654 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -110,6 +110,8 @@ Patterns each covering a single license.
 
 =item * gpl
 
+=item * isc
+
 =item * lgpl
 
 =item * llgpl
@@ -432,6 +434,11 @@ our %RE = (
 		summary => 'The GNU General Public License',
 		pat     => qr/$the?$gnu?(?:$gpl(?: \(GPL\))?$by_fsf?|GPL)/,
 	},
+	isc => {
+		name => 'ISC',
+		tags => ['mit'],
+		pat  => qr/$P{note_cpyr_perm}\.\s+$P{asis_sw_name_discl}/,
+	},
 	lgpl => {
 		name    => 'LGPL',
 		summary => 'The GNU Lesser General Public License',
diff --git a/lib/Regexp/Pattern/License/Parts.pm b/lib/Regexp/Pattern/License/Parts.pm
index 9c38cec..7ad87ae 100644
--- a/lib/Regexp/Pattern/License/Parts.pm
+++ b/lib/Regexp/Pattern/License/Parts.pm
@@ -45,6 +45,8 @@ Patterns each covering a single part, e.g. a clause or a disclaimer phrase.
 
 =item * asis_sw_by_name
 
+=item * asis_sw_name_discl
+
 =item * cc
 
 =item * cc_by
@@ -73,6 +75,8 @@ Patterns each covering a single part, e.g. a clause or a disclaimer phrase.
 
 =item * name_no_ad
 
+=item * note_cpyr_perm
+
 =item * origin_no_misrepresent
 
 =item * origin_no_misrepresent_ack
@@ -193,6 +197,11 @@ our %RE = (
 		tags    => ['clause'],
 		pat     => qr/THIS SOFTWARE IS PROVIDED BY/,
 	},
+	asis_sw_name_discl => {
+		caption => 'as-is (software, name disclaims)',
+		tags    => ['clause'],
+		pat     => qr/THE SOFTWARE IS PROVIDED \W*AS\W+IS\W*(?:,?|AND) (?:\S+ ){1,15}DISCLAIMS/,
+	},
 	cc => {
 		caption => 'Creative Commons qualifier',
 		tags    => ['qualifier'],
@@ -264,6 +273,12 @@ our %RE = (
 		tags    => ['clause'],
 		pat     => qr/without specific, written prior permission/,
 	},
+	note_cpyr_perm => {
+		caption => 'notice (copyright + permission)',
+		tags    => ['clause'],
+		pat =>
+			qr/provided that the above copyright notice and this permission notice appear in all copies/,
+	},
 	origin_no_misrepresent => {
 		caption => 'origin (no misrepresentation)',
 		tags    => ['clause'],

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/licensecheck.git