Skip to content

Commit fb4d21a

Browse files
pombredannepombredanne
authored
Merge pull request #1456 from nexB/new-and-improved-license-rules-03-12
Improve license detection - Add new and improved rules and licenses - Add stopwords to license detection #1356 - Update test and code accordingly Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
2 parents 1d990a3 + 34c193a commit fb4d21a

1,196 files changed

Lines changed: 12234 additions & 17769 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎etc/scripts/genlicspdx.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@
5555
])
5656

5757

58+
NON_INTERESTING_KEYS=set([
59+
'other-copyleft',
60+
'other-permissive',
61+
])
62+
63+
5864
@click.command()
5965
@click.argument('license_dir',
6066
type=click.Path(file_okay=False, exists=True, writable=True,

‎src/licensedcode/data/licenses/adapt-1.0.LICENSE‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
Open Source Initiative OSI - Adaptive Public License 1.0
2-
31
ADAPTIVE PUBLIC LICENSE
42
Version 1.0
53
THE LICENSED WORK IS PROVIDED UNDER THE TERMS OF THIS ADAPTIVE PUBLIC LICENSE ("LICENSE"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE LICENSED WORK CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS LICENSE AND ITS TERMS, WHETHER OR NOT SUCH RECIPIENT READS THE TERMS OF THIS LICENSE. "LICENSED WORK" AND "RECIPIENT" ARE DEFINED BELOW.

‎src/licensedcode/data/licenses/afpl-9.0.LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ for the privilege of doing so.
3636
0. Subject Matter
3737
This License applies to the computer programs known as "AFPL Ghostscript",
3838
"AFPL Ghostscript PCL5e", "AFPL Ghostscript PCL5c", and "AFPL Ghostscript
39-
PXL".&nbsp; The "Program", below, refers to such program. The Program is
39+
PXL". The "Program", below, refers to such program. The Program is
4040
a copyrighted work whose copyright is held by Artifex Software Inc., located
4141
in San Rafael California and artofcode LLC, located in Benicia, California
4242
(the "Licensor"). Please note that AFPL Ghostscript is neither the program

‎src/licensedcode/data/licenses/bsd-3-clause-no-nuclear-warranty.LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Neither the name of Sun Microsystems, Inc. or the names of contributors
1313
may be used to endorse or promote products derived from this software
1414
without specific prior written permission.
1515

16-
This software is provided "AS IS," without a warranty of any kind. ALL
16+
THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT A WARRANTY OF ANY KIND. ALL
1717
EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING
1818
ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
1919
PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN MICROSYSTEMS, INC.

‎src/licensedcode/data/licenses/bsd-3-clause-sun.LICENSE‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
* Redistribution and use in source and binary forms, with or without
2+
* modification, are permitted provided that the following conditions are met:
3+
*
4+
* -Redistribution of source code must retain the above copyright notice, this
5+
* list of conditions and the following disclaimer.
6+
*
7+
* -Redistribution in binary form must reproduce the above copyright notice,
8+
* this list of conditions and the following disclaimer in the documentation
9+
* and/or other materials provided with the distribution.
10+
*
11+
* Neither the name of Sun Microsystems, Inc. or the names of contributors may
12+
* be used to endorse or promote products derived from this software without
13+
* specific prior written permission.
14+
*
15+
* This software is provided "AS IS," without a warranty of any kind. ALL
16+
* EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING
17+
* ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
18+
* OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN")
19+
* AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
20+
* AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
21+
* DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST
22+
* REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
23+
* INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY
24+
* OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
25+
* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

‎src/licensedcode/data/licenses/bsd-3-clause-sun.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
key: bsd-3-clause-sun
2+
short_name: BSD 3-Clause Sun
3+
name: BSD 3-Clause Sun
4+
category: Permissive
5+
owner: Oracle (Sun)
6+
notes: This is the same as the bsd-3-clause-no-nuclear-warranty but without
7+
the nuclear related terms. Rare and not exactly the same as a plain bsd.
8+
minimum_coverage: 90

‎src/licensedcode/data/licenses/bsd-artwork.LICENSE‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
This logo or a modified version may be used by anyone to refer to the
2+
project, but does not indicate endorsement by the project.
3+
4+
Redistribution and use in source (the SVG file) and binary forms
5+
(rendered PNG files etc.) of the image, with or without modification,
6+
are permitted provided that the following conditions are met:
7+
8+
Redistributions of source code must retain the above copyright notice
9+
and this list of conditions.
10+
11+
The names of the contributors to the softwaremay not be used to endorse or
12+
promote products derived from this software without specific prior written permission.

‎src/licensedcode/data/licenses/bsd-artwork.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
key: bsd-artwork
2+
short_name: BSD Artwork
3+
name: BSD Artwork License
4+
category: Permissive
5+
owner: Armin Ronacher
6+
homepage_url: http://flask.pocoo.org/docs/1.0/license/
7+
notes: this is a bsd-like license for ogos nd artwork without a disclaimer
8+
other_urls:
9+
- https://www.getlektor.com/license/

‎src/licensedcode/data/licenses/bsd-new-tcpdump.LICENSE‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
* Redistribution and use in source and binary forms, with or without
2+
* modification, are permitted provided that: (1) source code
3+
* distributions retain the above copyright notice and this paragraph
4+
* in its entirety, and (2) distributions including binary code include
5+
* the above copyright notice and this paragraph in its entirety in
6+
* the documentation or other materials provided with the distribution.
7+
* The name of author may not be used to endorse or
8+
* promote products derived from this software without specific prior
9+
* written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' AND
10+
* WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
11+
* LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
12+
* FOR A PARTICULAR PURPOSE.

‎src/licensedcode/data/licenses/bsd-new-tcpdump.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
key: bsd-new-tcpdump
2+
short_name: BSD-Modified tcpdump variant
3+
name: BSD-Modified tcpdump variant
4+
category: Permissive
5+
owner: tcpdump
6+
notes: |-
7+
This license is a custom variation on the BSD found in tcpdump

0 commit comments

Comments
 (0)