osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

checklicenses: Remove whitelisted licenses not being used 

Removed a few licenses we shouldn't use (Apache v2, BSD 4-clause) and
removed many others not currently being used. (Add on a need-to basis).

Added GPLv3+ with Bison exception to licensecheck.pl.

Also removed some crud to work around bugs for older licensecheck.pl versions.

The original list came from the chromium project, which has a BSD-like license,
and many more licenses in use, not all of them vetted for GPLv2+ compatibility.

Change-Id: I67f334f21cd94904cf8a0e5d9beb659c82437df4
Reviewed-on: https://code.wireshark.org/review/16966
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2016-08-08 22:37:55 +01:00 committed by João Valverde
parent 8a141febc8
commit ba70b88419
2 changed files with 8 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
tools/checklicenses.py
View File

@ -54,73 +54,22 @@ Examples:
WHITELISTED_LICENSES = [
'Apache (v2.0)',
'Apache (v2.0) BSD (2 clause)',
'Apache (v2.0) GPL (v2)',
'Apple MIT', # https://fedoraproject.org/wiki/Licensing/Apple_MIT_License
'APSL (v2)',
'APSL (v2) BSD (4 clause)',
'BSD',
'BSD (2 clause)',
'BSD (2 clause) GPL (v2 or later)',
'BSD (2 clause) MIT/X11 (BSD like)',
'BSD (3 clause)',
'BSD (3 clause) ISC',
'BSD (3 clause) LGPL (v2 or later)',
'BSD (3 clause) LGPL (v2.1 or later)',
'BSD (3 clause) MIT/X11 (BSD like)',
'BSD (4 clause)',
'BSD-like',
# TODO(phajdan.jr): Make licensecheck not print BSD-like twice.
'BSD-like MIT/X11 (BSD like)',
'BSL (v1.0)',
'GPL (v2 or later)',
'GPL (v2 or later) with Bison parser exception',
'GPL (v2 or later) with libtool exception',
'GPL (v3 or later) with Bison parser exception',
'GPL with Bison parser exception',
'GPL (v3 or later) (with Bison parser exception)',
'ISC',
'ISC GPL (v2)',
'ISC GPL (v2 or later)',
'LGPL',
'LGPL (v2)',
'LGPL (v2 or later)',
'LGPL (v2.1)',
'LGPL (v3 or later)',
# TODO(phajdan.jr): Make licensecheck convert that comma to a dot.
'LGPL (v2,1 or later)',
'LGPL (v2.1 or later)',
'MPL (v1.0) LGPL (v2 or later)',
'MPL (v1.1)',
'MPL (v1.1) BSD-like',
'MPL (v1.1) BSD-like GPL (unversioned/unknown version)',
'MPL (v1.1,) BSD (3 clause) GPL (unversioned/unknown version) '
'LGPL (v2.1 or later)',
'MPL (v1.1) GPL (unversioned/unknown version)',
'MPL (v2.0)',
# TODO(phajdan.jr): Make licensecheck not print the comma after 1.1.
'MPL (v1.1,) GPL (unversioned/unknown version) LGPL (v2 or later)',
'MPL (v1.1,) GPL (unversioned/unknown version) LGPL (v2.1 or later)',
'MIT/X11 (BSD like)',
'Ms-PL',
'Public domain',
'Public domain BSD',
'Public domain BSD (3 clause)',
'Public domain BSD-like',
'Public domain GPL (v2 or later)',
'Public domain LGPL (v2.1 or later)',
'Public domain MIT/X11 (BSD like)',
'libpng',
'zlib/libpng',
'zlib/libpng GPL (v2 or later)',
'SGI Free Software License B',
'University of Illinois/NCSA Open Source License (BSD like)',
]
@ -149,12 +98,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'wsutil/g711.c': [
'UNKNOWN',
],
'wiretap/ascend.c': [
'GPL (v3 or later)',
],
'wiretap/ascend.h': [
'GPL (v3 or later)',
],
'packaging/macosx': [
'UNKNOWN',
],
@ -170,9 +113,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'cmake/TestWindowsFSeek.c': [
'UNKNOWN',
],
'plugins/mate/mate_grammar.c': [
'GPL (v2 or later) LGPL (v2 or later)', # licensecheck bug?
],
# Generated header files by lex/yacc/whatever
'epan/dtd_grammar.h': [
'UNKNOWN',
@ -186,6 +126,9 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'epan/dissectors/packet-dtn.c': [
'GPL (v2 or later) GPL (v2 or later)' # TODO: make licensecheck handle this better
],
'epan/dissectors/packet-ieee80211-radiotap-iter.': [ # Using ISC license only
'ISC GPL (v2)'
],
'plugins/mate/mate_grammar.h': [
'UNKNOWN',
],

4
tools/licensecheck.pl
View File

@ -633,6 +633,10 @@ sub parselicense {
$extrainfo = " (with Qt exception)$extrainfo"
}
if ($licensetext =~ /As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice/) {
$extrainfo = " (with Bison parser exception)$extrainfo";
}
# exclude blurb found in boost license text
if ($licensetext =~ /(All changes made in this file will be lost|DO NOT (EDIT|delete this file)|Generated (automatically|by|from)|generated.*file)/i
and $licensetext !~ /unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor/) {