From 99d8439ce0db13a00e25e76eafca29150400fbec Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Wed, 6 Nov 2013 17:43:49 +0000 Subject: 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 --- COPYING | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'COPYING') 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: -- cgit v1.2.3