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

js pushed a commit to branch master
in repository licensecheck.

commit 77e66ee1d6d56e1d5b0d053b61f2def12392916c
Author: Jonas Smedegaard <d...@jones.dk>
Date:   Wed Sep 21 22:59:33 2016 +0200

    Detect licenses APAFML Adobe-Glyph Adobe-2006 Aladdin SIL FSFAP FSFUL 
FSFULLR JSON PostgreSQL Unicode-strict Unicode-TOU zlib-acknowledgement.
---
 lib/App/Licensecheck.pm | 124 ++++++++++++++++++++++++++++++++++++++++++++++++
 t/Software-License.t    |   2 +-
 2 files changed, 125 insertions(+), 1 deletion(-)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index 0e32a50..665aeff 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -623,6 +623,50 @@ sub parse_license
                }
        }
 
+       # APAFML
+       given ($licensetext) {
+               when ( /AFM files it accompanies may be used|that the AFM files 
are not distributed/ ) {
+                       $license = "Adobe Postscript AFM License $license";
+                       push @spdx_license, "APAFML";
+               }
+       }
+
+       # Adobe-Glyph
+       given ($licensetext) {
+               when ( /and to permit others to do the same, provided that the 
derived work is not represented as being a copy/ ) {
+                       $license = "Adobe Glyph List License $license";
+                       push @spdx_license, "Adobe-Glyph";
+               }
+       }
+
+       # Adobe-2006
+       given ($licensetext) {
+               when ( /You agree to indemnify, hold harmless and defend/ ) {
+                       $license = "Adobe $license";
+                       push @spdx_license, "Adobe-2006";
+               }
+       }
+
+       # Aladdin
+       given ($licensetext) {
+               when ( /This License is not the same as any of the GNU 
Licenses/ ) {
+                       $license = "Aladdin Free Public License $license";
+                       push @spdx_license, "Aladdin";
+               }
+               when ( /under the terms of the Aladdin Free Public License/ ) {
+                       $license = "Aladdin $license";
+                       push @spdx_license, "Aladdin";
+               }
+       }
+
+       # GPL or Aladdin
+       given ($licensetext) {
+               when ( /under the GNU License and Aladdin Free Public License/ 
) {
+                       $license = "GPL or Aladdin $license";
+                       push @spdx_license, "GPL or Aladdin";
+               }
+       }
+
        # Artistic
        given ($licensetext) {
                # either *begins* with "The Artistic license v2.0" (hopefully 
the actual license)
@@ -677,6 +721,46 @@ sub parse_license
                }
        }
 
+       # FSFAP
+       given ($licensetext) {
+               when ( /Copying and distribution of this file, with or without 
modification, are permitted in any medium without royalty provided the 
copyright notice and this notice are preserved/i ) {
+                       $license = "FSF All Permissive License $license";
+                       push @spdx_license, 'FSFAP';
+               }
+       }
+
+       # FSFUL
+       given ($licensetext) {
+               when ( /This configure script is free software; the Free 
Software Foundation gives unlimited permission to copy, distribute and modify 
it\./i ) {
+                       $license = "FSF Unlimited License $license";
+                       push @spdx_license, 'FSFUL';
+               }
+               when ( /This (\w+)(?: (?:file|script))? is free software; the 
Free Software Foundation gives unlimited permission to copy, distribute and 
modify it\./i ) {
+                       $license = "FSF Unlimited License ($1 derivation) 
$license";
+                       push @spdx_license, "FSFUL~$1";
+               }
+       }
+
+       # FSFULLR
+       given ($licensetext) {
+               when ( /This file is free software; the Free Software 
Foundation gives unlimited permission to copy and\/or distribute it, with or 
without modifications, as long as this notice is preserved/i ) {
+                       $license = "FSF Unlimited License (with License 
Retention, $1 derivation) $license";
+                       push @spdx_license, 'FSFULLR';
+               }
+               when ( /This (\w+)(?: (?:file|script))?  is free software; the 
Free Software Foundation gives unlimited permission to copy and\/or distribute 
it, with or without modifications, as long as this notice is preserved/i ) {
+                       $license = "FSF Unlimited License (with License 
Retention, $1 derivation) $license";
+                       push @spdx_license, "FSFULLR~$1";
+               }
+       }
+
+       # JSON
+       given ($licensetext) {
+               when ( /The Software shall be used for Good, not Evil/ ) {
+                       $license = "JSON License $license";
+                       push @spdx_license, "JSON";
+               }
+       }
+
        # PHP
        given ($licensetext) {
                when ( /This source file is subject to version ($ver_re) of the 
PHP license/ ) {
@@ -747,6 +831,14 @@ sub parse_license
                }
        }
 
