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

js pushed a commit to branch master
in repository licensecheck.

commit 2e4cb4f1782d536bbfc88091eff84bd55e099ea3
Author: Jonas Smedegaard <d...@jones.dk>
Date:   Fri Nov 25 22:23:38 2016 +0100

    Add new license pattern mit_advertising.
---
 lib/App/Licensecheck.pm             |  2 +-
 lib/Regexp/Pattern/License.pm       |  8 ++++++++
 lib/Regexp/Pattern/License/Parts.pm | 21 +++++++++++++++++++--
 t/SPDX/MIT-advertising.txt          |  7 +++++++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index 09b46ba..39254de 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -627,7 +627,7 @@ sub parse_license
 
        # MIT
        given ($licensetext) {
-               foreach my $id (qw<curl icu isc mit_enna mit_feh mit_new 
mit_old mit_oldstyle mit_oldstyle_disclaimer mit_oldstyle_permission>) {
+               foreach my $id (qw<curl icu isc mit_advertising mit_enna 
mit_feh mit_new mit_old mit_oldstyle mit_oldstyle_disclaimer 
mit_oldstyle_permission>) {
                        when ( /$L{re}{$id}/) {
                                $gen_license->($id);
                                continue;
diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index af450d1..1fc148d 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -118,6 +118,8 @@ Patterns each covering a single license.
 
 =item * libpng
 
+=item * mit_advertising
+
 =item * mit_enna
 
 =item * mit_feh
@@ -465,6 +467,12 @@ our %RE = (
                name => 'Libpng',
                pat  => qr/$the?libpng license/,
        },
+       mit_advertising => {
+               name    => 'MIT-advertising',
+               caption => 'MIT (advertising)',
+               tags    => ['mit'],
+               pat     => qr/$P{note_marketing}\b[^.,]+, and 
$P{ad_ack_doc_sw}/,
+       },
        mit_enna => {
                name    => 'MIT-enna',
                caption => 'MIT (enna)',
diff --git a/lib/Regexp/Pattern/License/Parts.pm 
b/lib/Regexp/Pattern/License/Parts.pm
index 1323bab..1c1b3df 100644
--- a/lib/Regexp/Pattern/License/Parts.pm
+++ b/lib/Regexp/Pattern/License/Parts.pm
@@ -37,6 +37,8 @@ Patterns each covering a single part, e.g. a clause or a 
disclaimer phrase.
 
 =item * ad_ack_doc_pkg
 
+=item * ad_ack_doc_sw
+
 =item * ad_always
 
 =item * ad_pub_ack_nosrc
@@ -91,6 +93,8 @@ Patterns each covering a single part, e.g. a clause or a 
disclaimer phrase.
 
 =item * note_invar
 
+=item * note_marketing
+
 =item * note_repro_notice_cond_discl
 
 =item * note_retain_notice_cond_discl
@@ -188,6 +192,12 @@ our %RE = (
                pat =>
                        qr/acknowledgment shall be given in the documentation 
and software packages that this Software was used/,
        },
+       ad_ack_doc_sw => {
+               caption => 'advertisement (documentation + source)',
+               tags    => ['clause'],
+               pat =>
+                       qr/acknowledgment shall be given in the documentation, 
materials and software packages that this Software was used/,
+       },
        ad_always => {
                caption => 'advertisement',
                tags    => ['clause'],
@@ -222,12 +232,13 @@ our %RE = (
        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/,
+               pat =>
+                       qr/THE SOFTWARE IS PROVIDED \W*AS\W+IS\W*(?:,?|AND) 
(?:\S+ ){1,15}DISCLAIMS/,
        },
        asis_sw_warranty => {
                caption => 'as-is (software, warranty)',
                tags    => ['clause'],
-               pat     => qr/THE SOFTWARE IS PROVIDED \W*AS\W+IS\W* WITHOUT 
WARRANTY/,
+               pat => qr/THE SOFTWARE IS PROVIDED \W*AS\W+IS\W* WITHOUT 
WARRANTY/,
        },
        cc => {
                caption => 'Creative Commons qualifier',
@@ -324,6 +335,12 @@ our %RE = (
                pat =>
                        qr/both the above copyright notice\(s\) and this 
permission notice appear in supporting documentation/,
        },
+       note_marketing => {
+               caption => 'notice (copyright + permission, marketing 
material)',
+               tags    => ['clause'],
+               pat =>
+                       qr/shall be included in all copies of the Software, its 
documentation and marketing/,
+       },
        note_cpyr_perm_subst => {
                caption => 'notices (copyright, permission, substantial 
portions)',
                tags    => ['clause'],
diff --git a/t/SPDX/MIT-advertising.txt b/t/SPDX/MIT-advertising.txt
new file mode 100644
index 0000000..e1d908d
--- /dev/null
+++ b/t/SPDX/MIT-advertising.txt
@@ -0,0 +1,7 @@
+Copyright (C) 2000-2008 Carsten Haitzler, Geoff Harrison and various 
contributors Copyright (C) 2004-2008 Kim Woelders
+
+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 without restriction, including without limitation the rights to 
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
of the Software, and to permit persons to whom the Software is furnished to do 
so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
copies of the Software, its documentation and marketing & publicity materials, 
and acknowledgment shall be given in the documentation, materials and software 
packages that this Software was used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file

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

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to