[licensecheck] 56/112: Improve license detections artistic perl.
Jonas Smedegaard
dr at jones.dk
Fri Nov 25 22:01:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository licensecheck.
commit 9e3375887c08de14beb7a5f325e9f244bc4c2601
Author: Jonas Smedegaard <dr at jones.dk>
Date: Mon Nov 21 23:33:23 2016 +0100
Improve license detections artistic perl.
---
lib/App/Licensecheck.pm | 19 ++++---------------
t/SPDX.t | 1 +
t/SPDX/Artistic-1.0.txt | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index cd34881..ef78bca 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -755,23 +755,12 @@ sub parse_license
# Artistic
given ($licensetext) {
- # either *begins* with "The Artistic license v2.0" (hopefully the actual license)
- # or some license grant,
- when ( /(?:^ ?|(?:This is free software, licensed|Released|be used|use and modify this (?:module|software)) under (?:the terms of )?)$L{re}{artistic} v?($L{re}{version_number})/ ) {
- $gen_license->( 'artistic', $1 );
- }
- }
- given ($licensetext) {
- when ( /is free software under $L{re}{artistic}/ ) {
- $gen_license->('artistic');
- }
- }
-
- # Artistic or GPL
- given ($licensetext) {
- when ( /This (program )?is free software; you can redistribute it and\/or modify it under $L{re}{perl}/ ) {
+ when ( /$L{re}{perl}/ ) {
$gen_license->('perl');
}
+ when ( /$L{re}{artistic}(?:,? $L{re}{version}{-keep}(,? $L{re}{version_later_postfix})?)?/ ) {
+ $gen_license->('artistic', $1, $2);
+ }
}
# Apache
diff --git a/t/SPDX.t b/t/SPDX.t
index 489a5e0..f2588fa 100644
--- a/t/SPDX.t
+++ b/t/SPDX.t
@@ -13,6 +13,7 @@ my %Debian2SPDX = (
'AGPL-1' => 'AGPL-1.0',
'AGPL-3' => 'AGPL-3.0',
'AGPL-3+' => 'AGPL-3.0',
+ 'Artistic' => 'Artistic-1.0',
'BSD-2-clause' => 'BSD-2-Clause',
'BSD-3-clause' => 'BSD-3-Clause',
'BSD-4-clause' => 'BSD-4-Clause',
diff --git a/t/SPDX/Artistic-1.0.txt b/t/SPDX/Artistic-1.0.txt
new file mode 100644
index 0000000..fc6aea7
--- /dev/null
+++ b/t/SPDX/Artistic-1.0.txt
@@ -0,0 +1,49 @@
+The Artistic License
+
+Preamble
+
+The intent of this document is to state the conditions under which a Package may be copied, such that the Copyright Holder maintains some semblance of artistic control over the development of the package, while giving the users of the package the right to use and distribute the Package in a more-or-less customary fashion, plus the right to make reasonable modifications.
+
+Definitions:
+
+ "Package" refers to the collection of files distributed by the Copyright Holder, and derivatives of that collection of files created through textual modification.
+
+ "Standard Version" refers to such a Package if it has not been modified, or has been modified in accordance with the wishes of the Copyright Holder.
+
+ "Copyright Holder" is whoever is named in the copyright or copyrights for the package.
+
+ "You" is you, if you're thinking about copying or distributing this Package.
+
+ "Reasonable copying fee" is whatever you can justify on the basis of media cost, duplication charges, time of people involved, and so on. (You will not be required to justify it to the Copyright Holder, but only to the computing community at large as a market that must bear the fee.)
+
+ "Freely Available" means that no fee is charged for the item itself, though there may be fees involved in handling the item. It also means that recipients of the item may redistribute it under the same conditions they received it.
+
+1. You may make and give away verbatim copies of the source form of the Standard Version of this Package without restriction, provided that you duplicate all of the original copyright notices and associated disclaimers.
+
+2. You may apply bug fixes, portability fixes and other modifications derived from the Public Domain or from the Copyright Holder. A Package modified in such a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided that you insert a prominent notice in each changed file stating how and when you changed that file, and provided that you do at least ONE of the following:
+
+ a) place your modifications in the Public Domain or otherwise make them Freely Available, such as by posting said modifications to Usenet or an equivalent medium, or placing the modifications on a major archive site such as ftp.uu.net, or by allowing the Copyright Holder to include your modifications in the Standard Version of the Package.
+ b) use the modified Package only within your corporation or organization.
+ c) rename any non-standard executables so the names do not conflict with standard executables, which must also be provided, and provide a separate manual page for each non-standard executable that clearly documents how it differs from the Standard Version.
+ d) make other distribution arrangements with the Copyright Holder.
+
+4. You may distribute the programs of this Package in object code or executable form, provided that you do at least ONE of the following:
+
+ a) distribute a Standard Version of the executables and library files, together with instructions (in the manual page or equivalent) on where to get the Standard Version.
+ b) accompany the distribution with the machine-readable source of the Package with your modifications.
+ c) accompany any non-standard executables with their corresponding Standard Version executables, giving the non-standard executables non-standard names, and clearly documenting the differences in manual pages (or equivalent), together with instructions on where to get the Standard Version.
+ d) make other distribution arrangements with the Copyright Holder.
+
+5. You may charge a reasonable copying fee for any distribution of this Package. You may charge any fee you choose for support of this Package. You may not charge a fee for this Package itself. However, you may distribute this Package in aggregate with other (possibly commercial) programs as part of a larger (possibly commercial) software distribution provided that you do not advertise this Package as a product of your own.
+
+6. The scripts and library files supplied as input to or produced as output from the programs of this Package do not automatically fall under the copyright of this Package, but belong to whomever generated them, and may be sold commercially, and may be aggregated with this Package.
+
+7. C or perl subroutines supplied by you and linked into this Package shall not be considered part of this Package.
+
+8. The name of the Copyright Holder may not be used to endorse or promote products derived from this software without specific prior written permission.
+
+9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
\ 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
More information about the Pkg-perl-cvs-commits
mailing list