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

js pushed a commit to branch master
in repository licensecheck.

commit 6759d52b7ddf06b7636280114354aeb8d1b33ca2
Author: Jonas Smedegaard <d...@jones.dk>
Date:   Mon Oct 10 11:58:51 2016 +0200

    Add license pattern ms_pl.
---
 lib/App/Licensecheck.pm       |  5 ++---
 lib/Regexp/Pattern/License.pm |  8 ++++++++
 t/SPDX/MS-PL.txt              | 22 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index 720eafc..1e0f24e 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -56,7 +56,6 @@ See the script for casual usage.
 
 # legacy descriptive names different from SPDX shortnames
 my %SPDX = (
-       'MS-PL'                => 'Ms-PL',
 );
 
 my $under_terms_of
@@ -857,8 +856,8 @@ sub parse_license
 
        # MS-PL
        given ($licensetext) {
-               when ( /Microsoft Permissive License \(Ms-PL\)/ ) {
-                       $gen_license->('MS-PL');
+               when ( /$L{re}{ms_pl}/ ) {
+                       $gen_license->('ms_pl');
                }
        }
 
diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index 2a95aca..6ce5072 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -100,6 +100,8 @@ Patterns each covering a single license.
 
 =item * mpl
 
+=item * ms_pl
+
 =item * ntp
 
 =item * ntp_disclaimer
@@ -395,6 +397,12 @@ END
                pat =>
                        qr/$the?(?:Mozilla Public License(?: 
\(\"?(?:https?:?\/\/mozilla.org\/)?MPL\"?\))?(?: (?:as )?published by 
$the{0,2}Mozilla Foundation)?|MPL)/,
        },
+       ms_pl => {
+               name    => 'MS-PL',
+               caption => 'Ms-PL',
+               pat =>
+                       qr/$the?(?:Microsoft Permissive License(?: 
\(Ms-PL\))?|Ms-PL)/,
+       },
        ntp => {
                name => 'NTP',
                tags => ['mit'],
diff --git a/t/SPDX/MS-PL.txt b/t/SPDX/MS-PL.txt
new file mode 100644
index 0000000..b44a385
--- /dev/null
+++ b/t/SPDX/MS-PL.txt
@@ -0,0 +1,22 @@
+Microsoft Public License (Ms-PL)
+
+This license governs use of the accompanying software. If you use the 
software, you accept this license. If you do not accept the license, do not use 
the software.
+ 
+1.  Definitions
+The terms "reproduce," "reproduction," "derivative works," and "distribution" 
have the same meaning here as under U.S. copyright law. A "contribution" is the 
original software, or any additions or changes to the software. A "contributor" 
is any person that distributes its contribution under this license. "Licensed 
patents" are a contributor's patent claims that read directly on its 
contribution.
+
+2.  Grant of Rights
+     (A) Copyright Grant- Subject to the terms of this license, including the 
license conditions and limitations in section 3, each contributor grants you a 
non-exclusive, worldwide, royalty-free copyright license to reproduce its 
contribution, prepare derivative works of its contribution, and distribute its 
contribution or any derivative works that you create.
+
+     (B) Patent Grant- Subject to the terms of this license, including the 
license conditions and limitations in section 3, each contributor grants you a 
non-exclusive, worldwide, royalty-free license under its licensed patents to 
make, have made, use, sell, offer for sale, import, and/or otherwise dispose of 
its contribution in the software or derivative works of the contribution in the 
software.
+
+3.  Conditions and Limitations
+     (A) No Trademark License- This license does not grant you rights to use 
any contributors' name, logo, or trademarks. 
+
+     (B) If you bring a patent claim against any contributor over patents that 
you claim are infringed by the software, your patent license from such 
contributor to the software ends automatically. 
+
+     (C) If you distribute any portion of the software, you must retain all 
copyright, patent, trademark, and attribution notices that are present in the 
software. 
+ 
+     (D) If you distribute any portion of the software in source code form, 
you may do so only under this license by including a complete copy of this 
license with your distribution. If you distribute any portion of the software 
in compiled or object code form, you may only do so under a license that 
complies with this license. 
+
+     (E) The software is licensed "as-is." You bear the risk of using it. The 
contributors give no express warranties, guarantees, or conditions. You may 
have additional consumer rights under your local laws which this license cannot 
change. To the extent permitted under your local laws, the contributors exclude 
the implied warranties of merchantability, fitness for a particular purpose and 
non-infringement.
\ 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