This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository licensecheck.
commit 186d7f9ac0a04d93636c9af4d0e369f8a9bc5f2a
Author: Jonas Smedegaard <d...@jones.dk>
Date: Mon Oct 10 00:14:09 2016 +0200
Add license pattern openssl and trait pattern clause_advertising_always.
---
lib/Regexp/Pattern/License.pm | 15 +++++++++++++++
lib/Regexp/Pattern/License/Parts.pm | 11 +++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index f6b3d9b..256cfca 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -50,6 +50,8 @@ Patterns each covering a single license.
=item * ntp_disclaimer
+=item * openssl
+
=item * postgresql
=back
@@ -149,6 +151,11 @@ END
tags => ['mit'],
pat => qr/$P{provided_no_warranty}\.\s+$P{discl_disclaim}/,
},
+ openssl => {
+ name => 'OpenSSL',
+ summary => 'OpenSSL License',
+ pat => qr/$P{ad_always}/,
+ },
postgresql => {
name => 'PostgreSQL',
tags => ['mit'],
@@ -168,6 +175,8 @@ Patterns each covering a single trait occuring in licenses.
=item * clause_advertising
+=item * clause_advertising_always
+
=item * clause_non_endorsement
=item * disclaimer
@@ -194,6 +203,12 @@ $RE{'clause_advertising'} = {
pat => qr/$P{ad_verbatim}/,
};
+$RE{'clause_advertising_always'} = {
+ caption => 'advertising clause (always)',
+ tags => ['trait'],
+ pat => qr/$P{ad_always}/,
+};
+
$RE{'clause_non_endorsement'} = {
caption => 'non-endorsement clause',
tags => ['trait'],
diff --git a/lib/Regexp/Pattern/License/Parts.pm
b/lib/Regexp/Pattern/License/Parts.pm
index 8e0f860..addac66 100644
--- a/lib/Regexp/Pattern/License/Parts.pm
+++ b/lib/Regexp/Pattern/License/Parts.pm
@@ -59,6 +59,7 @@ my $to_deal_mat = qr/to deal in the Materials without
restriction/;
my $any_purpose = qr/for any purpose/;
my $redist_src = qr/Redistributions of source code/;
my $redist_bin = qr/Redistributions in binary form/;
+my $redist_any = qr/Redistributions of any form whatsoever/;
my $promote = qr/endorse or promote products derived from this software/;
# text
@@ -67,6 +68,8 @@ my $cond = qr/this list of conditions/;
my $discl = qr/the following disclaimer/;
my $no_agreement = qr/without written agreement/;
my $no_permit = qr/without specific prior written permission/;
+my $ack = qr/the following acknowledge?ment/;
+my $product_by = qr/This product includes software developed by/;
# money
my $no_charge = qr/free of charge/;
@@ -90,8 +93,12 @@ our %RE = (
ad_verbatim => {
caption => 'advertisement (verbatim)',
tags => ['clause'],
- pat =>
- qr/$ad_mat must display the following
acknowledge?ment[^a-zA-Z]+This product includes software developed by/,
+ pat => qr/$ad_mat must display $ack[^a-zA-Z]+$product_by/,
+ },
+ ad_always => {
+ caption => 'advertisement',
+ tags => ['clause'],
+ pat => qr/$redist_any must retain
$ack[^a-zA-Z]+$product_by/,
},
discl => {
caption => 'disclaimer',
--
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
