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

js pushed a commit to branch master
in repository licensecheck.

commit 3bf07904cc95ffa8897a4188a925693312682b82
Author: Jonas Smedegaard <d...@jones.dk>
Date:   Sat Nov 26 12:55:54 2016 +0100

    Add license pattern ofl to Regexp::Pattern::License::Pattern.
---
 lib/App/Licensecheck.pm       |  9 +++-----
 lib/Regexp/Pattern/License.pm |  6 ++++++
 t/SPDX/OFL-1.0.txt            | 49 +++++++++++++++++++++++++++++++++++++++++++
 t/SPDX/OFL-1.1.txt            | 43 +++++++++++++++++++++++++++++++++++++
 4 files changed, 101 insertions(+), 6 deletions(-)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index 39011a9..1aef8f3 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -901,13 +901,10 @@ sub parse_license
                }
        }
 
-       # SIL
+       # OFL
        given ($licensetext) {
-               when ( /must be distributed using this license/i ) {
-                       $gen_license->( 'SIL', '1.0' );
-               }
-               when ( /must be distributed entirely under this license/i ) {
-                       $gen_license->( 'SIL', '1.1' );
+               when ( /$L{re}{ofl}(?:[ ,-]+$L{re}{version}{-keep})?/ ) {
+                       $gen_license->( 'ofl', $1 );
                }
        }
 
diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index 96b5370..fc6a1e7 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -573,6 +573,12 @@ END
                caption => 'Public domain',
                pat     => qr/$the?public domain/,
        },
+       ofl => {
+               name                     => 'OFL',
+               'caption.alt.org.debian' => 'SIL',
+               pat =>
+                       qr/$the?(?:SIL )?(?:OPEN FONT LICENSE|[Oo]pen [Ff]ont 
[Ll]icense)(?: \(OFL\))?/,
+       },
        python => {
                name    => 'Python',
                caption => 'PSF',
diff --git a/t/SPDX/OFL-1.0.txt b/t/SPDX/OFL-1.0.txt
new file mode 100644
index 0000000..95894a2
--- /dev/null
+++ b/t/SPDX/OFL-1.0.txt
@@ -0,0 +1,49 @@
+SIL OPEN FONT LICENSE
+
+Version 1.0 - 22 November 2005
+
+PREAMBLE 
+
+The goals of the Open Font License (OFL) are to stimulate worldwide 
development of cooperative font projects, to support the font creation efforts 
of academic and linguistic communities, and to provide an open framework in 
which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and 
redistributed freely as long as they are not sold by themselves. The fonts, 
including any derivative works, can be bundled, embedded, redistributed and 
sold with any software provided that the font names of derivative works are 
changed. The fonts and derivatives, however, cannot be released under any other 
type of license.
+
+DEFINITIONS 
+
+"Font Software" refers to any and all of the following:
+
+     - font files 
+     - data files 
+     - source code 
+     - build scripts 
+     - documentation 
+
+"Reserved Font Name" refers to the Font Software name as seen by users and any 
other names as specified after the copyright statement.
+
+"Standard Version" refers to the collection of Font Software components as 
distributed by the Copyright Holder.
+
+"Modified Version" refers to any derivative font software made by adding to, 
deleting, or substituting — in part or in whole -- any of the components of the 
Standard Version, by changing formats or by porting the Font Software to a new 
environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or 
other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
of the Font Software, to use, study, copy, merge, embed, modify, redistribute, 
and sell modified and unmodified copies of the Font Software, subject to the 
following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Standard 
or Modified Versions, may be sold by itself.
+
+2) Standard or Modified Versions of the Font Software may be bundled, 
redistributed and sold with any software, provided that each copy contains the 
above copyright notice and this license. These can be included either as 
stand-alone text files, human-readable headers or in the appropriate 
machine-readable metadata fields within text or binary files as long as those 
fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s), 
in part or in whole, unless explicit written permission is granted by the 
Copyright Holder. This restriction applies to all references stored in the Font 
Software, such as the font menu name and other font description fields, which 
are used to differentiate the font from others.
+
+4) The name(s) of the Copyright Holder or the Author(s) of the Font Software 
shall not be used to promote, endorse or advertise any Modified Version, except 
to acknowledge the contribution(s) of the Copyright Holder and the Author(s) or 
with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be 
distributed using this license, and may not be distributed under any other 
license.
+
+TERMINATION 
+
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER 
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, 
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, 
TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR 
ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, 
INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF 
CONTRACT, TORT OR OTHERWISE, ARISING FROM [...]
\ No newline at end of file
diff --git a/t/SPDX/OFL-1.1.txt b/t/SPDX/OFL-1.1.txt
new file mode 100644
index 0000000..181934d
--- /dev/null
+++ b/t/SPDX/OFL-1.1.txt
@@ -0,0 +1,43 @@
+SIL OPEN FONT LICENSE
+
+Version 1.1 - 26 February 2007
+
+PREAMBLE 
+
+The goals of the Open Font License (OFL) are to stimulate worldwide 
development of collaborative font projects, to support the font creation 
efforts of academic and linguistic communities, and to provide a free and open 
framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and 
redistributed freely as long as they are not sold by themselves. The fonts, 
including any derivative works, can be bundled, embedded, redistributed and/or 
sold with any software provided that any reserved names are not used by 
derivative works. The fonts and derivatives, however, cannot be released under 
any other type of license. The requirement for fonts to remain under this 
license does not apply to any document creat [...]
+
+DEFINITIONS 
+
+"Font Software" refers to the set of files released by the Copyright Holder(s) 
under this license and clearly marked as such. This may include source files, 
build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright 
statement(s).
+
+"Original Version" refers to the collection of Font Software components as 
distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or 
substituting — in part or in whole — any of the components of the Original 
Version, by changing formats or by porting the Font Software to a new 
environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or 
other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
of the Font Software, to use, study, copy, merge, embed, modify, redistribute, 
and sell modified and unmodified copies of the Font Software, subject to the 
following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original 
or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, 
redistributed and/or sold with any software, provided that each copy contains 
the above copyright notice and this license. These can be included either as 
stand-alone text files, human-readable headers or in the appropriate 
machine-readable metadata fields within text or binary files as long as those 
fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) 
unless explicit written permission is granted by the corresponding Copyright 
Holder. This restriction only applies to the primary font name as presented to 
the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font 
Software shall not be used to promote, endorse or advertise any Modified 
Version, except to acknowledge the contribution(s) of the Copyright Holder(s) 
and the Author(s) or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be 
distributed entirely under this license, and must not be distributed under any 
other license. The requirement for fonts to remain under this license does not 
apply to any document created using the Font Software.
+
+TERMINATION 
+
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER 
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, 
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, 
TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR 
ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, 
INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF 
CONTRACT, TORT OR OTHERWISE, ARISING FROM [...]
\ 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