Licensecheck improvements, just two errors left.

Spawned from https://www.wireshark.org/lists/wireshark-dev/201402/msg00024.html

Add some ignore rules for files that can't/shouldn't include a license header.

Reorganize some ignore rules to group rules with similar motivations.

Add a header to autogen.sh and attribute it to just "The Wireshark Authors"
since while Gilbert wrote the original version it's gone through so many changes
over the years that sorting out proper authorship is unnecessarily complex.

Add headers to Graeme Hewson's two files as verified by private email, and
update his address in the AUTHORS file per his request.

Add header to one of Ulf Lamping's files, as verified by private email.

Only remaining problem is the reedsolomon code.

Change-Id: Ifb7de8c4b4d79012553e29d459a0145d39f51df5
Reviewed-on: https://code.wireshark.org/review/145
Reviewed-by: Evan Huus <eapache@gmail.com>

diff --git a/AUTHORS b/AUTHORS
index 875862e69993627ae4ad814b91172e522ce79b5f..844e1bb3b5b63be4e34cfcbc6432b8b4235297f0 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1017,7 +1017,7 @@ Akira Endoh             <endoh[AT]netmarks.co.jp> {
        IGAP support
 }
 
-Graeme Hewson           <graeme.hewson[AT]oracle.com> {
+Graeme Hewson           <ghewson[AT]wormhole.me.uk> {
        Additional Ascend codes, and IETF codes, for Radius
        Fix various capture problems
        Add some sanity checks to DNS dissector to avoid loops

diff --git a/autogen.sh b/autogen.sh
index cbeb84af9abe73ef48c4bc181712d81ad152f1a3..364a6bd287e51341bd78ba621d8e5000875bf76f 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,25 @@
 #
 # Run this to generate all the initial makefiles.
 #
-# $Id$
+# Copyright 2014 The Wireshark Authors
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 DIE=true
 PROJECT="Wireshark"

diff --git a/doc/make-authors-format.pl b/doc/make-authors-format.pl
index 8c325d2d8732ef877ec4e90d8864af6990d5c94a..763b3e39849b7bd4b922ecb938ce5724d667161b 100755 (executable)
--- a/doc/make-authors-format.pl
+++ b/doc/make-authors-format.pl
@@ -1,9 +1,27 @@
-# $Id$
-
 # Convert AUTHORS-SHORT file for use in man page and HTML documentation
 # after processing through pod2man and pod2html.
 #
 # Must be called via perlnoutf.
+#
+# Copyright 2004 Graeme Hewson <ghewson@wormhole.me.uk>
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 

diff --git a/doc/make-authors-short.pl b/doc/make-authors-short.pl
index ac96b0c264e049942d5c7525dd437b08816577c5..229622d99572a0e460107da8daa0b5620e44296f 100755 (executable)
--- a/doc/make-authors-short.pl
+++ b/doc/make-authors-short.pl
@@ -1,9 +1,27 @@
-# $Id$
-
 # Remove tasks from individual author entries from AUTHORS file
 # for use in the about dialog.
 #
 # Must be called via perlnoutf.
+#
+# Copyright 2004 Ulf Lamping <ulf.lamping@web.de>
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 

diff --git a/doc/perlnoutf.pl b/doc/perlnoutf.pl
index 9f5580fa8c88fd2ff7e50bf4295d72edb42fccc0..e484a9e4af1d5f801a38097e755304b5182c3760 100755 (executable)
--- a/doc/perlnoutf.pl
+++ b/doc/perlnoutf.pl
@@ -1,10 +1,28 @@
 #!/usr/bin/perl -w
-
-# $Id$
-
 # Call another Perl script, passing our caller's arguments, with
 # environment variables unset so perl doesn't interpret bytes as UTF-8
 # characters.
+#
+# Copyright 2004 Graeme Hewson <ghewson@wormhole.me.uk>
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 
 use strict;
 

diff --git a/tools/checklicenses.py b/tools/checklicenses.py
index ba8af699b48ec2396938b6401148dd732106c494..c840565d7c9d7ecb06eaf1b46128155923805631 100755 (executable)
--- a/tools/checklicenses.py
+++ b/tools/checklicenses.py
@@ -127,6 +127,15 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
     'dtds': [
         'UNKNOWN',
     ],
+    'diameter/dictionary.dtd': [
+        'UNKNOWN',
+    ],
+    'wimaxasncp/dictionary.dtd': [
+        'UNKNOWN',
+    ],
+    'docbook/custom_layer_pdf.xsl': [
+        'UNKNOWN',
+    ],
     'fix': [
         'UNKNOWN',
     ],
@@ -142,34 +151,47 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
     'packaging/macosx': [
         'UNKNOWN',
     ],
-    'version.h': [
+    'epan/except.c': [
         'UNKNOWN',
     ],
-    'tools/lemon': [
+    'epan/except.h': [
         'UNKNOWN',
     ],
-    'epan/except.c': [
+    'cmake/TestFileOffsetBits.c': [
         'UNKNOWN',
     ],
-    'epan/except.h': [
+    'cmake/TestWindowsFSeek.c': [
         'UNKNOWN',
     ],
     'plugins/mate/mate_grammar.c': [
         'GPL (v2 or later) LGPL (v2 or later)', # licensecheck bug?
     ],
-    'plugins/mate/mate_grammar.h': [
+    # Generated header files by lex/yacc/whatever
+    'epan/dtd_grammar.h': [
         'UNKNOWN',
     ],
-    'cmake/TestFileOffsetBits.c': [
+    'epan/dfilter/grammar.h': [
         'UNKNOWN',
     ],
-    'cmake/TestWindowsFSeek.c': [
+    'plugins/mate/mate_grammar.h': [
+        'UNKNOWN',
+    ],
+    'version.h': [
         'UNKNOWN',
     ],
+    # 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
     'epan/dissectors/pidl/idl_types.h': [
-        # 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
+        'UNKNOWN',
+    ],
+    # Written by Ronnie Sahlberg and correctly licensed, but cannot include
+    # a license header despite the file extension as they need to be
+    # parsed by the pidl tool
+    'epan/dissectors/pidl/mapi/request.cnf.c': [
+        'UNKNOWN',
+    ],
+    'epan/dissectors/pidl/mapi/response.cnf.c': [
         'UNKNOWN',
     ],
     # The following tools are under incompatible licenses (mostly GPLv3 or
@@ -180,6 +202,9 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
     'tools/html2text.py': [
         'UNKNOWN',
     ],
+    'tools/lemon': [
+        'UNKNOWN',
+    ],
 }