Add a license-ignore for tools/html2text.py

Update the preamble to COPYING to clarify that pidl isn't the only tool we carry
which isn't GPLv2-compatible.

svn path=/trunk/; revision=53108

2 files changed, 17 insertions, 9 deletions

diff --git a/COPYING b/COPYING
index 402e57bbdc..ef930bb54d 100644
--- a/COPYING
+++ b/COPYING
@@ -19,19 +19,22 @@ Most parts of Wireshark are covered by a "GPL version 2 or later" license.
 Some files are covered by different licenses that are compatible with
 the GPLv2.
 
-As a notable exception the pidl utility at tools/pidl is covered by a
-"GPL version 3 or later" license. Note that only the tool itself
-is covered by this license, not the source code generated by it. The
-pidl authors do not consider generated code a derived work of pidl.
+As a notable exception, some utilities distributed with the Wireshark source are
+covered by other licenses that are not themselves directly compatible with the
+GPLv2. This is OK, as only the tools themselves are licensed this way, the
+output of the tools is not considered a derived work, and so can be safely
+licensed for Wireshark's use. An incomplete selection of these tools includes:
+ - the html2text utility (tools/html2text.py) is licensed under the GPLv3.
+ - the pidl utility (tools/pidl) is licensed under the GPLv3+.
 
 Parts of Wireshark can be built and distributed as libraries. These
 parts are still covered by the GPL, and NOT by the Lesser General Public
 License or any other license.
 
-If you integrate all or part of Wireshark into your own application, then 
+If you integrate all or part of Wireshark into your own application, then
 that application must be released under a license compatible with the GPL.
 
-The full text of the GNU GPL and the other applicable licenses follows.
+The full text of the GNU GPL and some of the other applicable licenses follows.
 
 ------------------------------------------------------------------------
 Part II:
diff --git a/tools/checklicenses.py b/tools/checklicenses.py
index 7c69ad9799..b70cde4ecf 100755
--- a/tools/checklicenses.py
+++ b/tools/checklicenses.py
@@ -130,9 +130,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
     'fix': [
         'UNKNOWN',
     ],
-    'tools/pidl': [
-        'UNKNOWN',
-    ],
     'wsutil/g711.c': [
         'UNKNOWN',
     ],
@@ -172,6 +169,14 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
         # https://www.wireshark.org/lists/wireshark-dev/201310/msg00234.html
         'UNKNOWN',
     ],
+    # The following tools are under incompatible licenses (mostly GPLv3 or
+    # GPLv3+), but this is OK since they are not actually linked into Wireshark
+    'tools/pidl': [
+        'UNKNOWN',
+    ],
+    'tools/html2text.py': [
+        'UNKNOWN',
+    ],
 }