This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository licensecheck.
commit cdea51a4da57eaefa3245bf42e486fc638f4e56c
Author: Jonas Smedegaard <d...@jones.dk>
Date: Wed Nov 23 09:43:08 2016 +0100
Add new license patterns cube eurosym.
---
lib/App/Licensecheck.pm | 6 ++++++
lib/Regexp/Pattern/License.pm | 16 ++++++++++++++++
lib/Regexp/Pattern/License/Parts.pm | 15 +++++++++++++++
t/SPDX/Cube.txt | 17 +++++++++++++++++
t/SPDX/Eurosym.txt | 18 ++++++++++++++++++
5 files changed, 72 insertions(+)
diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index e0cc692..ccaf44e 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -938,6 +938,12 @@ sub parse_license
when ( /$L{re}{'zlib_acknowledgement'}/ ) {
$gen_license->('zlib_acknowledgement');
}
+ when ( /$L{re}{cube}/ ) {
+ $gen_license->('cube');
+ }
+ when ( /$L{re}{eurosym}/ ) {
+ $gen_license->('eurosym');
+ }
when ( /$L{re}{zlib}/ ) {
$gen_license->('zlib');
}
diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index 1a98778..18d6206 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -60,10 +60,14 @@ Patterns each covering a single license.
=item * cc_sp
+=item * cube
+
=item * curl
=item * dsdp
+=item * eurosym
+
=item * fsfap
=item * fsful
@@ -260,6 +264,12 @@ our %RE = (
pat =>
qr/(?:$P{cc}$SD(?:$P{cc_sp}|$P{cc_url}sampling\+))/,
},
+ cube => {
+ name => 'Cube',
+ tags => ['zlib'],
+ pat =>
+
qr/$P{origin_no_misrepresent}.*?$P{derive_altermark}.*?$P{retain_notice}.*?$P{derive_no_relicense}/,
+ },
curl => {
tags => ['mit'],
pat =>
@@ -270,6 +280,12 @@ our %RE = (
tags => ['mit'],
pat => qr/This program discloses material protectable/,
},
+ eurosym => {
+ name => 'Eurosym',
+ tags => ['zlib'],
+ pat =>
+
qr/$P{origin_no_misrepresent}.*?$P{derive_altermark}.*?$P{derive_share}.*?$P{retain_notice}/,
+ },
fsfap => {
name => 'FSFAP',
caption => 'FSF All Permissive',
diff --git a/lib/Regexp/Pattern/License/Parts.pm
b/lib/Regexp/Pattern/License/Parts.pm
index a849fd5..041b7af 100644
--- a/lib/Regexp/Pattern/License/Parts.pm
+++ b/lib/Regexp/Pattern/License/Parts.pm
@@ -49,6 +49,10 @@ Patterns each covering a single part, e.g. a clause or a
disclaimer phrase.
=item * derive_altermark
+=item * derive_no_relicense
+
+=item * derive_share
+
=item * discl
=item * origin_no_misrepresent
@@ -198,6 +202,17 @@ our %RE = (
tags => ['clause'],
pat => qr/$derive_altermark/,
},
+ derive_no_relicense => {
+ caption => 'deriving (no relicense)',
+ tags => ['clause'],
+ pat => qr/may not be "?relicensed"?/,
+ },
+ derive_share => {
+ caption => 'deriving (must share source)',
+ tags => ['clause'],
+ pat =>
+ qr/source code of the altered version of this software
available/,
+ },
discl => {
caption => 'disclaimer',
tags => ['component'],
diff --git a/t/SPDX/Cube.txt b/t/SPDX/Cube.txt
new file mode 100644
index 0000000..3a61403
--- /dev/null
+++ b/t/SPDX/Cube.txt
@@ -0,0 +1,17 @@
+Cube game engine source code, 20 dec 2003 release.
+
+Copyright (C) 2001-2003 Wouter van Oortmerssen.
+
+This software is provided 'as-is', without any express or implied warranty. In
no event will the authors be held liable for any damages arising from the use
of this software.
+
+Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it freely,
subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software in a
product, an acknowledgment in the product documentation would be appreciated
but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not
be misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+
+additional clause specific to Cube:
+
+ 4. Source versions may not be "relicensed" under a different license
without my explicitly written permission.
\ No newline at end of file
diff --git a/t/SPDX/Eurosym.txt b/t/SPDX/Eurosym.txt
new file mode 100644
index 0000000..2d2b659
--- /dev/null
+++ b/t/SPDX/Eurosym.txt
@@ -0,0 +1,18 @@
+Copyright (c) 1999-2002 Henrik Theiling
+Licence Version 2
+
+This software is provided 'as-is', without warranty of any kind, express or
implied. In no event will the authors or copyright holders be held liable for
any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it freely,
subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software in a
product, an acknowledgment in the product documentation would be appreciated.
+
+ 2. Altered source versions must be plainly marked as such, and must not
be misrepresented as being the original software.
+
+ 3. You must not use any of the names of the authors or copyright holders
of the original software for advertising or publicity pertaining to
distribution without specific, written prior permission.
+
+ 4. If you change this software and redistribute parts or all of it in any
form, you must make the source code of the altered version of this software
available.
+
+ 5. This notice may not be removed or altered from any source distribution.
+
+This licence is governed by the Laws of Germany. Disputes shall be settled by
Saarbruecken City Court.
\ 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