+       # PostgreSQL
+       given ($licensetext) {
+               when ( /Permission to use, copy, modify, and distribute this 
software and its documentation for any purpose, without fee, and without a 
written agreement is hereby granted, provided that the above copyright notice 
and this paragraph and the following two paragraphs appear in all copies/i ) {
+                       $license = "PostgreSQL $license";
+                       push @spdx_license, 'PostgreSQL';
+               }
+       }
+
        # Python
        given ($licensetext) {
                when ( /PYTHON SOFTWARE FOUNDATION LICENSE(?:,? 
$ver_prefix_re($ver_re))?/i ) {
@@ -754,8 +846,40 @@ sub parse_license
                }
        }
 
+       # SIL
+       given ($licensetext) {
+               when ( /must be distributed using this license/i ) {
+                       $license = "SIL (v1.0) $license";
+                       push @spdx_license, 'SIL-1.0';
+               }
+               when ( /must be distributed entirely under this license/i ) {
+                       $license = "SIL (v1.1) $license";
+                       push @spdx_license, 'SIL-1.1';
+               }
+       }
+
+       # Unicode-strict
+       given ($licensetext) {
+               when ( /Unicode, Inc\. hereby grants the right to freely use 
the information supplied in this file in the creation of products supporting 
the Unicode Standard, and to make copies of this file in any form for internal 
or external distribution as long as this notice remains attached/i ) {
+                       $license = "Unicode strict $license";
+                       push @spdx_license, 'Unicode-strict';
+               }
+       }
+
+       # Unicode-TOU
+       given ($licensetext) {
+               when ( /Any person is hereby authorized, without fee, to view, 
use, reproduce, and distribute all documents and files solely for informational 
purposes in the creation of products supporting the Unicode Standard, subject 
to the Terms and Conditions herein/i ) {
+                       $license = "Unicode Terms of Use $license";
+                       push @spdx_license, 'Unicode-TOU';
+               }
+       }
+
        # Zlib/Libpng
        given ($licensetext) {
+               when ( /acknowledgment .* in the product documentation is 
required/ ) {
+                       $license = "zlib/libpng License with Acknowledgement 
$license";
+                       push @spdx_license, 'zlib-acknowledgement';
+               }
                when ( /The origin of this software must not be 
misrepresented.*Altered source versions must be plainly marked as such.*This 
notice may not be removed or altered from any source distribution/ ) {
                        $gen_license->('Zlib');
                }
diff --git a/t/Software-License.t b/t/Software-License.t
index 6d481ff..c33c9c1 100644
--- a/t/Software-License.t
+++ b/t/Software-License.t
@@ -26,7 +26,7 @@ my %LICENSES = (
        Artistic_2_0 => 'Artistic (v2.0)',
        Mozilla_1_0  => 'MPL (v1.0)',
        None         => 'UNKNOWN',
-       PostgreSQL   => 'UNKNOWN',
+       PostgreSQL   => 'PostgreSQL',
        AGPL_3       => 'AGPL (v3)',
        SSLeay       => 'BSD (2 clause)',
        Apache_1_1   => 'Apache (v1.1)',

-- 
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