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

js pushed a commit to branch master
in repository licensecheck.

commit 14b4e47e1c68374908af3c4a469bf36e8b841202
Author: Jonas Smedegaard <d...@jones.dk>
Date:   Sun Oct 9 15:30:09 2016 +0200

    Add license pattern apache.
---
 lib/App/Licensecheck.pm       | 22 ++++++-------
 lib/Regexp/Pattern/License.pm |  7 +++++
 t/SPDX/Apache-1.1.txt         | 21 +++++++++++++
 t/SPDX/Apache-2.0.txt         | 73 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 112 insertions(+), 11 deletions(-)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index 45d21b8..dd7cbfb 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -744,23 +744,23 @@ sub parse_license
 
        # Apache
        given ($licensetext) {
-               when ( /Apache(?: Software)? License(?:,? 
$L{re}{version}{-keep}(,? $L{re}{version_later_postfix})?)?(?:(?: or)? [^ 
,]*?apache[^ ,]*| \([^(),]+\))*,? or(?: the)?(?:(?: GNU)? General Public 
License(?: \(GPL\))?|GPL)(?: $L{re}{version}{-keep}(,? 
$L{re}{version_later_postfix})?)?/i ) {
-                       $gen_license->( 'Apache', $1, $2, 'GPL', $3, $4 );
+               when ( /$L{re}{apache}(?:,? $L{re}{version}{-keep}(,? 
$L{re}{version_later_postfix})?)?(?:(?: or)? [^ ,]*?apache[^ ,]*| 
\([^(),]+\))*,? or(?: the)?(?:(?: GNU)? General Public License(?: 
\(GPL\))?|GPL)(?: $L{re}{version}{-keep}(,? $L{re}{version_later_postfix})?)?/i 
) {
+                       $gen_license->( 'apache', $1, $2, 'GPL', $3, $4 );
                }
-               when ( /Apache(?: Software)? License(?:,? 
$L{re}{version}{-keep}(,? $L{re}{version_later_postfix})?)?(?:(?: or)? [^ 
,]*?apache[^ ,]*| \([^(),]\))*,? or(?: the)? bsd(?:[ -](\d)-clause)?\b/i ) {
-                       $gen_license->( 'Apache', $1, $2, "bsd_${3}_clause" );
+               when ( /$L{re}{apache}(?:,? $L{re}{version}{-keep}(,? 
$L{re}{version_later_postfix})?)?(?:(?: or)? [^ ,]*?apache[^ ,]*| 
\([^(),]\))*,? or(?: the)? bsd(?:[ -](\d)-clause)?\b/i ) {
+                       $gen_license->( 'apache', $1, $2, "bsd_${3}_clause" );
                }
-               when ( /Apache(?: Software)? License(?:,? 
$L{re}{version}{-keep}(,? $L{re}{version_later_postfix})?)?(?:(?: or)? [^ 
,]*?apache[^ ,]*| \([^(),]\))*,? or $L{re}{mit_new}\b/i ) {
-                       $gen_license->( 'Apache', $1, $2, 'mit_new', $3, $4 );
+               when ( /$L{re}{apache}(?:,? $L{re}{version}{-keep}(,? 
$L{re}{version_later_postfix})?)?(?:(?: or)? [^ ,]*?apache[^ ,]*| 
\([^(),]\))*,? or $L{re}{mit_new}\b/i ) {
+                       $gen_license->( 'apache', $1, $2, 'mit_new', $3, $4 );
                }
-               when ( /Apache(?: Software)? License(?:,? 
$L{re}{version}{-keep}(,? $L{re}{version_later_postfix})?)?(?:(?: or)? [^ 
,]*?apache[^ ,]*| \([^(),]\))*,? or $L{re}{mit}\b/i ) {
-                       $gen_license->( 'Apache', $1, $2, 'mit', $3, $4 );
+               when ( /$L{re}{apache}(?:,? $L{re}{version}{-keep}(,? 
$L{re}{version_later_postfix})?)?(?:(?: or)? [^ ,]*?apache[^ ,]*| 
\([^(),]\))*,? or $L{re}{mit}\b/i ) {
+                       $gen_license->( 'apache', $1, $2, 'mit', $3, $4 );
                }
-               when ( /Apache(?: Software)? License(?:,? 
$L{re}{version}{-keep}(,? $L{re}{version_later_postfix})?)?/i ) {
-                       $gen_license->( 'Apache', $1, $2 );
+               when ( /$L{re}{apache}(?:,? $L{re}{version}{-keep}(,? 
$L{re}{version_later_postfix})?)?/i ) {
+                       $gen_license->( 'apache', $1, $2 );
                }
                when ( 
m<https?www.apache.org/licenses(?:/LICENSE-($L{re}{version_number}))?>i ) {
-                       $gen_license->( 'Apache', $1 );
+                       $gen_license->( 'apache', $1 );
                }
        }
 
diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index 58f61e5..a1a48a0 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -28,6 +28,8 @@ Patterns each covering a single license.
 
 =item * agpl
 
+=item * apache
+
 =item * bsd_2_clause
 
 =item * bsd_3_clause
@@ -111,6 +113,11 @@ our %RE = (
                summary => 'GNU Affero General Public License',
                pat     => qr/$the?$gnu?(?:Affero $gpl(?: 
\(AGPL\))?$by_fsf?|AGPL)/,
        },
+       apache => {
+               name    => 'Apache',
+               summary => 'Apache License',
+               pat     => qr/$the?Apache(?: Software)? License/,
+       },
        bsd_2_clause => {
                name                  => 'BSD-2-Clause',
                'name.alt.org.debian' => 'BSD-2-clause',
diff --git a/t/SPDX/Apache-1.1.txt b/t/SPDX/Apache-1.1.txt
new file mode 100644
index 0000000..4359bf6
--- /dev/null
+++ b/t/SPDX/Apache-1.1.txt
@@ -0,0 +1,21 @@
+Apache License 1.1 
+
+Copyright (c) 2000 The Apache Software Foundation.  All rights reserved. 
+
+Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this 
list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, 
this list of conditions and the following disclaimer in the documentation 
and/or other materials provided with the distribution.
+
+3. The end-user documentation included with the redistribution, if any, must 
include the following acknowledgment: 
+"This product includes software developed by 
<<var;name=organizationClause3;original=the Apache Software Foundation 
(http://www.apache.org/);match=.+>>." 
+Alternately, this acknowledgment may appear in the software itself, if and 
wherever such third-party acknowledgments normally appear.
+
+4. The <<var;name=organizationClause4;original="Apache" and "Apache Software 
Foundation";match=.+>> must not be used to endorse or promote products derived 
from this software without prior written permission. For written permission, 
please contact <<var;name=contactClause4;original=apa...@apache.org;match=.+>>
+
+5. Products derived from this software may not be called 
<<var;name=nameClause5;original="Apache" [ex. "Jakarta," "Apache," or "Apache 
Commons,"];match=.+>> nor may <<var;name=name2clause5;original="Apache" [ex. 
the names];match=.+>> appear in their name, without prior written permission of 
<<var;name=name3clause5;original=the Apache Software Foundation;match=.+>>.
+
+THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, 
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
<<var;name=copyrightHolderLiability;original=THE APACHE SOFTWARE FOUNDATION OR 
ITS CONTRIBUTORS;match=.+>> BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
PROCUREMENT OF SUBSTITUTE GOODS OR SERV [...]
+
+<<beginOptional;name=apacheOptionalAppendix>> This software consists of 
voluntary contributions made by many individuals on behalf of the Apache 
Software Foundation. For more information on the Apache Software Foundation, 
please see http://www.apache.org/. Portions of this software are based upon 
public domain software originally written at the National Center for 
Supercomputing Applications, University of Illinois, Urbana-Champaign. 
<<endOptional>>
\ No newline at end of file
diff --git a/t/SPDX/Apache-2.0.txt b/t/SPDX/Apache-2.0.txt
new file mode 100644
index 0000000..33666dd
--- /dev/null
+++ b/t/SPDX/Apache-2.0.txt
@@ -0,0 +1,73 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and 
distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the 
copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other 
entities that control, are controlled by, or are under common control with that 
entity. For the purposes of this definition, "control" means (i) the power, 
direct or indirect, to cause the direction or management of such entity, 
whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or 
more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising 
permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, 
including but not limited to software source code, documentation source, and 
configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or 
translation of a Source form, including but not limited to compiled object 
code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, 
made available under the License, as indicated by a copyright notice that is 
included in or attached to the work (an example is provided in the Appendix 
below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that 
is based on (or derived from) the Work and for which the editorial revisions, 
annotations, elaborations, or other modifications represent, as a whole, an 
original work of authorship. For the purposes of this License, Derivative Works 
shall not include works that remain separable from, or merely link (or bind by 
name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original 
version of the Work and any modifications or additions to that Work or 
Derivative Works thereof, that is intentionally submitted to Licensor for 
inclusion in the Work by the copyright owner or by an individual or Legal 
Entity authorized to submit on behalf of the copyright owner. For the purposes 
of this definition, "submitted" means any form of electronic, verbal, or 
written communication sent to the Licensor or it [...]
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf 
of whom a Contribution has been received by Licensor and subsequently 
incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this 
License, each Contributor hereby grants to You a perpetual, worldwide, 
non-exclusive, no-charge, royalty-free, irrevocable copyright license to 
reproduce, prepare Derivative Works of, publicly display, publicly perform, 
sublicense, and distribute the Work and such Derivative Works in Source or 
Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this 
License, each Contributor hereby grants to You a perpetual, worldwide, 
non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this 
section) patent license to make, have made, use, offer to sell, sell, import, 
and otherwise transfer the Work, where such license applies only to those 
patent claims licensable by such Contributor that are necessarily infringed by 
their Contribution(s) alone or by combin [...]
+
+4. Redistribution. You may reproduce and distribute copies of the Work or 
Derivative Works thereof in any medium, with or without modifications, and in 
Source or Object form, provided that You meet the following conditions:
+
+     (a) You must give any other recipients of the Work or Derivative Works a 
copy of this License; and
+
+     (b) You must cause any modified files to carry prominent notices stating 
that You changed the files; and
+
+     (c) You must retain, in the Source form of any Derivative Works that You 
distribute, all copyright, patent, trademark, and attribution notices from the 
Source form of the Work, excluding those notices that do not pertain to any 
part of the Derivative Works; and
+
+     (d) If the Work includes a "NOTICE" text file as part of its 
distribution, then any Derivative Works that You distribute must include a 
readable copy of the attribution notices contained within such NOTICE file, 
excluding those notices that do not pertain to any part of the Derivative 
Works, in at least one of the following places: within a NOTICE text file 
distributed as part of the Derivative Works; within the Source form or 
documentation, if provided along with the Derivative Wor [...]
+
+     You may add Your own copyright statement to Your modifications and may 
provide additional or different license terms and conditions for use, 
reproduction, or distribution of Your modifications, or for any such Derivative 
Works as a whole, provided Your use, reproduction, and distribution of the Work 
otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any 
Contribution intentionally submitted for inclusion in the Work by You to the 
Licensor shall be under the terms and conditions of this License, without any 
additional terms or conditions. Notwithstanding the above, nothing herein shall 
supersede or modify the terms of any separate license agreement you may have 
executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, 
trademarks, service marks, or product names of the Licensor, except as required 
for reasonable and customary use in describing the origin of the Work and 
reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in 
writing, Licensor provides the Work (and each Contributor provides its 
Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
KIND, either express or implied, including, without limitation, any warranties 
or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A 
PARTICULAR PURPOSE. You are solely responsible for determining the 
appropriateness of using or redistributing the [...]
+
+8. Limitation of Liability. In no event and under no legal theory, whether in 
tort (including negligence), contract, or otherwise, unless required by 
applicable law (such as deliberate and grossly negligent acts) or agreed to in 
writing, shall any Contributor be liable to You for damages, including any 
direct, indirect, special, incidental, or consequential damages of any 
character arising as a result of this License or out of the use or inability to 
use the Work (including but not limit [...]
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work 
or Derivative Works thereof, You may choose to offer, and charge a fee for, 
acceptance of support, warranty, indemnity, or other liability obligations 
and/or rights consistent with this License. However, in accepting such 
obligations, You may act only on Your own behalf and on Your sole 
responsibility, not on behalf of any other Contributor, and only if You agree 
to indemnify, defend, and hold each Contributor h [...]
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate 
notice, with the fields enclosed by brackets "[]" replaced with your own 
identifying information. (Don't include the brackets!)  The text should be 
enclosed in the appropriate comment syntax for the file format. We also 
recommend that a file or class name and description of purpose be included on 
the same "printed page" as the copyright notice for easier identification 
within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ 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