diff options
author | Dario Lombardo <lomato@gmail.com> | 2018-03-06 15:31:02 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-03-07 13:35:49 +0000 |
commit | 8a5385b9c9ec4ccfd692263eb7c59b09f9bc1a15 (patch) | |
tree | 168b19f922de6eafb9d21fb13d5893d9307816e6 /epan | |
parent | 830adb2a02c3ef5209bf79c933879b49b12b7902 (diff) |
More licenses converted to SPDX.
Change-Id: Id4f987dcdacf06622d70263f4659a4400e30dc39
Reviewed-on: https://code.wireshark.org/review/26332
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/asn1/Custom.make | 14 | ||||
-rw-r--r-- | epan/dissectors/packet-steam-ihs-discovery.c | 14 | ||||
-rw-r--r-- | epan/dissectors/packet-xra.c | 14 | ||||
-rw-r--r-- | epan/dissectors/x11-fields | 14 | ||||
-rw-r--r-- | epan/wslua/taps | 14 |
5 files changed, 5 insertions, 65 deletions
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. |