diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /tools/checklicenses.py | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tools/checklicenses.py')
| -rwxr-xr-x | tools/checklicenses.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/checklicenses.py b/tools/checklicenses.py index 192fecbe..b0a0ef02 100755 --- a/tools/checklicenses.py +++ b/tools/checklicenses.py @@ -37,7 +37,6 @@ ALLOWED_LICENSES = [ 'BSD (2 clause) GPL (v2 or later)', 'BSD (3 clause)', 'GPL (v2 or later)', - 'GPL (v3 or later) (with Bison parser exception)', 'ISC', 'ISC GPL (v2 or later)', 'LGPL (v2 or later)', @@ -73,15 +72,12 @@ PATH_SPECIFIC_ALLOWED_LICENSES = { 'doc/': [ 'UNKNOWN', ], - 'docbook/custom_layer_chm.xsl': [ + 'doc/custom_layer_chm.xsl': [ 'UNKNOWN', ], - 'docbook/custom_layer_single_html.xsl': [ + 'doc/custom_layer_single_html.xsl': [ 'UNKNOWN', ], - 'docbook/ws.css' : [ - 'UNKNOWN' - ], 'fix': [ 'UNKNOWN', ], @@ -122,7 +118,7 @@ PATH_SPECIFIC_ALLOWED_LICENSES = { ], # Special IDL license that appears to be compatible as far as I (not a # lawyer) can tell. See - # https://www.wireshark.org/lists/wireshark-dev/201310/msg00234.html + # https://lists.wireshark.org/archives/wireshark-dev/201310/msg00234.html 'epan/dissectors/pidl/idl_types.h': [ 'UNKNOWN', ], @@ -172,7 +168,7 @@ def check_licenses(options, args): 'licensecheck.pl')) licensecheck = subprocess.Popen([licensecheck_path, - '-l', '150', + '-l', '160', '-r', start_dir], stdout=subprocess.PIPE, stderr=subprocess.PIPE) |