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

checklicenses: Fix a FIXME 

We do not whitelist GPLv2 only code because of the
incompatibility with GPLv3.

Move the path exception to its proper place. These files are
dual-licensed in the sense of "choose one or the other", not
"both licenses are in use".

If the exception becomes unnecessary later it can be removed,
but let's get rid of the FIXME until then.

Change-Id: Ia040284b72c2ff6588b0544896cc37ae19a61613
Reviewed-on: https://code.wireshark.org/review/16957
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2016-08-08 16:48:14 +01:00 committed by João Valverde
parent b1cbeee4a6
commit e3009b0b1c
1 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tools/checklicenses.py
View File

@ -129,6 +129,9 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'epan/dissectors/packet-ieee80211-radiotap-iter.': [ # Using ISC license only
'ISC GPL (v2)'
],
'epan/dissectors/packet-ppi.c': [ # Using BSD (3 clause) license
'BSD (3 clause) GPL (v2)'
],
'plugins/mate/mate_grammar.h': [
'UNKNOWN',
],
@ -168,6 +171,40 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'ui/gtk/wireshark-gresources.c': [
'UNKNOWN',
],
# The airpcap code is using BSD (3 clause)
'epan/crypt/airpdcap_interop.h': [
'BSD (3 clause) GPL (v2)'
],
'epan/crypt/airpdcap_tkip.c': [
'BSD (3 clause) GPL (v2)'
],
'epan/crypt/airpdcap_ws.h': [
'BSD (3 clause) GPL (v2)'
],
'epan/crypt/wep-wpadefs.h': [
'BSD (3 clause) GPL (v2)'
],
'epan/crypt/airpdcap_system.h': [
'BSD (3 clause) GPL (v2)'
],
'epan/crypt/airpdcap_user.h': [
'BSD (3 clause) GPL (v2)'
],
'epan/crypt/airpdcap_ccmp.c': [
'BSD (3 clause) GPL (v2)'
],
'epan/crypt/airpdcap_int.h': [
'BSD (3 clause) GPL (v2)'
],
'epan/crypt/airpdcap.c': [
'BSD (3 clause) GPL (v2)'
],
'epan/crypt/airpdcap_debug.h': [
'BSD (3 clause) GPL (v2)'
],
'wsutil/airpdcap_wep.c': [
'BSD (3 clause) GPL (v2)'
],
}
# Files pre-existing prior to licensecheck upgrade to v2.16.2.
@ -191,18 +228,6 @@ FIXME_FILES = [
'doc/sshdump.pod',
'doc/tshark.pod',
'doc/wireshark.pod', # wireshark.pod.template
'epan/crypt/airpdcap_interop.h', # Whitelist 'BSD (3 clause) GPL (v2)'?
'epan/crypt/airpdcap_tkip.c',
'epan/crypt/airpdcap_ws.h',
'epan/crypt/wep-wpadefs.h',
'epan/crypt/airpdcap_system.h',
'epan/crypt/airpdcap_user.h',
'epan/crypt/airpdcap_ccmp.c',
'epan/crypt/airpdcap_int.h',
'epan/crypt/airpdcap.c',
'epan/crypt/airpdcap_debug.h',
'epan/dissectors/packet-ppi.c',
'wsutil/airpdcap_wep.c',
]