diff options
63 files changed, 63 insertions, 819 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 46677aea09..7f553b98f0 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -4,19 +4,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # include(CMakePushCheckState) diff --git a/autogen.sh b/autogen.sh index bb2902bb26..2923cb9caa 100755 --- a/autogen.sh +++ b/autogen.sh @@ -8,19 +8,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later DIE=true PROJECT="Wireshark" diff --git a/epan/dissectors/asn1/Custom.make b/epan/dissectors/asn1/Custom.make index 723454002b..cf2e020eb0 100644 --- a/epan/dissectors/asn1/Custom.make +++ b/epan/dissectors/asn1/Custom.make @@ -4,19 +4,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2006 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # Add custom asn1 directories here, the file is included by Makefile.am # Note you need to add a Custom.m4 file too. diff --git a/epan/dissectors/packet-steam-ihs-discovery.c b/epan/dissectors/packet-steam-ihs-discovery.c index e085406885..44581d146c 100644 --- a/epan/dissectors/packet-steam-ihs-discovery.c +++ b/epan/dissectors/packet-steam-ihs-discovery.c @@ -6,19 +6,7 @@ * 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. + * SPDX-License-Identifier: GPL-2.0-or-later */ /* Steam In-Home Streaming Discovery Protocol detects servers and negotiates diff --git a/epan/dissectors/packet-xra.c b/epan/dissectors/packet-xra.c index 3d20d35aab..458d4d16a0 100644 --- a/epan/dissectors/packet-xra.c +++ b/epan/dissectors/packet-xra.c @@ -6,19 +6,7 @@ * 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. + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/epan/dissectors/x11-fields b/epan/dissectors/x11-fields index 3bb5a4b838..7cdc14cd6b 100644 --- a/epan/dissectors/x11-fields +++ b/epan/dissectors/x11-fields @@ -7,19 +7,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # above-sibling UINT32 HEX diff --git a/epan/wslua/taps b/epan/wslua/taps index 745410499a..3ddd22f69c 100644 --- a/epan/wslua/taps +++ b/epan/wslua/taps @@ -7,19 +7,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2006 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. +# SPDX-License-Identifier: GPL-2.0-or-later # Each line is a tap type (the data structure passed by dissectors). # Elements are separated by whitespace. diff --git a/help/faq.py b/help/faq.py index d2df8c2f9b..2e90c5f949 100755 --- a/help/faq.py +++ b/help/faq.py @@ -10,19 +10,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later import sys import string diff --git a/image/stock_icons/svg-to-png.sh b/image/stock_icons/svg-to-png.sh index bcdfa0cf58..27ac8b864c 100755 --- a/image/stock_icons/svg-to-png.sh +++ b/image/stock_icons/svg-to-png.sh @@ -9,19 +9,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later COMMON_ARGS="--export-area-page" diff --git a/macosx-support-lib-patches/qt-fix-pc-file b/macosx-support-lib-patches/qt-fix-pc-file index 2567ead713..fa9ba54bd5 100755 --- a/macosx-support-lib-patches/qt-fix-pc-file +++ b/macosx-support-lib-patches/qt-fix-pc-file @@ -6,19 +6,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2014 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # Fix a single Qt .pc file to provide the right flags; a -F flag is # needed to point to the directory under which the frameworks are diff --git a/macosx-support-lib-patches/qt-fix-pc-files b/macosx-support-lib-patches/qt-fix-pc-files index 39fad414e8..87dc3966d5 100755 --- a/macosx-support-lib-patches/qt-fix-pc-files +++ b/macosx-support-lib-patches/qt-fix-pc-files @@ -6,19 +6,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2014 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # See bug QTBUG-35256 for the full painful story. Shorter version: # the macOS Qt packages provide the Qt components as frameworks, but @@ -10,19 +10,7 @@ # By Gerald Combs <gerald [AT] 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # The data below has been assembled from the following sources: # diff --git a/packaging/nsis/windeployqt-to-nsis.ps1 b/packaging/nsis/windeployqt-to-nsis.ps1 index 530d2785c2..8fed6baff0 100644 --- a/packaging/nsis/windeployqt-to-nsis.ps1 +++ b/packaging/nsis/windeployqt-to-nsis.ps1 @@ -9,19 +9,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later #requires -version 2 diff --git a/test/config.sh b/test/config.sh index 6b9d8f339d..4280905e86 100755 --- a/test/config.sh +++ b/test/config.sh @@ -6,19 +6,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2005 Ulf Lamping # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # The files we want to test are in the build directory. diff --git a/test/run_and_catch_crashes b/test/run_and_catch_crashes index f8b03dd4c1..690706a9ab 100755 --- a/test/run_and_catch_crashes +++ b/test/run_and_catch_crashes @@ -6,19 +6,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2015 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # Run the command we're passed in a subshell, so that said subshell will # catch any signals from it and report it. diff --git a/test/suite-clopts.sh b/test/suite-clopts.sh index 8a22ec226c..49189a35eb 100755 --- a/test/suite-clopts.sh +++ b/test/suite-clopts.sh @@ -6,19 +6,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2005 Ulf Lamping # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # common exit status values diff --git a/test/suite-decryption.sh b/test/suite-decryption.sh index 8f81812252..7f24143567 100755 --- a/test/suite-decryption.sh +++ b/test/suite-decryption.sh @@ -6,19 +6,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2005 Ulf Lamping # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # To do: diff --git a/test/suite-dissection.sh b/test/suite-dissection.sh index dc003fde08..6e78c2dbe7 100755 --- a/test/suite-dissection.sh +++ b/test/suite-dissection.sh @@ -5,19 +5,7 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # dissection_http2_data_reassembly_test() { diff --git a/test/suite-fileformats.sh b/test/suite-fileformats.sh index 19c7fc7b1f..f53cdad459 100755 --- a/test/suite-fileformats.sh +++ b/test/suite-fileformats.sh @@ -6,19 +6,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2005 Ulf Lamping # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # diff --git a/test/suite-io.sh b/test/suite-io.sh index cd762bbc3f..49caca66d6 100755 --- a/test/suite-io.sh +++ b/test/suite-io.sh @@ -6,19 +6,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2005 Ulf Lamping # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # diff --git a/test/suite-mergecap.sh b/test/suite-mergecap.sh index f2067a41b3..2e7d9b581b 100644 --- a/test/suite-mergecap.sh +++ b/test/suite-mergecap.sh @@ -5,19 +5,7 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # common checking code: diff --git a/test/suite-nameres.sh b/test/suite-nameres.sh index f27b3f022e..c4bd14fe5b 100755 --- a/test/suite-nameres.sh +++ b/test/suite-nameres.sh @@ -6,19 +6,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2005 Ulf Lamping # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # common exit status values diff --git a/test/suite-text2pcap.sh b/test/suite-text2pcap.sh index d987662b5f..7120f4d58e 100755 --- a/test/suite-text2pcap.sh +++ b/test/suite-text2pcap.sh @@ -5,19 +5,7 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # Regex used to prase capinfos output diff --git a/test/suite-unittests.sh b/test/suite-unittests.sh index 698b1670d6..38777db4f7 100755 --- a/test/suite-unittests.sh +++ b/test/suite-unittests.sh @@ -5,19 +5,7 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # unittests_step_test() { diff --git a/test/suite-wslua.sh b/test/suite-wslua.sh index 20745f449a..5580a69ea1 100755 --- a/test/suite-wslua.sh +++ b/test/suite-wslua.sh @@ -5,19 +5,7 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # wslua_step_dir_test() { diff --git a/test/test-backend.sh b/test/test-backend.sh index 05264b7a19..06419cde1a 100755 --- a/test/test-backend.sh +++ b/test/test-backend.sh @@ -6,19 +6,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2005 Ulf Lamping # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # diff --git a/test/test.sh b/test/test.sh index 375a647458..8aa4069da5 100755 --- a/test/test.sh +++ b/test/test.sh @@ -9,19 +9,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2005 Ulf Lamping # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # an existing capture file diff --git a/tools/Get-HardenFlags.ps1 b/tools/Get-HardenFlags.ps1 index 5f45cab3e8..0f1a028e59 100644 --- a/tools/Get-HardenFlags.ps1 +++ b/tools/Get-HardenFlags.ps1 @@ -7,19 +7,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later #requires -version 2 diff --git a/tools/compare-abis.sh b/tools/compare-abis.sh index a1cc48cdc3..b820c8bd8c 100755 --- a/tools/compare-abis.sh +++ b/tools/compare-abis.sh @@ -8,19 +8,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # Tested with abi-compliance-checker 1.96.1 diff --git a/tools/debian-nightly-package.sh b/tools/debian-nightly-package.sh index 045d662d01..ca56394322 100755 --- a/tools/debian-nightly-package.sh +++ b/tools/debian-nightly-package.sh @@ -4,19 +4,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later set -e diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh index 44abcf76c1..7202bbe286 100755 --- a/tools/debian-setup.sh +++ b/tools/debian-setup.sh @@ -5,19 +5,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # We drag in tools that might not be needed by all users; it's easier # that way. diff --git a/tools/delete_includes.py b/tools/delete_includes.py index 249b722668..15d24d1ce7 100755 --- a/tools/delete_includes.py +++ b/tools/delete_includes.py @@ -7,19 +7,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # diff --git a/tools/dftestlib/integer.py b/tools/dftestlib/integer.py index 4a148562a7..d47e837851 100755 --- a/tools/dftestlib/integer.py +++ b/tools/dftestlib/integer.py @@ -1,18 +1,6 @@ # Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu> # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later from dftestlib import dftest diff --git a/tools/dftestlib/time_type.py b/tools/dftestlib/time_type.py index 30b7ac2f61..49e9fc1d92 100755 --- a/tools/dftestlib/time_type.py +++ b/tools/dftestlib/time_type.py @@ -1,18 +1,6 @@ # Copyright (c) 2013 by Gilbert Ramirez <gram@alumni.rice.edu> # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later import os diff --git a/tools/ftsanity.py b/tools/ftsanity.py index 86ade1c71d..7f9c609a99 100755 --- a/tools/ftsanity.py +++ b/tools/ftsanity.py @@ -9,19 +9,7 @@ Check the sanity of field definitions in Wireshark. # 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. +# SPDX-License-Identifier: GPL-2.0-or-later import sys diff --git a/tools/fuzz-test.sh b/tools/fuzz-test.sh index 01bf3dda70..14981530be 100755 --- a/tools/fuzz-test.sh +++ b/tools/fuzz-test.sh @@ -13,19 +13,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later TEST_TYPE="fuzz" # shellcheck source=tools/test-common.sh diff --git a/tools/generate-nl80211-fields.py b/tools/generate-nl80211-fields.py index 24b21b7d17..4254eefd3f 100755 --- a/tools/generate-nl80211-fields.py +++ b/tools/generate-nl80211-fields.py @@ -8,19 +8,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # # To update the dissector source file, run this from the source directory: diff --git a/tools/generate-sysdig-event.py b/tools/generate-sysdig-event.py index 659bcb38f1..b0fcd8236a 100755 --- a/tools/generate-sysdig-event.py +++ b/tools/generate-sysdig-event.py @@ -5,19 +5,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # '''\ Generate Sysdig event dissector sections from the sysdig sources. diff --git a/tools/git-compare-abis.sh b/tools/git-compare-abis.sh index a455bee229..17a4c58fc0 100755 --- a/tools/git-compare-abis.sh +++ b/tools/git-compare-abis.sh @@ -8,19 +8,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later set -e diff --git a/tools/git-export-release.sh b/tools/git-export-release.sh index 233ab9f8fe..0e851ca5e7 100755 --- a/tools/git-export-release.sh +++ b/tools/git-export-release.sh @@ -8,19 +8,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # First paremeter, if set, is a git commit, like v1.12.0-rc1 or 54819e5699f # By default HEAD is used. diff --git a/tools/html2text.py b/tools/html2text.py index d59c86c192..22eb84d112 100755 --- a/tools/html2text.py +++ b/tools/html2text.py @@ -7,19 +7,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import unicode_literals diff --git a/tools/indexcap.py b/tools/indexcap.py index 5ab07de2c2..01c04231b5 100755 --- a/tools/indexcap.py +++ b/tools/indexcap.py @@ -10,19 +10,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # from optparse import OptionParser diff --git a/tools/install_rpms_for_devel.sh b/tools/install_rpms_for_devel.sh index c2362e70ff..7a2a7486e1 100755 --- a/tools/install_rpms_for_devel.sh +++ b/tools/install_rpms_for_devel.sh @@ -14,19 +14,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later if [ -r /etc/SuSE-release ] then diff --git a/tools/json2pcap/json2pcap.py b/tools/json2pcap/json2pcap.py index 0256698f29..0f9cebdc0b 100644 --- a/tools/json2pcap/json2pcap.py +++ b/tools/json2pcap/json2pcap.py @@ -8,19 +8,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later import sys import json diff --git a/tools/list_protos_in_cap.sh b/tools/list_protos_in_cap.sh index f2e24822da..0ddfdd193b 100755 --- a/tools/list_protos_in_cap.sh +++ b/tools/list_protos_in_cap.sh @@ -17,19 +17,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # Directory containing binaries. Default current directory. WS_BIN_PATH=${WS_BIN_PATH:-.} diff --git a/tools/macos-setup-brew.sh b/tools/macos-setup-brew.sh index 45ca995497..5b8e01fc2a 100755 --- a/tools/macos-setup-brew.sh +++ b/tools/macos-setup-brew.sh @@ -7,19 +7,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later #Update to last brew release brew update diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh index 30eb3d8928..c9dee2f8d0 100755 --- a/tools/macos-setup.sh +++ b/tools/macos-setup.sh @@ -8,19 +8,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # To install cmake diff --git a/tools/make-services.py b/tools/make-services.py index bc63d9e6c3..24562ffbd4 100755 --- a/tools/make-services.py +++ b/tools/make-services.py @@ -7,19 +7,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 2013 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. +# SPDX-License-Identifier: GPL-2.0-or-later iana_svc_url = 'http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.csv' diff --git a/tools/oss-fuzzshark/build.sh b/tools/oss-fuzzshark/build.sh index df31e7c0f2..c2bb5436a2 100755 --- a/tools/oss-fuzzshark/build.sh +++ b/tools/oss-fuzzshark/build.sh @@ -1,19 +1,7 @@ #!/bin/bash -eux # Copyright 2017 Google Inc. # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # List of dissectors compiled below, which should be turned off. # This is done to avoid single fuzzer (like IP) to call UDP protocols, which can go back to IP, and so on.. diff --git a/tools/parse_xml2skinny_dissector.py b/tools/parse_xml2skinny_dissector.py index f3e6799597..0ec1165226 100755 --- a/tools/parse_xml2skinny_dissector.py +++ b/tools/parse_xml2skinny_dissector.py @@ -16,19 +16,7 @@ # See: http://nedbatchelder.com/code/cog/ # # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # import re diff --git a/tools/pkt-from-core.py b/tools/pkt-from-core.py index f9cb6aa38e..c4638392a3 100755 --- a/tools/pkt-from-core.py +++ b/tools/pkt-from-core.py @@ -6,19 +6,7 @@ and save it in a packet-capture file. # Copyright (C) 2013 by Gilbert Ramirez <gram@alumni.rice.edu> # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later import getopt import os diff --git a/tools/pre-commit-ignore.py b/tools/pre-commit-ignore.py index e55d42b949..c0e1b63b2c 100755 --- a/tools/pre-commit-ignore.py +++ b/tools/pre-commit-ignore.py @@ -4,19 +4,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later import sys import os diff --git a/tools/release-update-debian-soversions.sh b/tools/release-update-debian-soversions.sh index 4dfd604c40..7c8f368053 100755 --- a/tools/release-update-debian-soversions.sh +++ b/tools/release-update-debian-soversions.sh @@ -8,19 +8,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # Set shared library package names and library versions in Debian packaging # matching the new major release's so versions diff --git a/tools/rpm_setup.sh b/tools/rpm_setup.sh index c52afbfde8..305c592aa9 100755 --- a/tools/rpm_setup.sh +++ b/tools/rpm_setup.sh @@ -5,19 +5,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # We drag in tools that might not be needed by all users; it's easier # that way. diff --git a/tools/test-captures.sh b/tools/test-captures.sh index 481e6c2cd9..c3e0d645bd 100755 --- a/tools/test-captures.sh +++ b/tools/test-captures.sh @@ -13,19 +13,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later TEST_TYPE="manual" # shellcheck source=tools/test-common.sh diff --git a/tools/test-common.sh b/tools/test-common.sh index c0490516bf..6195ca8795 100755 --- a/tools/test-common.sh +++ b/tools/test-common.sh @@ -6,19 +6,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # Common variables and functions for fuzz and randpkt tests. diff --git a/tools/textify.ps1 b/tools/textify.ps1 index 814555ae6b..90b9204acd 100755 --- a/tools/textify.ps1 +++ b/tools/textify.ps1 @@ -7,19 +7,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later #requires -version 2 diff --git a/tools/valgrind-wireshark.sh b/tools/valgrind-wireshark.sh index 57cff50723..1a28e17c0e 100755 --- a/tools/valgrind-wireshark.sh +++ b/tools/valgrind-wireshark.sh @@ -9,19 +9,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later # Directory containing tshark or wireshark. Default current directory. if [ -z "$WIRESHARK_BIN_DIR" ]; then diff --git a/tools/validate-diameter-xml.sh b/tools/validate-diameter-xml.sh index 98c496ff28..3fad9c8632 100755 --- a/tools/validate-diameter-xml.sh +++ b/tools/validate-diameter-xml.sh @@ -8,19 +8,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later if ! type -p sed > /dev/null then diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index 6403aa42de..c54fe989ce 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -7,19 +7,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later #requires -version 2 diff --git a/vagrant_build.sh b/vagrant_build.sh index 293755f577..7fdf682c76 100644 --- a/vagrant_build.sh +++ b/vagrant_build.sh @@ -6,19 +6,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later set -e diff --git a/vagrant_provision.sh b/vagrant_provision.sh index b993d0c2c6..a22695cf87 100644 --- a/vagrant_provision.sh +++ b/vagrant_provision.sh @@ -6,19 +6,7 @@ # 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. +# SPDX-License-Identifier: GPL-2.0-or-later set -e @@ -5,19 +5,7 @@ # By Gerald Combs <gerald [AT] 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. +# SPDX-License-Identifier: GPL-2.0-or-later # # The data below has been assembled from the following sources: # |