diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rwxr-xr-x | autogen.sh | 20 | ||||
| -rwxr-xr-x | doc/make-authors-format.pl | 22 | ||||
| -rwxr-xr-x | doc/make-authors-short.pl | 22 | ||||
| -rwxr-xr-x | doc/perlnoutf.pl | 24 | ||||
| -rwxr-xr-x | tools/checklicenses.py | 45 |
6 files changed, 116 insertions, 19 deletions
@@ -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 cbeb84af9a..364a6bd287 100755 --- 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 8c325d2d87..763b3e3984 100755 --- 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 ac96b0c264..229622d995 100755 --- 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 9f5580fa8c..e484a9e4af 100755 --- 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 ba8af699b4..c840565d7c 100755 --- 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', + ], } |