diff options
| author | Dario Lombardo <lomato@gmail.com> | 2018-02-07 12:26:45 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-02-08 14:57:36 +0000 |
| commit | 8cd389e16166fa4c075fbddfe69f26653a0169b3 (patch) | |
| tree | 1bea70a898b41c700cfe8f192dae3ba7e08b3626 /wiretap | |
| parent | bfd2dbcf25749d9f1481c479af4aab098069c303 (diff) | |
replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.
The first is deprecated, as per https://spdx.org/licenses/.
Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed
Reviewed-on: https://code.wireshark.org/review/25661
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wiretap')
120 files changed, 120 insertions, 120 deletions
diff --git a/wiretap/5views.c b/wiretap/5views.c index f47105977d..61e7bd78d3 100644 --- a/wiretap/5views.c +++ b/wiretap/5views.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/5views.h b/wiretap/5views.h index 6fe3fe28fe..395680f4ce 100644 --- a/wiretap/5views.h +++ b/wiretap/5views.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __5VIEWS_H__ diff --git a/wiretap/aethra.c b/wiretap/aethra.c index 1d08ab4ff7..bfe02042a2 100644 --- a/wiretap/aethra.c +++ b/wiretap/aethra.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/aethra.h b/wiretap/aethra.h index 73e8211999..26e8809600 100644 --- a/wiretap/aethra.h +++ b/wiretap/aethra.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_AETHRA_H__ diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h index ea7d47cc9f..0b7af0e679 100644 --- a/wiretap/ascend-int.h +++ b/wiretap/ascend-int.h @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __ASCEND_INT_H__ diff --git a/wiretap/ascend.y b/wiretap/ascend.y index 56f88b58de..0b527157b3 100644 --- a/wiretap/ascend.y +++ b/wiretap/ascend.y @@ -29,7 +29,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * -* SPDX-License-Identifier: GPL-2.0+ * +* SPDX-License-Identifier: GPL-2.0-or-later * */ /* diff --git a/wiretap/ascend_scanner.l b/wiretap/ascend_scanner.l index cba58e779e..0fb90184da 100644 --- a/wiretap/ascend_scanner.l +++ b/wiretap/ascend_scanner.l @@ -54,7 +54,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ #include <stdlib.h> #include <string.h> diff --git a/wiretap/ascendtext.c b/wiretap/ascendtext.c index 6792f87b0c..94d905e57c 100644 --- a/wiretap/ascendtext.c +++ b/wiretap/ascendtext.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/ascendtext.h b/wiretap/ascendtext.h index ad4b0866ee..607e87c678 100644 --- a/wiretap/ascendtext.h +++ b/wiretap/ascendtext.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/atm.c b/wiretap/atm.c index c6fc13ee22..cd7d2955e8 100644 --- a/wiretap/atm.c +++ b/wiretap/atm.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/atm.h b/wiretap/atm.h index e84b08f341..287fb2fbf1 100644 --- a/wiretap/atm.h +++ b/wiretap/atm.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __ATM_H__ diff --git a/wiretap/ber.c b/wiretap/ber.c index 75525a1b7e..1d0e87abf5 100644 --- a/wiretap/ber.c +++ b/wiretap/ber.c @@ -2,7 +2,7 @@ * * Basic Encoding Rules (BER) file reading * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/ber.h b/wiretap/ber.h index 9945a8fdbb..2c9ca05f19 100644 --- a/wiretap/ber.h +++ b/wiretap/ber.h @@ -2,7 +2,7 @@ * * Basic Encoding Rules (BER) file reading * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c index 2c7fd89da7..8bfb750e6c 100644 --- a/wiretap/btsnoop.c +++ b/wiretap/btsnoop.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/btsnoop.h b/wiretap/btsnoop.h index cd1c2e2cd1..e255d9b823 100644 --- a/wiretap/btsnoop.h +++ b/wiretap/btsnoop.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_BTSNOOP_H__ diff --git a/wiretap/camins.c b/wiretap/camins.c index 0d1ce001f7..1b3df7b48b 100644 --- a/wiretap/camins.c +++ b/wiretap/camins.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ /* CAM Inspector is a commercial log tool for DVB-CI diff --git a/wiretap/camins.h b/wiretap/camins.h index f4423c658c..d8b53b23e8 100644 --- a/wiretap/camins.h +++ b/wiretap/camins.h @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _CAMINS_H #define _CAMINS_H diff --git a/wiretap/capsa.c b/wiretap/capsa.c index e69303229f..0ba9dc233f 100644 --- a/wiretap/capsa.c +++ b/wiretap/capsa.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/capsa.h b/wiretap/capsa.h index fcb64c63c2..30906868ac 100644 --- a/wiretap/capsa.h +++ b/wiretap/capsa.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_CAPSA_H__ diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c index 3e609daf25..81fdd908b3 100644 --- a/wiretap/catapult_dct2000.c +++ b/wiretap/catapult_dct2000.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/catapult_dct2000.h b/wiretap/catapult_dct2000.h index 9b3748311d..b30002224f 100644 --- a/wiretap/catapult_dct2000.h +++ b/wiretap/catapult_dct2000.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * -* SPDX-License-Identifier: GPL-2.0+*/ +* SPDX-License-Identifier: GPL-2.0-or-later*/ #ifndef __W_CAT_DCT2K_H__ #define __W_CAT_DCT2K_H__ diff --git a/wiretap/commview.c b/wiretap/commview.c index e0b360e310..595b889793 100644 --- a/wiretap/commview.c +++ b/wiretap/commview.c @@ -8,7 +8,7 @@ * * Based on csids.c and nettl.c * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ /* A brief description of this file format is available at: * http://www.tamos.com/htmlhelp/commview/logformat.htm diff --git a/wiretap/commview.h b/wiretap/commview.h index a7e4e1eceb..c38df64971 100644 --- a/wiretap/commview.h +++ b/wiretap/commview.h @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __COMMVIEW_H__ #define __COMMVIEW_H__ diff --git a/wiretap/cosine.c b/wiretap/cosine.c index 4ff91f06b3..49bcb3a6db 100644 --- a/wiretap/cosine.c +++ b/wiretap/cosine.c @@ -6,7 +6,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/cosine.h b/wiretap/cosine.h index 6e50e7b659..80fca64402 100644 --- a/wiretap/cosine.h +++ b/wiretap/cosine.h @@ -6,7 +6,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/csids.c b/wiretap/csids.c index 80702cf74d..e864161572 100644 --- a/wiretap/csids.c +++ b/wiretap/csids.c @@ -3,7 +3,7 @@ * Copyright (c) 2000 by Mike Hall <mlh@io.com> * Copyright (c) 2000 by Cisco Systems * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/csids.h b/wiretap/csids.h index 6d06d2c401..365884ab63 100644 --- a/wiretap/csids.h +++ b/wiretap/csids.h @@ -3,7 +3,7 @@ * Copyright (c) 2000 by Mike Hall <mlh@io.com> * Copyright (c) Cisco Systems * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/daintree-sna.c b/wiretap/daintree-sna.c index 26cf289bd9..853e3e4134 100644 --- a/wiretap/daintree-sna.c +++ b/wiretap/daintree-sna.c @@ -11,7 +11,7 @@ * remains. Borrowed many snippets from dbs-etherwatch.c, the * daintree_sna_process_hex_data function having the largest chunk. * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ /* This module reads capture files saved by Daintree's Sensor Network Analyzer. * Daintree captures are plain text files with a two line header, diff --git a/wiretap/daintree-sna.h b/wiretap/daintree-sna.h index 278e4acbd2..1e2621b1b1 100644 --- a/wiretap/daintree-sna.h +++ b/wiretap/daintree-sna.h @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * -* SPDX-License-Identifier: GPL-2.0+ * +* SPDX-License-Identifier: GPL-2.0-or-later * */ #ifndef __DAINTREE_SNA_H__ diff --git a/wiretap/dbs-etherwatch.c b/wiretap/dbs-etherwatch.c index 37ed2d7979..8e33b7cf43 100644 --- a/wiretap/dbs-etherwatch.c +++ b/wiretap/dbs-etherwatch.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/dbs-etherwatch.h b/wiretap/dbs-etherwatch.h index 7497d74f8f..fcfd419a35 100644 --- a/wiretap/dbs-etherwatch.h +++ b/wiretap/dbs-etherwatch.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c index 478bb9a92d..4996d15327 100644 --- a/wiretap/dct3trace.c +++ b/wiretap/dct3trace.c @@ -9,7 +9,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * -* SPDX-License-Identifier: GPL-2.0+*/ +* SPDX-License-Identifier: GPL-2.0-or-later*/ #include "config.h" #include "wtap-int.h" diff --git a/wiretap/dct3trace.h b/wiretap/dct3trace.h index c0a26636e7..1c2b0c67ef 100644 --- a/wiretap/dct3trace.h +++ b/wiretap/dct3trace.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_DCT3TRACE_H__ diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c index 9457061047..e2e92b596c 100644 --- a/wiretap/eyesdn.c +++ b/wiretap/eyesdn.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/eyesdn.h b/wiretap/eyesdn.h index ef89d72071..98c6b32a0f 100644 --- a/wiretap/eyesdn.h +++ b/wiretap/eyesdn.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/file_access.c b/wiretap/file_access.c index d96e0d4ba2..c45270b971 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c index 2aff050826..4f426a20ec 100644 --- a/wiretap/file_wrappers.c +++ b/wiretap/file_wrappers.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /* file_access interface based heavily on zlib gzread.c and gzlib.c from zlib diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h index 869b174386..64e0b6b166 100644 --- a/wiretap/file_wrappers.h +++ b/wiretap/file_wrappers.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WTAP_FILE_WRAPPERS_H__ diff --git a/wiretap/hcidump.c b/wiretap/hcidump.c index 5813a89b9a..d0aad8f9f1 100644 --- a/wiretap/hcidump.c +++ b/wiretap/hcidump.c @@ -2,7 +2,7 @@ * * Copyright (c) 2003 by Marcel Holtmann <marcel@holtmann.org> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/hcidump.h b/wiretap/hcidump.h index f24cb8c78c..6d497303bb 100644 --- a/wiretap/hcidump.h +++ b/wiretap/hcidump.h @@ -2,7 +2,7 @@ * * Copyright (c) 2003 by Marcel Holtmann <marcel@holtmann.org> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c index 893991351c..52d4faa8c3 100644 --- a/wiretap/i4btrace.c +++ b/wiretap/i4btrace.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1999 by Bert Driehuis <driehuis@playbeing.org> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/i4btrace.h b/wiretap/i4btrace.h index fdd728dd09..450e227941 100644 --- a/wiretap/i4btrace.h +++ b/wiretap/i4btrace.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1999 by Bert Driehuis <driehuis@playbeing.org> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/ipfix.c b/wiretap/ipfix.c index ff61cd2cf5..ffb7e86613 100644 --- a/wiretap/ipfix.c +++ b/wiretap/ipfix.c @@ -7,7 +7,7 @@ * Copyright (c) 2010 by Hadriel Kaplan <hadrielk@yahoo.com> * with generous copying from other wiretaps, such as pcapng * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /* File format reference: diff --git a/wiretap/ipfix.h b/wiretap/ipfix.h index c9fb9326c8..55ecff76ba 100644 --- a/wiretap/ipfix.h +++ b/wiretap/ipfix.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 2010 by Hadriel Kaplan <hadrielk@yahoo.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_IPFIX_H__ diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index efbb014013..b8d9105b98 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ #include "config.h" diff --git a/wiretap/iptrace.h b/wiretap/iptrace.h index 0abcd8a0bf..32d012060a 100644 --- a/wiretap/iptrace.h +++ b/wiretap/iptrace.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/iseries.c b/wiretap/iseries.c index c07d4ed8e1..1e26400b92 100644 --- a/wiretap/iseries.c +++ b/wiretap/iseries.c @@ -5,7 +5,7 @@ * * Based on toshiba.c and vms.c * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/wiretap/iseries.h b/wiretap/iseries.h index b69b298118..4812e406fe 100644 --- a/wiretap/iseries.h +++ b/wiretap/iseries.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 2005 by Martin Warnes <martin@warnes.homeip.net> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_ISERIES_H__ diff --git a/wiretap/json.c b/wiretap/json.c index a84fdea9c6..a61ef121a3 100644 --- a/wiretap/json.c +++ b/wiretap/json.c @@ -2,7 +2,7 @@ * * Copyright 2015, Dario Lombardo <lomato@gmail.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/json.h b/wiretap/json.h index b757ab454f..0803ef0b73 100644 --- a/wiretap/json.h +++ b/wiretap/json.h @@ -2,7 +2,7 @@ * * Copyright 2015, Dario Lombardo <lomato@gmail.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/k12.c b/wiretap/k12.c index 07d4d458a5..784bb6734c 100644 --- a/wiretap/k12.c +++ b/wiretap/k12.c @@ -8,7 +8,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/k12.h b/wiretap/k12.h index 8f3c1f2bc2..7b4f06ff64 100644 --- a/wiretap/k12.h +++ b/wiretap/k12.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * -* SPDX-License-Identifier: GPL-2.0+*/ +* SPDX-License-Identifier: GPL-2.0-or-later*/ #ifndef __W_K12_H__ #define __W_K12_H__ diff --git a/wiretap/k12text.l b/wiretap/k12text.l index 2b41ac7f02..4ffc849ba9 100644 --- a/wiretap/k12text.l +++ b/wiretap/k12text.l @@ -79,7 +79,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ /* * TODO: diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 042dfd5dd7..12fd85f4bc 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/lanalyzer.h b/wiretap/lanalyzer.h index 013139ee57..8be6e2b2b5 100644 --- a/wiretap/lanalyzer.h +++ b/wiretap/lanalyzer.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __LANALYZER_H__ diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 5ddd37ff4f..77af997c19 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h index 48a647ea6d..643e611f73 100644 --- a/wiretap/libpcap.h +++ b/wiretap/libpcap.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_LIBPCAP_H__ diff --git a/wiretap/logcat.c b/wiretap/logcat.c index 7af15942ba..9e7e88a959 100644 --- a/wiretap/logcat.c +++ b/wiretap/logcat.c @@ -2,7 +2,7 @@ * * Copyright 2014, Michal Labedzki for Tieto Corporation * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/logcat.h b/wiretap/logcat.h index 5ad283c332..cf79e18f4f 100644 --- a/wiretap/logcat.h +++ b/wiretap/logcat.h @@ -2,7 +2,7 @@ * * Copyright 2014, Michal Labedzki for Tieto Corporation * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/logcat_text.c b/wiretap/logcat_text.c index 12925ef554..c4a5022987 100644 --- a/wiretap/logcat_text.c +++ b/wiretap/logcat_text.c @@ -3,7 +3,7 @@ * Copyright 2014, Michal Orynicz for Tieto Corporation * Copyright 2014, Michal Labedzki for Tieto Corporation * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/logcat_text.h b/wiretap/logcat_text.h index bd85b7965a..b7d9e53cdd 100644 --- a/wiretap/logcat_text.h +++ b/wiretap/logcat_text.h @@ -2,7 +2,7 @@ * * Copyright 2014, Michal Orynicz for Tieto Corporation * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/merge.c b/wiretap/merge.c index d6cf7be615..7d12ff4bbf 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -9,7 +9,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/merge.h b/wiretap/merge.h index 2059500619..aafbd81104 100644 --- a/wiretap/merge.h +++ b/wiretap/merge.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __MERGE_H__ diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c index 502bd1a91a..d5133d9214 100644 --- a/wiretap/mime_file.c +++ b/wiretap/mime_file.c @@ -12,7 +12,7 @@ * off to heuristic dissectors to try to identify the file's contents. * * Wiretap Library -* SPDX-License-Identifier: GPL-2.0+*/ +* SPDX-License-Identifier: GPL-2.0-or-later*/ #include "config.h" diff --git a/wiretap/mime_file.h b/wiretap/mime_file.h index 6641fce073..ddc36f8dc9 100644 --- a/wiretap/mime_file.h +++ b/wiretap/mime_file.h @@ -3,7 +3,7 @@ * MIME file format decoder for the Wiretap library. * * Wiretap Library - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_JPEG_JFIF_H__ diff --git a/wiretap/mp2t.c b/wiretap/mp2t.c index c6bf4e9a09..840fe34283 100644 --- a/wiretap/mp2t.c +++ b/wiretap/mp2t.c @@ -5,7 +5,7 @@ * Copyright 2012 Weston Schmidt * * Wiretap Library - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/mp2t.h b/wiretap/mp2t.h index a7d6869249..39f625282a 100644 --- a/wiretap/mp2t.h +++ b/wiretap/mp2t.h @@ -5,7 +5,7 @@ * Copyright 2012 Weston Schmidt * * Wiretap Library - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_MP2T_H__ diff --git a/wiretap/mpeg.c b/wiretap/mpeg.c index da7ccc509c..a00e0fbab2 100644 --- a/wiretap/mpeg.c +++ b/wiretap/mpeg.c @@ -5,7 +5,7 @@ * Copyright 2007 Shaun Jackman * * Wiretap Library - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/mpeg.h b/wiretap/mpeg.h index fe107e7687..76b7f1d000 100644 --- a/wiretap/mpeg.h +++ b/wiretap/mpeg.h @@ -5,7 +5,7 @@ * Copyright 2007 Shaun Jackman * * Wiretap Library - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_MPEG_H__ diff --git a/wiretap/mplog.c b/wiretap/mplog.c index 8ca5e3fc9c..0f63963332 100644 --- a/wiretap/mplog.c +++ b/wiretap/mplog.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/wiretap/mplog.h b/wiretap/mplog.h index e4c7743b81..13a57da37b 100644 --- a/wiretap/mplog.h +++ b/wiretap/mplog.h @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _MPLOG_H #define _MPLOG_H diff --git a/wiretap/netmon.c b/wiretap/netmon.c index d9b258bd58..0359fcd12f 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/netmon.h b/wiretap/netmon.h index d179dcb41b..0f92909866 100644 --- a/wiretap/netmon.h +++ b/wiretap/netmon.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __NETMON_H__ diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index 7f9a497018..bf10ab6ce8 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 2006 by Ravi Kondamuru <Ravi.Kondamuru@citrix.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/netscaler.h b/wiretap/netscaler.h index fb1d71db62..112457f19c 100644 --- a/wiretap/netscaler.h +++ b/wiretap/netscaler.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 2006 by Ravi Kondamuru <Ravi.Kondamuru@citrix.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _NETSCALER_H diff --git a/wiretap/netscreen.c b/wiretap/netscreen.c index 2bbd1258a7..e66297d2e9 100644 --- a/wiretap/netscreen.c +++ b/wiretap/netscreen.c @@ -7,7 +7,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/netscreen.h b/wiretap/netscreen.h index 1d815f6e19..51c02ee0ce 100644 --- a/wiretap/netscreen.h +++ b/wiretap/netscreen.h @@ -7,7 +7,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/nettl.c b/wiretap/nettl.c index e46c4c0198..d8ba4be23b 100644 --- a/wiretap/nettl.c +++ b/wiretap/nettl.c @@ -6,7 +6,7 @@ * Enhancements by Mark C. Brown <mbrown@hp.com> * Copyright (C) 2003, 2005 Hewlett-Packard Development Company, L.P. * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/nettl.h b/wiretap/nettl.h index 0142e98de8..a48a5bc0e1 100644 --- a/wiretap/nettl.h +++ b/wiretap/nettl.h @@ -6,7 +6,7 @@ * Enhancements by Mark C. Brown <mbrown@hp.com> * Copyright (C) 2003, 2005 Hewlett-Packard Development Company, L.P. * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __NETTL_H__ #define __NETTL_H__ diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c index 2775ad9771..e923475800 100644 --- a/wiretap/nettrace_3gpp_32_423.c +++ b/wiretap/nettrace_3gpp_32_423.c @@ -3,7 +3,7 @@ * Decoder for 3GPP TS 32.423 file format for the Wiretap library. * The main purpose is to have Wireshark decode raw message content (<rawMsg> tag). * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * Ref: http://www.3gpp.org/DynaReport/32423.htm */ diff --git a/wiretap/nettrace_3gpp_32_423.h b/wiretap/nettrace_3gpp_32_423.h index 8e86ad8554..bd07fbf38a 100644 --- a/wiretap/nettrace_3gpp_32_423.h +++ b/wiretap/nettrace_3gpp_32_423.h @@ -3,7 +3,7 @@ * MIME file format decoder for the Wiretap library. * * Wiretap Library - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __NETTRACE_3GPP_32_423__ diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 0bc0994c1e..baaf7533ea 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/netxray.h b/wiretap/netxray.h index 0d48a34910..7163a88f0f 100644 --- a/wiretap/netxray.h +++ b/wiretap/netxray.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __NETXRAY_H__ diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index d732f54eb0..fa28d13dce 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /* The code in ngsniffer.c that decodes the time fields for each packet in the diff --git a/wiretap/ngsniffer.h b/wiretap/ngsniffer.h index d70030b430..9b5ad7dd1f 100644 --- a/wiretap/ngsniffer.h +++ b/wiretap/ngsniffer.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __NGSNIFFER_H__ diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c index c8d8b80e3c..e262f3ae0c 100644 --- a/wiretap/packetlogger.c +++ b/wiretap/packetlogger.c @@ -9,7 +9,7 @@ * Based on commview.c, Linux's BlueZ-Gnome Analyzer program and hexdumps of * the output files from Apple's PacketLogger tool. * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/packetlogger.h b/wiretap/packetlogger.h index 19cf0b8476..5d11fb0564 100644 --- a/wiretap/packetlogger.h +++ b/wiretap/packetlogger.h @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * -* SPDX-License-Identifier: GPL-2.0+ * +* SPDX-License-Identifier: GPL-2.0-or-later * */ #ifndef __PACKETLOGGER_H__ diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index d99bdaf514..894c33fb4e 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -7,7 +7,7 @@ * File format support for pcapng file format * Copyright (c) 2007 by Ulf Lamping <ulf.lamping@web.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/pcap-common.h b/wiretap/pcap-common.h index ca4e3027ac..c376d435bb 100644 --- a/wiretap/pcap-common.h +++ b/wiretap/pcap-common.h @@ -7,7 +7,7 @@ * File format support for pcapng file format * Copyright (c) 2007 by Ulf Lamping <ulf.lamping@web.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_PCAP_COMMON_H__ diff --git a/wiretap/pcap-encap.h b/wiretap/pcap-encap.h index 03ecc3054f..d72ede2928 100644 --- a/wiretap/pcap-encap.h +++ b/wiretap/pcap-encap.h @@ -7,7 +7,7 @@ * File format support for pcapng file format * Copyright (c) 2007 by Ulf Lamping <ulf.lamping@web.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_PCAP_ENCAP_H__ diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 8933e96fe3..72398e8db3 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -6,7 +6,7 @@ * File format support for pcapng file format * Copyright (c) 2007 by Ulf Lamping <ulf.lamping@web.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /* File format specification: diff --git a/wiretap/pcapng.h b/wiretap/pcapng.h index 3c0ca7d4be..d065131981 100644 --- a/wiretap/pcapng.h +++ b/wiretap/pcapng.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_PCAPNG_H__ diff --git a/wiretap/pcapng_module.h b/wiretap/pcapng_module.h index 918f2189e8..9a869b8b67 100644 --- a/wiretap/pcapng_module.h +++ b/wiretap/pcapng_module.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __PCAP_MODULE_H__ diff --git a/wiretap/peekclassic.c b/wiretap/peekclassic.c index e929089fca..ba6836fe0f 100644 --- a/wiretap/peekclassic.c +++ b/wiretap/peekclassic.c @@ -18,7 +18,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" #include <errno.h> diff --git a/wiretap/peekclassic.h b/wiretap/peekclassic.h index 49eab0a675..d7e9290da5 100644 --- a/wiretap/peekclassic.h +++ b/wiretap/peekclassic.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c index 798bf8e0b6..4368a90988 100644 --- a/wiretap/peektagged.c +++ b/wiretap/peektagged.c @@ -15,7 +15,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" #include <errno.h> diff --git a/wiretap/peektagged.h b/wiretap/peektagged.h index 8dd12cff16..628a8bf501 100644 --- a/wiretap/peektagged.h +++ b/wiretap/peektagged.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_PEEKTAGGED_H__ diff --git a/wiretap/pppdump.c b/wiretap/pppdump.c index 3b1bc7a5dc..b6ad43f1fa 100644 --- a/wiretap/pppdump.c +++ b/wiretap/pppdump.c @@ -2,7 +2,7 @@ * * Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/pppdump.h b/wiretap/pppdump.h index 782fdc7b80..d9c37fa41d 100644 --- a/wiretap/pppdump.h +++ b/wiretap/pppdump.h @@ -2,7 +2,7 @@ * * Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/radcom.c b/wiretap/radcom.c index 71ee72210d..8583ef55a6 100644 --- a/wiretap/radcom.c +++ b/wiretap/radcom.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/radcom.h b/wiretap/radcom.h index b566127792..5d2194fd78 100644 --- a/wiretap/radcom.h +++ b/wiretap/radcom.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/snoop.c b/wiretap/snoop.c index 825d2399d5..dee9cc8b88 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/snoop.h b/wiretap/snoop.h index 4bf949fc1b..249257b995 100644 --- a/wiretap/snoop.h +++ b/wiretap/snoop.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_SNOOP_H__ diff --git a/wiretap/stanag4607.c b/wiretap/stanag4607.c index 743665032b..a89cd7daed 100644 --- a/wiretap/stanag4607.c +++ b/wiretap/stanag4607.c @@ -8,7 +8,7 @@ * * https://nso.nato.int/nso/zPublic/ap/aedp-7(2).pdf * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/stanag4607.h b/wiretap/stanag4607.h index 9092c25ac3..4b185aa190 100644 --- a/wiretap/stanag4607.h +++ b/wiretap/stanag4607.h @@ -2,7 +2,7 @@ * * STANAG 4607 file reading * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/tnef.c b/wiretap/tnef.c index 95cf6928d8..03720773b8 100644 --- a/wiretap/tnef.c +++ b/wiretap/tnef.c @@ -2,7 +2,7 @@ * * Transport-Neutral Encapsulation Format (TNEF) file reading * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/tnef.h b/wiretap/tnef.h index 3c324af226..3126727c11 100644 --- a/wiretap/tnef.h +++ b/wiretap/tnef.h @@ -2,7 +2,7 @@ * * Transport-Neutral Encapsulation Format (TNEF) file reading * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/toshiba.c b/wiretap/toshiba.c index 2472577009..8f824ec51c 100644 --- a/wiretap/toshiba.c +++ b/wiretap/toshiba.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/toshiba.h b/wiretap/toshiba.h index 0fbadc35c3..5bf95a8f9a 100644 --- a/wiretap/toshiba.h +++ b/wiretap/toshiba.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_TOSHIBA_H__ diff --git a/wiretap/visual.c b/wiretap/visual.c index fb4a502829..58f714240f 100644 --- a/wiretap/visual.c +++ b/wiretap/visual.c @@ -5,7 +5,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/visual.h b/wiretap/visual.h index befe8e9b7f..1af4c37738 100644 --- a/wiretap/visual.h +++ b/wiretap/visual.h @@ -8,7 +8,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __VISUAL_H__ diff --git a/wiretap/vms.c b/wiretap/vms.c index a9c9011202..6242d0cfbd 100644 --- a/wiretap/vms.c +++ b/wiretap/vms.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /* Notes: diff --git a/wiretap/vms.h b/wiretap/vms.h index e8a126925d..c061b43594 100644 --- a/wiretap/vms.h +++ b/wiretap/vms.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/vwr.c b/wiretap/vwr.c index 209c3e798b..180a01418f 100644 --- a/wiretap/vwr.c +++ b/wiretap/vwr.c @@ -4,7 +4,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ #include "config.h" diff --git a/wiretap/vwr.h b/wiretap/vwr.h index 4df3c33d17..63c652f969 100644 --- a/wiretap/vwr.h +++ b/wiretap/vwr.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998-2010 by Tom Alexander <talexander@ixiacom.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * */ diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h index ed277ee58f..0bf6279f0d 100644 --- a/wiretap/wtap-int.h +++ b/wiretap/wtap-int.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WTAP_INT_H__ diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 422c8c56e7..addc800095 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <config.h> diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 9dbe6fc4f0..ea33b1d42b 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * -* SPDX-License-Identifier: GPL-2.0+ */ +* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WTAP_H__ #define __WTAP_H__ diff --git a/wiretap/wtap_opttypes.c b/wiretap/wtap_opttypes.c index 11fbdadec9..34b779a470 100644 --- a/wiretap/wtap_opttypes.c +++ b/wiretap/wtap_opttypes.c @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wiretap/wtap_opttypes.h b/wiretap/wtap_opttypes.h index addcda3fc5..ade7079ad2 100644 --- a/wiretap/wtap_opttypes.h +++ b/wiretap/wtap_opttypes.h @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef WTAP_OPT_TYPES_H |