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>

diff --git a/capchild/capture_ifinfo.c b/capchild/capture_ifinfo.c
index ffcaacebee1bcaf32af7022ff4671841d160bfb3..0236d468beeb4c8ad3f6021cc09f21175929b36d 100644 (file)
--- a/capchild/capture_ifinfo.c
+++ b/capchild/capture_ifinfo.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/capchild/capture_session.h b/capchild/capture_session.h
index 3a915ffe5420a664ffe683f5ccb264ed74dc02e9..bdf1af362d8c82925c71b66e98e9508dd1cf5ccf 100644 (file)
--- a/capchild/capture_session.h
+++ b/capchild/capture_session.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 __CAPCHILD_CAPTURE_SESSION_H__
 #define __CAPCHILD_CAPTURE_SESSION_H__

diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
index ef5040d67fd041c285a8c958814461ca7e284e3f..a0c194ad6b60d8cfbbeb96dcdacb0cd03c4c8639 100644 (file)
--- a/capchild/capture_sync.c
+++ b/capchild/capture_sync.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/capchild/capture_sync.h b/capchild/capture_sync.h
index d51e531eb918f5a728bb8d26b76db313ed4e0832..6f419cc9dc22dbe3dc26c541b5b8517617e2867a 100644 (file)
--- a/capchild/capture_sync.h
+++ b/capchild/capture_sync.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*/
 
 
 /** @file

diff --git a/capinfos.c b/capinfos.c
index c3b0a7e50123d22e1cf30c2279587f8fa51499fd..58a7514ca9115dbe596cf27d75b4680c61e28f18 100644 (file)
--- a/capinfos.c
+++ b/capinfos.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/capture_info.c b/capture_info.c
index d0fed6b778ea1b10c795db2b84a8bb5ff100f304..f73b58bbef8c6b7ffb59549d183b66d3c1ba8ead 100644 (file)
--- a/capture_info.c
+++ b/capture_info.c
@@ -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
  */
 
 #include <config.h>

diff --git a/capture_info.h b/capture_info.h
index c01d1f8a7a387cd8e85c5253f07e457e6fd1287f..9f2bb4978d33ab49728e83acd8a0546623806c91 100644 (file)
--- a/capture_info.h
+++ b/capture_info.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
  */
 
 

diff --git a/capture_opts.c b/capture_opts.c
index a30485a3cf4859021b3614f623fc4441a8f92c23..5d6e84d64184cff84c3f69275939f7504bdeeb70 100644 (file)
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -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
  */
 
 #include <config.h>

diff --git a/capture_opts.h b/capture_opts.h
index 17c049c00a447798eb46bd4bd1f1483586ed0828..715a3bee90cf34855d1d8b1eb0907fd009a5c1a8 100644 (file)
--- a/capture_opts.h
+++ b/capture_opts.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
  */
 
 

diff --git a/capture_stop_conditions.c b/capture_stop_conditions.c
index 4765fb8d5b0bfe928a2790f638c3348ace9a0892..d1823fa174e401fe8a5dffb9d4e7e659feec7269 100644 (file)
--- a/capture_stop_conditions.c
+++ b/capture_stop_conditions.c
@@ -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
  */
 
 #include <config.h>

diff --git a/capture_stop_conditions.h b/capture_stop_conditions.h
index 2fe3bc6e48a113e2096d6a54ebf3c5b16b633245..274b4f8a8425c1cc1cbcf2bb2c23567760b559f1 100644 (file)
--- a/capture_stop_conditions.h
+++ b/capture_stop_conditions.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
  */
 
 void init_capture_stop_conditions(void);

diff --git a/captype.c b/captype.c
index c5e5a933341f1dd37b0d4168d209448acc7f54cb..b47a66ef2a9191f75722a70a5d0d51ff0ec350f8 100644 (file)
--- a/captype.c
+++ b/captype.c
@@ -8,7 +8,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/caputils/airpcap_loader.c b/caputils/airpcap_loader.c
index 916ef608632d9358a4f428197f9d5b7e2016b0de..e29996a22202c405a121913cdad710c9ae1c2521 100644 (file)
--- a/caputils/airpcap_loader.c
+++ b/caputils/airpcap_loader.c
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2000 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 

diff --git a/caputils/airpcap_loader.h b/caputils/airpcap_loader.h
index f47965c32fb86e29ba826fd0928fbbd6d027d351..23199366fad687051989781d7f47ed4e907f6867 100644 (file)
--- a/caputils/airpcap_loader.h
+++ b/caputils/airpcap_loader.h
@@ -8,7 +8,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 __AIRPCAP_LOADER_H__
 #define __AIRPCAP_LOADER_H__

diff --git a/caputils/capture-pcap-util-int.h b/caputils/capture-pcap-util-int.h
index 2993843c132a20ee95ff8283c9bcf01d1987707b..7d892c5c53d4a4d000a0d75d42683e3253ddcfd3 100644 (file)
--- a/caputils/capture-pcap-util-int.h
+++ b/caputils/capture-pcap-util-int.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 __PCAP_UTIL_INT_H__
 #define __PCAP_UTIL_INT_H__

diff --git a/caputils/capture-pcap-util-unix.c b/caputils/capture-pcap-util-unix.c
index a84670746cd8cdde979e91800d23e663aa016aa7..f2e494af7189cdc97014a0b0dfa86d235aa645c5 100644 (file)
--- a/caputils/capture-pcap-util-unix.c
+++ b/caputils/capture-pcap-util-unix.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c
index 393a8c3e6e3338a422d68cf88b2b85007b8bd757..faed73d0fe25c1e56c16714f514a1dc86e74b4d1 100644 (file)
--- a/caputils/capture-pcap-util.c
+++ b/caputils/capture-pcap-util.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/caputils/capture-pcap-util.h b/caputils/capture-pcap-util.h
index 2583f9890a2ab3d5c78c144c51ca66ce46387b13..5e5c6568d884ea5c4abe12901859aa4d3dc47e6e 100644 (file)
--- a/caputils/capture-pcap-util.h
+++ b/caputils/capture-pcap-util.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 __CAPTURE_PCAP_UTIL_H__
 #define __CAPTURE_PCAP_UTIL_H__

diff --git a/caputils/capture-wpcap.c b/caputils/capture-wpcap.c
index 321d645744f818c1a200f7318254030b38eac886..2dc75f6ba22b60e0041d81ce385c801cafbe3674 100644 (file)
--- a/caputils/capture-wpcap.c
+++ b/caputils/capture-wpcap.c
@@ -7,7 +7,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/caputils/capture-wpcap.h b/caputils/capture-wpcap.h
index ccb6bad820863051a31461aee6db722dd1212d5c..e0bbc44623588399a4d9ed68cbc3358bd5138120 100644 (file)
--- a/caputils/capture-wpcap.h
+++ b/caputils/capture-wpcap.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 CAPTURE_WPCAP_H
 #define CAPTURE_WPCAP_H

diff --git a/caputils/capture_ifinfo.h b/caputils/capture_ifinfo.h
index 0318e5907459b55290997e1f02e8e8ae6c0218b5..8e42b647610cd1dc212b09fe6184c6332ccdd13d 100644 (file)
--- a/caputils/capture_ifinfo.h
+++ b/caputils/capture_ifinfo.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 __CAPTURE_IFINFO_H__
 #define __CAPTURE_IFINFO_H__

diff --git a/caputils/capture_win_ifnames.h b/caputils/capture_win_ifnames.h
index 79d6f2915360189380aa7d8c2d3416078156b78f..8814258e0a9c26004c478424c565cb3ae2a893dd 100644 (file)
--- a/caputils/capture_win_ifnames.h
+++ b/caputils/capture_win_ifnames.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 CAPTURE_WIN_IFNAMES_H
 #define CAPTURE_WIN_IFNAMES_H

diff --git a/caputils/capture_wpcap_packet.c b/caputils/capture_wpcap_packet.c
index d1d4411e9b981089dd000770530a7f0c93446e1c..9db48e6b0ce0cfe3c9bf812140a6dd2a973a5547 100644 (file)
--- a/caputils/capture_wpcap_packet.c
+++ b/caputils/capture_wpcap_packet.c
@@ -8,7 +8,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/caputils/capture_wpcap_packet.h b/caputils/capture_wpcap_packet.h
index 1079d362bcf19fc4ac5b551b4478f6669de755ec..e4864132431a1b37511eb56311f044b750db0c18 100644 (file)
--- a/caputils/capture_wpcap_packet.h
+++ b/caputils/capture_wpcap_packet.h
@@ -5,7 +5,7 @@
  * Copyright 2001 Gerald Combs
  *
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef CAPTURE_WPCAP_PACKET_H
 #define CAPTURE_WPCAP_PACKET_H

diff --git a/caputils/iface_monitor.c b/caputils/iface_monitor.c
index 830007b199e1a14e31d41e9fb8d018086b93f838..672967e08c648e8d2da46a6887edcd430f7cf1c7 100644 (file)
--- a/caputils/iface_monitor.c
+++ b/caputils/iface_monitor.c
@@ -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*/
 
 #include <config.h>
 

diff --git a/caputils/iface_monitor.h b/caputils/iface_monitor.h
index c303a623e8ea6573d9c256e8d4f093f9410e37c9..11e80a9205c5a39fa23579a5792e141068e9a13f 100644 (file)
--- a/caputils/iface_monitor.h
+++ b/caputils/iface_monitor.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 IFACE_MONITOR_H
 #define IFACE_MONITOR_H
 

diff --git a/caputils/ws80211_utils.h b/caputils/ws80211_utils.h
index a1e394fc91384c7e728fec33946825c3fb90f67e..a8b28ccf365340e2c1594e9d475b9e243caab981 100644 (file)
--- a/caputils/ws80211_utils.h
+++ b/caputils/ws80211_utils.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 __WS80211_UTILS_H__
 #define __WS80211_UTILS_H__

diff --git a/cfile.c b/cfile.c
index 3e257c933fe33f89484b0a0207f4395bc21b7cc8..6de3b3d30cd305846e3a8ebe1ee3a396fe77064b 100644 (file)
--- a/cfile.c
+++ b/cfile.c
@@ -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
  */
 
 #include <config.h>

diff --git a/cfile.h b/cfile.h
index d1c4e379a75b79d9d68d1dc495636fe4087a532b..bc6f2bbddb58a99c7ba893f879ce1ff32ea5e7c1 100644 (file)
--- a/cfile.h
+++ b/cfile.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 __CFILE_H__

diff --git a/codecs/G711a/G711adecode.c b/codecs/G711a/G711adecode.c
index 1fd122b8201d7d8f318ac701e28fef5c8c07d3f2..2c4d9727cfbf38a963a125b856a902a3b974a3e6 100644 (file)
--- a/codecs/G711a/G711adecode.c
+++ b/codecs/G711a/G711adecode.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/codecs/G711a/G711adecode.h b/codecs/G711a/G711adecode.h
index 2d229a6d7142cfbbec9f0d3d2c4e074fb457214e..688d85d50d3b6d7ff9787ae05ca20b25c295ed2b 100644 (file)
--- a/codecs/G711a/G711adecode.h
+++ b/codecs/G711a/G711adecode.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 __CODECS_G711ADECODE_H__
 #define __CODECS_G711ADECODE_H__

diff --git a/codecs/G711a/G711atable.h b/codecs/G711a/G711atable.h
index ce74f199376da6989294bc0b5aa26a700d81c0e6..d4235ded748a45bc0014bdf6e63bef7aa2eb4274 100644 (file)
--- a/codecs/G711a/G711atable.h
+++ b/codecs/G711a/G711atable.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*/
 
 gint16 alaw_exp_table[256] = {
       -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736,

diff --git a/codecs/G711u/G711udecode.c b/codecs/G711u/G711udecode.c
index 4344d6399d28e12b8e52129817cdbe0c824c66c8..d235a3bc10c744a3c19411f62cd327e824611c31 100644 (file)
--- a/codecs/G711u/G711udecode.c
+++ b/codecs/G711u/G711udecode.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/codecs/G711u/G711udecode.h b/codecs/G711u/G711udecode.h
index 988cfa83db40401badfa78980faa9a9970bcb53f..dedf2bf45101c9c4939e5b7ed8540c506a46cf00 100644 (file)
--- a/codecs/G711u/G711udecode.h
+++ b/codecs/G711u/G711udecode.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 __CODECS_G711UDECODE_H__
 #define __CODECS_G711UDECODE_H__

diff --git a/codecs/G711u/G711utable.h b/codecs/G711u/G711utable.h
index ceb9df9ca987576ad1f0ebd1c53eb02d8649ee98..548dc3e573654147dedb8cd989621197b1f63dbf 100644 (file)
--- a/codecs/G711u/G711utable.h
+++ b/codecs/G711u/G711utable.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*/
 
 gint16 ulaw_exp_table[256] = {
    -32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956,

diff --git a/codecs/G722/G722decode.c b/codecs/G722/G722decode.c
index b9baa2a3ef5bb1cbc329c0e8df49f1fa5325f283..08c6473f2f2c3263ee46f7b32d85cfe222a140a9 100644 (file)
--- a/codecs/G722/G722decode.c
+++ b/codecs/G722/G722decode.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/codecs/G722/G722decode.h b/codecs/G722/G722decode.h
index c38e5f197a807c0c3af4febb0c75f9ce15ab7e40..1bf603b8ae6ea5fb2734d73f0f3f82a18fc5d0cd 100644 (file)
--- a/codecs/G722/G722decode.h
+++ b/codecs/G722/G722decode.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 __CODECS_G722DECODE_H__
 #define __CODECS_G722DECODE_H__

diff --git a/codecs/G726/G726decode.c b/codecs/G726/G726decode.c
index 3edfa09237ab453059b32a739eeeeddcef5a3439..1ed00667595f51974a49d6a03261372cf77548ab 100644 (file)
--- a/codecs/G726/G726decode.c
+++ b/codecs/G726/G726decode.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/codecs/G726/G726decode.h b/codecs/G726/G726decode.h
index b9bbce346bd0089bc9d598ec1df5edd5492dbc2b..4ae50d2c672b34d324d21c11389c322b34e9eb48 100644 (file)
--- a/codecs/G726/G726decode.h
+++ b/codecs/G726/G726decode.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 __CODECS_G726DECODE_H__
 #define __CODECS_G726DECODE_H__

diff --git a/codecs/G729/G729decode.c b/codecs/G729/G729decode.c
index b73e783692b45c10261d98005c04e231c8f8c72c..082a0704c6f5525242c43907caf5fdec5538c526 100644 (file)
--- a/codecs/G729/G729decode.c
+++ b/codecs/G729/G729decode.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/codecs/G729/G729decode.h b/codecs/G729/G729decode.h
index 36110329f3297dcb25bf83b174121cce495f07bd..d8a0870ca9b73a4c6e1e6f1fe9f16a8bcfe3a7c6 100644 (file)
--- a/codecs/G729/G729decode.h
+++ b/codecs/G729/G729decode.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 __CODECS_G729DECODE_H__
 #define __CODECS_G729DECODE_H__

diff --git a/codecs/codecs.c b/codecs/codecs.c
index 5188bfd3c9f9502444a50edcdb9f194190bcfa1c..4e5f542116eb053c648cbc09570ec88fe7b588da 100644 (file)
--- a/codecs/codecs.c
+++ b/codecs/codecs.c
@@ -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
  */
 
 #include "config.h"

diff --git a/codecs/codecs.h b/codecs/codecs.h
index 94dc474fb14edbbe44b37ec93b17ddedb9702341..7d2715418c10ee784d4eaca59fdd82a0088f6c68 100644 (file)
--- a/codecs/codecs.h
+++ b/codecs/codecs.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 _CODECS_H_
 #define _CODECS_H_

diff --git a/codecs/sbc/sbc.c b/codecs/sbc/sbc.c
index 809b0300b6d156814509ef6081e5b6ad2cdd612c..beb614b329fe6e69eb83cd9dae22381296911e48 100644 (file)
--- a/codecs/sbc/sbc.c
+++ b/codecs/sbc/sbc.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*/
 
 #include "config.h"
 

diff --git a/codecs/sbc/sbc_private.h b/codecs/sbc/sbc_private.h
index 1a2335729362cc5960337f7a511525d00227bc93..259a4f2acb904c3606cdb52f3fbac79f0b768147 100644 (file)
--- a/codecs/sbc/sbc_private.h
+++ b/codecs/sbc/sbc_private.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 __CODECS_SBC_H__
 #define __CODECS_SBC_H__

diff --git a/conditions.c b/conditions.c
index a5bf3cdc01908143a27e86a0923fffd7dbae0893..35a24bc6fb3caf08e22c9f3fc7f6fccd93a3041e 100644 (file)
--- a/conditions.c
+++ b/conditions.c
@@ -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
  */
 
 #include <config.h>

diff --git a/conditions.h b/conditions.h
index f19626745721c443dd5df5031f5a9d5d51300178..a0202b5184ef236ac1ad3c02899230c188a3b9b7 100644 (file)
--- a/conditions.h
+++ b/conditions.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 CONDITIONS_H

diff --git a/dftest.c b/dftest.c
index 4de107b04cff3396e47b2e15fefcf0b08b3cdc33..24e6002c1462ec271bace2934c39a2d1590e7269 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -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
  */
 
 #include <config.h>

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 333e356e2a91fe5664cd4993cd53c2cd13b1627b..c0cf6c11fc53764a5f1e760d2997fadd2a927f0a 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -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
 #
 
 add_custom_command(

diff --git a/doc/Makefile.am b/doc/Makefile.am
index fe517fe4cf05007f06ec69439310e04f013d44c4..5bcacb26c081dc17f05a3be81d982872dfd807b7 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -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
 #
 
 # We include dependencies on ../config.h in order to

diff --git a/doc/README.stats_tree b/doc/README.stats_tree
index 811dd754ed9600661a8c8e326ef0baeb95c03cf8..24d44799458a4b49f72bbeb92f822562b29d27c5 100644 (file)
--- a/doc/README.stats_tree
+++ b/doc/README.stats_tree
@@ -47,7 +47,7 @@ A small example of a very basic stats_tree plugin follows.
  * 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/doc/extcap_example.py b/doc/extcap_example.py
index a2ee6fb3b9d20a6e67a4fe7aef857fe5889972b7..6d1d1d32bcdb410de9b4f1dc54d8c6e4562bf62b 100755 (executable)
--- a/doc/extcap_example.py
+++ b/doc/extcap_example.py
@@ -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
 #
 
 """

diff --git a/doc/make-authors-format.pl b/doc/make-authors-format.pl
index 2c37dca54f7f47d2d6aa2fd7523d89b1d4d5ddb8..33d4a116a5f34afad5ccda4fe894da8acf90d07b 100755 (executable)
--- a/doc/make-authors-format.pl
+++ b/doc/make-authors-format.pl
@@ -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
 #
 
 use strict;

diff --git a/doc/make-authors-short.pl b/doc/make-authors-short.pl
index 00e23c3132748ae3b1147e207c6fa964513f95f0..5500bfd244c706fb4205cb79383a464bca7d60db 100755 (executable)
--- a/doc/make-authors-short.pl
+++ b/doc/make-authors-short.pl
@@ -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
 #
 
 use strict;

diff --git a/doc/packet-PROTOABBREV.c b/doc/packet-PROTOABBREV.c
index 8d564e473f3d2e07894444c3cf9b529407be78fe..69262e8acc65d6dae5fb4b0c6f8478a9bc57dde4 100644 (file)
--- a/doc/packet-PROTOABBREV.c
+++ b/doc/packet-PROTOABBREV.c
@@ -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
  */
 
 /*

diff --git a/doc/perlnoutf.pl b/doc/perlnoutf.pl
index a562f964a507f392076f6b385564bb93070cd75e..8a6fea33956abe4cedc68e59549969725cae3224 100755 (executable)
--- a/doc/perlnoutf.pl
+++ b/doc/perlnoutf.pl
@@ -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
 #
 
 use strict;

diff --git a/doc/plugins.example/Makefile.am b/doc/plugins.example/Makefile.am
index d33e1867572b9d7c3d9592ab54b634b9ab9c2039..10abf565e88cb3d27ed78fb208d6873c540aa949 100644 (file)
--- a/doc/plugins.example/Makefile.am
+++ b/doc/plugins.example/Makefile.am
@@ -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
 #
 
 WARNFLAGS = -Wall -Wextra

diff --git a/doc/plugins.example/hello.c b/doc/plugins.example/hello.c
index 455b4741a6ce3fad9c418655b2405bcba93c7055..52c4a50ec6c154c4a13e7c7620369712a7380d15 100644 (file)
--- a/doc/plugins.example/hello.c
+++ b/doc/plugins.example/hello.c
@@ -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
  */
 
 #ifdef HAVE_CONFIG_H

diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt
index 18f38b3b2ce43d427bf0654e57b14f1f5437881e..370c7077ad69d90b4fe3ebdf2e179e756e86a18f 100644 (file)
--- a/docbook/CMakeLists.txt
+++ b/docbook/CMakeLists.txt
@@ -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
 #
 
 find_package( LYNX )

diff --git a/docbook/make-wsluarm.pl b/docbook/make-wsluarm.pl
index 0393a168839fcc7abd9fa2242d339e651ff9d6ce..fdfd550553039c170b0249c369d95dc6cff1706b 100755 (executable)
--- a/docbook/make-wsluarm.pl
+++ b/docbook/make-wsluarm.pl
@@ -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
 #
 # (-: I don't even think writing this in Lua  :-)
 # ...well I wished you had!

diff --git a/dumpcap.c b/dumpcap.c
index eed5abba1b36f234d72fa3253b80d61f91c481f2..161219d46074a2bb5a2cfa7518e53fd05c2ce85a 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -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
  */
 
 #include <config.h>

diff --git a/editcap.c b/editcap.c
index 37fd3baa55a455d6e72a2aa38d1f63cb90ea2847..a5645b5ee8e65e52d7d69a1b1fec73d92faac937 100644 (file)
--- a/editcap.c
+++ b/editcap.c
@@ -12,7 +12,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/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
index ac30a8512cb2c8f5f1e4a45d8f42144ef478a954..88a26ee4148885137b4f7ffb7f89cc75b2896790 100644 (file)
--- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.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/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.h b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.h
index c2badb021ca8c2c02637e654d15ff15edbcaeb64..3495be91c34576e3e620dfac860be6b90b39b45e 100644 (file)
--- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.h
+++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.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 PACKET_LTE_RRC_H

diff --git a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
index 10eea2cd5332814ccbc8da44692a0531a461d8aa..ef2bdbaf2e4c10550233c0e20c0061f1e0211d1a 100644 (file)
--- a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
+++ b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
@@ -8,7 +8,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/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h
index 518a57b62d2b42c40ff6d26e852a73a3534e176f..2d5b8196448be70803a8080b652cbc1cede7f928 100644 (file)
--- a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h
+++ b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.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 PACKET_NR_RRC_H

diff --git a/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c b/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c
index 0e3549cbfaa3d8633b29e4770c1f413afb9ae40b..822409d39a61d911d4f286daa183564006fd1152 100644 (file)
--- a/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c
+++ b/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c
@@ -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
  *
  * Ref 3GPP TS 29.168
  */

diff --git a/epan/dissectors/dissectors.h b/epan/dissectors/dissectors.h
index 5cf9ed99710eefdad069c7d9eb4bce5064bfcb8d..5ff81d2005e0701d693450708ef6afa0c6cacb52 100644 (file)
--- a/epan/dissectors/dissectors.h
+++ b/epan/dissectors/dissectors.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 __DISSECTOR_REGISTER_H__

diff --git a/epan/dissectors/make-dissectors.c b/epan/dissectors/make-dissectors.c
index 514b1efef6216099b0b5db5daa26a22c53f22898..90d41bc55d4bc8cf720e7961fa59a493c6d1cef1 100644 (file)
--- a/epan/dissectors/make-dissectors.c
+++ b/epan/dissectors/make-dissectors.c
@@ -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
  */
 
 #include <stdlib.h>

diff --git a/epan/dissectors/packet-artemis.c b/epan/dissectors/packet-artemis.c
index 6b14187b09cf0398d85bcb952f6a35d026d3d366..146b736019a17ae7551c6df53ea33fe4e6b49a08 100644 (file)
--- a/epan/dissectors/packet-artemis.c
+++ b/epan/dissectors/packet-artemis.c
@@ -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
  *
  * Protocol information:
  * https://github.com/apache/activemq-artemis/blob/master/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java#L309-L326

diff --git a/epan/dissectors/packet-bacnet.h b/epan/dissectors/packet-bacnet.h
index bc4ae68881d268ae89daf338bf5ec0267ea47b4f..11d153dde6c35e383af1f4287f6f3a408b11cf32 100644 (file)
--- a/epan/dissectors/packet-bacnet.h
+++ b/epan/dissectors/packet-bacnet.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 __PACKET_BACNET_H__

diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c
index 3e6658e09131b699710cd61a89928e6a66dd4cb2..14583ee70e87c30f755ca21c9f4b43c087cec7dc 100644 (file)
--- a/epan/dissectors/packet-btmesh.c
+++ b/epan/dissectors/packet-btmesh.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
  *
  * Ref: Mesh Profile v1.0
  */

diff --git a/epan/dissectors/packet-caneth.c b/epan/dissectors/packet-caneth.c
index 04157d7afaee619c6d3d5dc65b097ae835168a54..56add4f1dfa8acaf0b14aed46073ec88f76c7ede 100644 (file)
--- a/epan/dissectors/packet-caneth.c
+++ b/epan/dissectors/packet-caneth.c
@@ -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
  */
 
 /*

diff --git a/epan/dissectors/packet-cvspserver.c b/epan/dissectors/packet-cvspserver.c
index 3954d1bb27dc86a3b617181c38f4dd7e88853d26..90cbdca796354107f7f3924c0433aefafae2fadc 100644 (file)
--- a/epan/dissectors/packet-cvspserver.c
+++ b/epan/dissectors/packet-cvspserver.c
@@ -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
  */
 
 #include "config.h"

diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 67c3414af03c7ec3b239c8db2d58a44dc7def4ce..e55a4deae9841011e658f294d544a9ae5a10a859 100644 (file)
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -15,7 +15,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/epan/dissectors/packet-lnet.c b/epan/dissectors/packet-lnet.c
index 7aa4f0753315aed7c5c725e5264951644fc3086b..1fad311b6e004c83ee15ef6ece17c9ffc3ec4e62 100644 (file)
--- a/epan/dissectors/packet-lnet.c
+++ b/epan/dissectors/packet-lnet.c
@@ -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
  */
 
 /*

diff --git a/epan/dissectors/packet-lnet.h b/epan/dissectors/packet-lnet.h
index f57d2a8131aac3c6c6a7e26346ccffb4d895318a..6093c7e11657d1299a0430304c8443bc1892fb47 100644 (file)
--- a/epan/dissectors/packet-lnet.h
+++ b/epan/dissectors/packet-lnet.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 __PACKET_LNET_H__
 #define __PACKET_LNET_H__

diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 0bd2f6c4755b32bd368aa5dd6b2c28e012aea335..71ad21350da78988a8930b21a6de7b4303e5664a 100644 (file)
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -17,7 +17,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/epan/dissectors/packet-lte-rrc.h b/epan/dissectors/packet-lte-rrc.h
index 254ce07ea5c36d1395eff88fd8e14af01979e956..cccbc26114a3e433627f1a8041417ea7ae952b3c 100644 (file)
--- a/epan/dissectors/packet-lte-rrc.h
+++ b/epan/dissectors/packet-lte-rrc.h
@@ -13,7 +13,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 PACKET_LTE_RRC_H

diff --git a/epan/dissectors/packet-lustre.c b/epan/dissectors/packet-lustre.c
index 4aa999d9f4f658d656fcf262bce98393299b7dd5..60ae5e89e3fba5e53135f1c1ee222bb30f34c1f1 100644 (file)
--- a/epan/dissectors/packet-lustre.c
+++ b/epan/dissectors/packet-lustre.c
@@ -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
  */
 
 /*

diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c
index eaeb68b4314990b0778df78904b0456681531da4..980779a421fec1ede3a3cee0cbf09d1339aa6de5 100644 (file)
--- a/epan/dissectors/packet-nas_eps.c
+++ b/epan/dissectors/packet-nas_eps.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
  *
  * References: 3GPP TS 24.301 V15.1.1 (2017-12)
  */

diff --git a/epan/dissectors/packet-nr-rrc.c b/epan/dissectors/packet-nr-rrc.c
index 10c31f8e7148cdd9e8b5c37836b3f8a273fdb9cd..1fff4a5a756be8ac5541b4a15ed99f6fe9b24407 100644 (file)
--- a/epan/dissectors/packet-nr-rrc.c
+++ b/epan/dissectors/packet-nr-rrc.c
@@ -16,7 +16,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/epan/dissectors/packet-nr-rrc.h b/epan/dissectors/packet-nr-rrc.h
index 57d4204b141eed1ce32ccab74176b95d66ac9dd8..3f1de1435ab04c04de3a25519d24a4a63ecd6fae 100644 (file)
--- a/epan/dissectors/packet-nr-rrc.h
+++ b/epan/dissectors/packet-nr-rrc.h
@@ -13,7 +13,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 PACKET_NR_RRC_H

diff --git a/epan/dissectors/packet-nxp_802154_sniffer.c b/epan/dissectors/packet-nxp_802154_sniffer.c
index b21172e7d9d1fa20516e3d1695c2882ce5b13648..b9ed391bba2a192a74bd4c24c1412bdeebd07394 100644 (file)
--- a/epan/dissectors/packet-nxp_802154_sniffer.c
+++ b/epan/dissectors/packet-nxp_802154_sniffer.c
@@ -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
  */
 
 /*

diff --git a/epan/dissectors/packet-sbc-ap.c b/epan/dissectors/packet-sbc-ap.c
index 8757d69a6e4013f62b417c0fd8cba79c02a0bab5..acea7f98637d996fd65a56946d7b7d1076e747be 100644 (file)
--- a/epan/dissectors/packet-sbc-ap.c
+++ b/epan/dissectors/packet-sbc-ap.c
@@ -13,7 +13,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
  *
  * Ref 3GPP TS 29.168
  */

diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index bd9466ee3c544e5dc82a1b15448e88f443566c10..ab379a54fe97ed017a1b40347702d38bfb2cefce 100644 (file)
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -15,7 +15,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/epan/dissectors/packet-smp.c b/epan/dissectors/packet-smp.c
index bf2ad34d023292ec8defd41291b9c3cafeaf53ce..63ae6fc8acb50c77c6c69aea303cd2707ce1e7f8 100644 (file)
--- a/epan/dissectors/packet-smp.c
+++ b/epan/dissectors/packet-smp.c
@@ -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
  */
 
 /*

diff --git a/epan/dissectors/packet-thrift.c b/epan/dissectors/packet-thrift.c
index 6793a77b2227019ab34e26efdeb05981efb2ddd4..8ad5d48c9c4f9ef028a36778072107dc012421e2 100644 (file)
--- a/epan/dissectors/packet-thrift.c
+++ b/epan/dissectors/packet-thrift.c
@@ -11,7 +11,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
  */
  /* Ref https://thrift.apache.org/developers */
 

diff --git a/epan/dissectors/packet-thrift.h b/epan/dissectors/packet-thrift.h
index ce965ee656be9b9c58e286f29469481b4fcd9cf9..3e4b208783dbb42566ebe3b23564423b8c1de817 100644 (file)
--- a/epan/dissectors/packet-thrift.h
+++ b/epan/dissectors/packet-thrift.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
 *
 * Note used by proprietarry dissectors (too).
 */

diff --git a/epan/epan.c b/epan/epan.c
index 0806a231419606ed9c857009240157d2a2466ec1..3a1d79df33173fbc630f5df2eb1a3f6334a6fb38 100644 (file)
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 2001 by Gerald Combs <gerald@wireshark.org>
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"

diff --git a/epan/packet.c b/epan/packet.c
index 1e7ae97708b7535789dab21d86e6de7efb52a37a..f98b09f884891f74dcfc2bd29a1a3112656ed68d 100644 (file)
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -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
  */
 
 #include "config.h"

diff --git a/epan/packet.h b/epan/packet.h
index e96375e5095f7f09e12504595dae817878ccdbe7..6582d8987d68e8535a402ac3e549e41bb2f6577e 100644 (file)
--- a/epan/packet.h
+++ b/epan/packet.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 __PACKET_H__

diff --git a/epan/prefs.c b/epan/prefs.c
index a2d323c12544459c640f600ffc64245c8adb64ad..1ccf5ac18513ef144ea536f0da479b363663051e 100644 (file)
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -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
  */
 
 #include "config.h"

diff --git a/epan/print_stream.c b/epan/print_stream.c
index a682ebcf85a194e288907ab860c7853aac30ccb7..5d068582779eb6c23671fc477220a37394a03d68 100644 (file)
--- a/epan/print_stream.c
+++ b/epan/print_stream.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
  */
 
 #include "config.h"

diff --git a/epan/print_stream.h b/epan/print_stream.h
index 32adeaa29ad1c9fd83ed61d4e16dc0ac6d6da9e5..c9de6c402344263d11d21cd726bb3a1515e4e7ad 100644 (file)
--- a/epan/print_stream.h
+++ b/epan/print_stream.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 __PRINT_STREAM_H__

diff --git a/epan/proto.c b/epan/proto.c
index 71bc2ee1c54da60871e4da91d76b9b694edba690..7b69ac64c23b91099e0313dc5f690258ff0454d8 100644 (file)
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -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
  */
 
 #include "config.h"

diff --git a/epan/register.c b/epan/register.c
index 3f0306f56ba2a7904061c20947c28864c8a65ec6..8e54c8c76c1ee7b5bca2c8f3d6302106d6254b04 100644 (file)
--- a/epan/register.c
+++ b/epan/register.c
@@ -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
  */
 
 #include "register.h"

diff --git a/epan/register.h b/epan/register.h
index 17e8133b5e7d01d9807b5e12808e4345170b9a01..491badd4af0fef9b9af6660612f8f84582f4ef0f 100644 (file)
--- a/epan/register.h
+++ b/epan/register.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 __REGISTER_H__

diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c
index 9369972486cc6ed3d05c877bb2fb5a4a2a4d537d..d3e8260a5c30ffa27fe12315a9b75e269ee8c6d4 100644 (file)
--- a/epan/wslua/init_wslua.c
+++ b/epan/wslua/init_wslua.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/epan/wslua/init_wslua.h b/epan/wslua/init_wslua.h
index 9504379eaab739183b0ff11f4259091808f2ed01..8edb77702973a81c5223190183e5b27830a16142 100644 (file)
--- a/epan/wslua/init_wslua.h
+++ b/epan/wslua/init_wslua.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 __INIT_WSLUA_H__

diff --git a/extcap.c b/extcap.c
index 392e2b6689c982f7028ca0b252451103a1202f42..ac1de60ffc97e8925b6275a5fe615c6843356caf 100644 (file)
--- a/extcap.c
+++ b/extcap.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
  */
 
 #include <config.h>

diff --git a/extcap.h b/extcap.h
index 49e23ffb706ebd830fc36404ea298fc093138217..d7728006e3d9f5c98ed446c8700664ccf1d926c4 100644 (file)
--- a/extcap.h
+++ b/extcap.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 __EXTCAP_H__

diff --git a/extcap/Makefile.am b/extcap/Makefile.am
index 7784e414cb169e737a28812fc8197fa13d2a002a..6a4d7f39c728d18743eac1ef74b79fb873b50cc8 100644 (file)
--- a/extcap/Makefile.am
+++ b/extcap/Makefile.am
@@ -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
 
 include ../Makefile.am.inc
 

diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 2969a33cf7c6b5d5f7373f0721e17e04317b4e29..ff163b1f837decc55ec85d075c30431c1a55cf9f 100644 (file)
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.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
  */
 #include "config.h"
 

diff --git a/extcap/ciscodump.c b/extcap/ciscodump.c
index 1c8f40f33ba4539788737eede5a0fabb74d13a83..83e54a9b4f799e5d00c6278c3bab128e19b74235 100644 (file)
--- a/extcap/ciscodump.c
+++ b/extcap/ciscodump.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
  */
 
 #include "config.h"

diff --git a/extcap/extcap-base.c b/extcap/extcap-base.c
index e2ba0015a1a50c8a22699cadab76d94660b708d3..6ec654c790740942af9229443fa50f7f961a2f10 100644 (file)
--- a/extcap/extcap-base.c
+++ b/extcap/extcap-base.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
  */
 
 #include "config.h"

diff --git a/extcap/extcap-base.h b/extcap/extcap-base.h
index 5bb4f2621700e370ebcdb77ac9181d803c3eee8f..264281577cef26818630de8fca8cddea27c040c6 100644 (file)
--- a/extcap/extcap-base.h
+++ b/extcap/extcap-base.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 __EXTCAP_BASE_H__
 #define __EXTCAP_BASE_H__

diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c
index b45ea75645a15c9680090f27ca910b61249bbd82..754ffc4bb9c516de8d49206b208e4a60cf2cef95 100644 (file)
--- a/extcap/randpktdump.c
+++ b/extcap/randpktdump.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
  */
 
 #include "config.h"

diff --git a/extcap/ssh-base.c b/extcap/ssh-base.c
index 1799887d90c719af84d03d1256daf0554861577c..ac39134b208958d83f6974e4263f41f6858fa6d1 100644 (file)
--- a/extcap/ssh-base.c
+++ b/extcap/ssh-base.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
  */
 
 #include "config.h"

diff --git a/extcap/ssh-base.h b/extcap/ssh-base.h
index 76790e87918123bf28a777945b2f9c7b32c7208d..8c81ac5c506b93a6564a3fc0bb19cab43887dc56 100644 (file)
--- a/extcap/ssh-base.h
+++ b/extcap/ssh-base.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 __SSHBASE_H__

diff --git a/extcap/sshdump.c b/extcap/sshdump.c
index 1872cce39272375c99756a32065a30b5dd1cf248..2217d6f3c772140d9ddab149376265ab800cfc48 100644 (file)
--- a/extcap/sshdump.c
+++ b/extcap/sshdump.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
  */
 
 #include "config.h"

diff --git a/extcap/udpdump.c b/extcap/udpdump.c
index 44cc24e1dbf865ae247877e7c2ababa207f9e19f..5ea0addcc340c4d99506020ecf4959f8f6a77e33 100644 (file)
--- a/extcap/udpdump.c
+++ b/extcap/udpdump.c
@@ -8,7 +8,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/extcap_parser.c b/extcap_parser.c
index 561b2eaefdd9c0927a73a3fb708fed5d25673e4a..db326a9ef659a925049f69b672de80638815bf2c 100644 (file)
--- a/extcap_parser.c
+++ b/extcap_parser.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
  */
 
 #include <config.h>

diff --git a/extcap_parser.h b/extcap_parser.h
index 512f4ba8b47b8e0cb7678f9e25345b6da129faed..924318144c95671e4db74d4f82a0762e266c2ff5 100644 (file)
--- a/extcap_parser.h
+++ b/extcap_parser.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 __EXTCAP_PARSER_H__

diff --git a/extcap_spawn.c b/extcap_spawn.c
index c5659181ad9f8087218def57bfbbff0c90bbf567..816e0e3a5f8c117cfd6c098081ce81ca60c2f203 100644 (file)
--- a/extcap_spawn.c
+++ b/extcap_spawn.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
  */
 
 #include <config.h>

diff --git a/extcap_spawn.h b/extcap_spawn.h
index fafce74268af54269fda52117c1a8dc4a5dd8201..0557a6f35290f6b0dcf3fb8df68e0c89cb3a7ecd 100644 (file)
--- a/extcap_spawn.h
+++ b/extcap_spawn.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 __EXTCAP_SPAWN_H__

diff --git a/file.c b/file.c
index e154b71752176f3229e33caef64442d74f9540d4..ceb1a8b9718d1e76fdccb436f214a36244b1bb52 100644 (file)
--- a/file.c
+++ b/file.c
@@ -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
  */
 
 #include <config.h>

diff --git a/file.h b/file.h
index 198e20a23011578452077df81349bb9943a1ba97..4804f08c8403e38dcfd9e13ca2f286686922df35 100644 (file)
--- a/file.h
+++ b/file.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 __FILE_H__

diff --git a/file_packet_provider.c b/file_packet_provider.c
index c08d2168193e8b31f016b9638de7724b11c61afd..3a0531388a57337f3acc1d4f0ce23f8fb8851799 100644 (file)
--- a/file_packet_provider.c
+++ b/file_packet_provider.c
@@ -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
  */
 
 #include <glib.h>

diff --git a/fileset.c b/fileset.c
index 6e8ea0157535032543b36e4d12bcef2e7f51a13f..bf10ca56be23ef8d230c67965e58b0c4c0d4f538 100644 (file)
--- a/fileset.c
+++ b/fileset.c
@@ -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
  */
 
 #include <config.h>

diff --git a/fileset.h b/fileset.h
index 776df31952bea0b0c4076f5be14302e35b4a0236..ca02e97b46efc21340946f76acc5909b22ace315 100644 (file)
--- a/fileset.h
+++ b/fileset.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 __FILESET_H__

diff --git a/frame_tvbuff.c b/frame_tvbuff.c
index e5309bd134ed1c79b5b19062032f0baeda0b34f0..513aefb8d3b58d868a8c510377c0fd07591d2967 100644 (file)
--- a/frame_tvbuff.c
+++ b/frame_tvbuff.c
@@ -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
  */
 
 #include <config.h>

diff --git a/frame_tvbuff.h b/frame_tvbuff.h
index 5b8edb4dd4e546821946f44ba09ee922fbbff0ed..6122eccaa83ae80d5f8c52d63589527210723c25 100644 (file)
--- a/frame_tvbuff.h
+++ b/frame_tvbuff.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 __FRAME_TVBUFF_H__

diff --git a/globals.h b/globals.h
index 246c829c1ae2c7c002197430c8c6b6fad66209af..8e6d333f0e5c98195de1a44dd061c9ff610153c6 100644 (file)
--- a/globals.h
+++ b/globals.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 __GLOBALS_H__

diff --git a/log.h b/log.h
index fd9f1b58e2ad40b55a1c4ce34b08d79c58da7c86..ba38897bb81afcceba03ca028c4cfe8397563ba3 100644 (file)
--- a/log.h
+++ b/log.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 __LOG_H__

diff --git a/mergecap.c b/mergecap.c
index 98a32b8b2d429a35ae36a04489a0e37ae0c4d4d4..73cb8439a53f0c8f4a01a008b78f7ddc2f015c95 100644 (file)
--- a/mergecap.c
+++ b/mergecap.c
@@ -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
  *
  * Mergecap written by Scott Renfro <scott@renfro.org> based on
  * editcap by Richard Sharpe and Guy Harris

diff --git a/packaging/wix/windeployqt-to-wix.ps1 b/packaging/wix/windeployqt-to-wix.ps1
index 809ceacaf2d026113d5ce60a6fe854cc71bdd5fd..b621e55e632a888ed0da88baf7b636419c979023 100644 (file)
--- a/packaging/wix/windeployqt-to-wix.ps1
+++ b/packaging/wix/windeployqt-to-wix.ps1
@@ -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
 
 #requires -version 2
 

diff --git a/plugins/codecs/Makefile.am.inc b/plugins/codecs/Makefile.am.inc
index 14ac941b08973bddb165e696e88cf7d7c1c17ebc..fb1b6d7770384a833a8841f7f1492f109b181de8 100644 (file)
--- a/plugins/codecs/Makefile.am.inc
+++ b/plugins/codecs/Makefile.am.inc
@@ -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
 #
 
 include $(top_srcdir)/plugins/Makefile.am.inc

diff --git a/plugins/epan/Makefile.am.inc b/plugins/epan/Makefile.am.inc
index 5c7f5256ecf3583555b1c23deb6b824712baebd7..4d3f1452255575c9343ee79dceee6740ab01a7d6 100644 (file)
--- a/plugins/epan/Makefile.am.inc
+++ b/plugins/epan/Makefile.am.inc
@@ -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
 #
 
 include $(top_srcdir)/plugins/Makefile.am.inc

diff --git a/plugins/wiretap/Makefile.am.inc b/plugins/wiretap/Makefile.am.inc
index eab1328465595da1ed1c2053a92029d235d08160..384ea2e170cdebaf03af9fa33ac4d8b463d365c0 100644 (file)
--- a/plugins/wiretap/Makefile.am.inc
+++ b/plugins/wiretap/Makefile.am.inc
@@ -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
 #
 
 include $(top_srcdir)/plugins/Makefile.am.inc

diff --git a/plugins/wiretap/usbdump/CMakeLists.txt b/plugins/wiretap/usbdump/CMakeLists.txt
index 5093353ff3bdfec75cfd25e401682e44ece8b582..2c6b22af8e2881e75258ac1318de03567fc8ec7b 100644 (file)
--- a/plugins/wiretap/usbdump/CMakeLists.txt
+++ b/plugins/wiretap/usbdump/CMakeLists.txt
@@ -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
 #
 
 include(WiresharkPlugin)

diff --git a/plugins/wiretap/usbdump/Makefile.am b/plugins/wiretap/usbdump/Makefile.am
index b090b19e27d804667c3dc94c89f5e8da8576ef6b..dd12ad96acadf8b3e1311e757f3687f1d48e9b1b 100644 (file)
--- a/plugins/wiretap/usbdump/Makefile.am
+++ b/plugins/wiretap/usbdump/Makefile.am
@@ -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
 #
 
 include $(top_srcdir)/Makefile.am.inc

diff --git a/plugins/wiretap/usbdump/usbdump.c b/plugins/wiretap/usbdump/usbdump.c
index b52c94be098df310702c40aec9f57744e41d968c..99b88a2f1a3a154960dd4b4b69a3265b05e335c9 100644 (file)
--- a/plugins/wiretap/usbdump/usbdump.c
+++ b/plugins/wiretap/usbdump/usbdump.c
@@ -6,7 +6,7 @@
  * File format support for usbdump file format
  * Copyright (c) 2017 by Jaap Keuter <jaap.keuter@xs4all.nl>
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*

diff --git a/randpkt.c b/randpkt.c
index 7fe34c6e91e8ec82a3264de215dc698856a02cd9..fe3cc9d43f3a111d22d64c7a7872401d9ab7ba20 100644 (file)
--- a/randpkt.c
+++ b/randpkt.c
@@ -6,7 +6,7 @@
  *
  * Copyright (C) 1999 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/randpkt_core/randpkt_core.c b/randpkt_core/randpkt_core.c
index 70769a4551a0fb8ad1c82feb9f9ae226a8fb8c05..7e73c7678b590bc0f4e113e4871e28aba8f417e5 100644 (file)
--- a/randpkt_core/randpkt_core.c
+++ b/randpkt_core/randpkt_core.c
@@ -6,7 +6,7 @@
  *
  * Copyright (C) 1999 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/randpkt_core/randpkt_core.h b/randpkt_core/randpkt_core.h
index c977b669960e6c8c69e94c0c0c14bde958345891..dd1ff49860d2006c4936bed5eb12e46f14e9127a 100644 (file)
--- a/randpkt_core/randpkt_core.h
+++ b/randpkt_core/randpkt_core.h
@@ -6,7 +6,7 @@
  *
  * Copyright (C) 1999 by Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __RANDPKT_CORE_H__
 #define __RANDPKT_CORE_H__

diff --git a/rawshark.c b/rawshark.c
index d8a1d1917cef79ec626677c67abd8af9d0e0e5b5..3b5fc64caae17cda9ec13b3d06309d52090ec835 100644 (file)
--- a/rawshark.c
+++ b/rawshark.c
@@ -9,7 +9,7 @@
  * Based on TShark, by Gilbert Ramirez <gram@alumni.rice.edu> and Guy Harris
  * <guy@alum.mit.edu>.
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*

diff --git a/reordercap.c b/reordercap.c
index 8570726cfc5f7e443f082fd2b0f84debe6a2e1a9..c4b9dfd02b0c673d966c80f3ca2feefafec9f11e 100644 (file)
--- a/reordercap.c
+++ b/reordercap.c
@@ -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
  */
 
 #include <config.h>

diff --git a/ringbuffer.c b/ringbuffer.c
index 4b215cfe175c1ccf25dc3d0e58b195213da4d4f3..31eb9bdd337cce390645517eba0fef8f82e65f80 100644 (file)
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -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
  */
 
 /*

diff --git a/ringbuffer.h b/ringbuffer.h
index f1c99fa68c0870e04c09b897e16f7968b42262ff..b56fa056fa4377e5ec15ee9d4632dac17661e748 100644 (file)
--- a/ringbuffer.h
+++ b/ringbuffer.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 __RINGBUFFER_H__

diff --git a/sharkd.c b/sharkd.c
index 65971718620d4eb46a60e4e77942df56876fb384..a3219d3a35851ba0b2b0e2dacaec940b7728ce80 100644 (file)
--- a/sharkd.c
+++ b/sharkd.c
@@ -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
  */
 
 #include <config.h>

diff --git a/sharkd.h b/sharkd.h
index 134917e5002fceae2a754071fca51e0ca1580e24..80cd8d9edfdda791053c99a96f20c0440208cadd 100644 (file)
--- a/sharkd.h
+++ b/sharkd.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 __SHARKD_H

diff --git a/sharkd_daemon.c b/sharkd_daemon.c
index 230534914fea57cb85ee6b88749948bc249c8361..4f98ef48cbfc3f27cb57a813bad9bd5c04c1ddf9 100644 (file)
--- a/sharkd_daemon.c
+++ b/sharkd_daemon.c
@@ -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
  */
 
 #include <config.h>

diff --git a/sharkd_session.c b/sharkd_session.c
index 08b3e44696a52d4aaf833a489917d1605f4bc740..087f2f658901ff8f2575b4f59b8bdc7c8de08af0 100644 (file)
--- a/sharkd_session.c
+++ b/sharkd_session.c
@@ -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
  */
 
 #include <config.h>

diff --git a/sync_pipe.h b/sync_pipe.h
index 05f9ff15e46d9d73c7e1e4ef1360d4d232eca3d1..04407389ae28b58e46d9cdb6353b97995a75fcea 100644 (file)
--- a/sync_pipe.h
+++ b/sync_pipe.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
  */
 
 

diff --git a/sync_pipe_write.c b/sync_pipe_write.c
index 3a6155513d010463b62c0623c8c03b7c469d2d4e..ea1a7927d061c18742568cf7603fc11f1840ce3c 100644 (file)
--- a/sync_pipe_write.c
+++ b/sync_pipe_write.c
@@ -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
  */
 
 #include <config.h>

diff --git a/text2pcap.c b/text2pcap.c
index aae921aad02daa944c46b813d1546d6d081ac045..ffa3c0fc84cba9af8effbf0e5730a1ade60d332d 100644 (file)
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -10,7 +10,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/text2pcap.h b/text2pcap.h
index 42d97a10b1dc5b1b8f9e1a98f3bc8b212d34228e..d9cd7f9d28cf6e407c1274e499374b70a1a50342 100644 (file)
--- a/text2pcap.h
+++ b/text2pcap.h
@@ -10,7 +10,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/tfshark.c b/tfshark.c
index bb522b04b82c75e92d30bd84a2db01e76a72a4bd..fee411c0a2c41797a68e4fe10b7897ec06c91221 100644 (file)
--- a/tfshark.c
+++ b/tfshark.c
@@ -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
  */
 
 #include <config.h>

diff --git a/tools/oss-fuzzshark/fuzzshark.c b/tools/oss-fuzzshark/fuzzshark.c
index 5d0ceae0b665af032d59b021dde603257aa6987e..79caada80de8f9168914a658b17886c7f9b1bb31 100644 (file)
--- a/tools/oss-fuzzshark/fuzzshark.c
+++ b/tools/oss-fuzzshark/fuzzshark.c
@@ -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*/
 
 #include <config.h>
 

diff --git a/trigcap.c b/trigcap.c
index ef09a8fc0952117406c26a178fa7cc91f6b9538a..9086b5897ff961965baac2f451546708c8bcae57 100644 (file)
--- a/trigcap.c
+++ b/trigcap.c
@@ -4,7 +4,7 @@
  *
  * (c) 2007, Luis E. Garcia Ontanon <luis@ontanon.org>
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <stdio.h>

diff --git a/tshark.c b/tshark.c
index bfccd59aa69f6ea69b36462735e9e9b46d27f406..c3d30776f2873b5a6d9b3331f0c25ce7a73b0eb1 100644 (file)
--- a/tshark.c
+++ b/tshark.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
  */
 
 #include <config.h>

diff --git a/ui/alert_box.c b/ui/alert_box.c
index b7aa64e354f52673ecd6a1def179964190ac422a..b3000e894476d7444d3cd1c569c22c1438a7fd12 100644 (file)
--- a/ui/alert_box.c
+++ b/ui/alert_box.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/alert_box.h b/ui/alert_box.h
index 6070208b3501c2254fe8dd629ad5bb6694868dca..afa99c08f8fd0f2893619b6a0cd6aca670551441 100644 (file)
--- a/ui/alert_box.h
+++ b/ui/alert_box.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 __ALERT_BOX_H__
 #define __ALERT_BOX_H__

diff --git a/ui/all_files_wildcard.h b/ui/all_files_wildcard.h
index 82aa6a0789ad168c7020cfd2e71bb839fcc6d816..dd18381637bab36a3858e0d56f5671a913984774 100644 (file)
--- a/ui/all_files_wildcard.h
+++ b/ui/all_files_wildcard.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 __ALL_FILES_WILDCARD_H__
 #define __ALL_FILES_WILDCARD_H__

diff --git a/ui/capture.c b/ui/capture.c
index cc4b09127e0ec56af4d9b4196125673a94439358..5b7c68cda18a60832ed99af690ffc348d6dd307f 100644 (file)
--- a/ui/capture.c
+++ b/ui/capture.c
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/capture.h b/ui/capture.h
index 219767c40f702d468b89e4f61c6069412a73ec16..f30f76ef80ba6600f84337311ef1b76a540b4b79 100644 (file)
--- a/ui/capture.h
+++ b/ui/capture.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
  */
 
 /* This file should only be included if libpcap is present */

diff --git a/ui/capture_globals.h b/ui/capture_globals.h
index 38c1acdd75f0d955f8e332bd9b825861f7b1a559..2394427badf97e3e9d6e5ff76894c3d72820d62d 100644 (file)
--- a/ui/capture_globals.h
+++ b/ui/capture_globals.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 __CAPTURE_GLOBALS_H__
 #define __CAPTURE_GLOBALS_H__

diff --git a/ui/capture_ui_utils.c b/ui/capture_ui_utils.c
index 84b1f7782ea43e4ff54b91a92fb29cb080be19cb..e6d4099fd4f0caccb42684d6f3cff947d61ae654 100644 (file)
--- a/ui/capture_ui_utils.c
+++ b/ui/capture_ui_utils.c
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/capture_ui_utils.h b/ui/capture_ui_utils.h
index dfedebd9c15e8b4d0e4e32842d0b744a65a0c06f..da5bc9a5d97e1ca37d5834961975c7f766f6b350 100644 (file)
--- a/ui/capture_ui_utils.h
+++ b/ui/capture_ui_utils.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 __CAPTURE_UI_UTILS_H__

diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c
index ba85055b65e6f6a2196aece84b5582a0722f2247..a8c9942e1bdda913aa9fcd636a84956d5c5e9b5e 100644 (file)
--- a/ui/cli/tap-camelsrt.c
+++ b/ui/cli/tap-camelsrt.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c
index f9f795765a7cfe6ed797eab2b5d45f9f59807202..6b205ad75dd3b2dbfdfdbe1a1379055ca6424b88 100644 (file)
--- a/ui/cli/tap-comparestat.c
+++ b/ui/cli/tap-comparestat.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*/
 
 /* This module provides statistics about two merged capture files, to find packet loss,
  * time delay, ip header checksum errors and order check to tshark.

diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
index 232fbe26ab4081506b24d827b11017f555cd5f1c..37d309216444bc51d765bc5548351fd8f3da2fb8 100644 (file)
--- a/ui/cli/tap-diameter-avp.c
+++ b/ui/cli/tap-diameter-avp.c
@@ -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*/
 
 /*
  * This TAP enables extraction of most important diameter fields in text format.

diff --git a/ui/cli/tap-endpoints.c b/ui/cli/tap-endpoints.c
index f87ce95b434a5070f9d527787f6179b00c643adc..539668f1b01a063c24397525ad8547f04579c4ad 100644 (file)
--- a/ui/cli/tap-endpoints.c
+++ b/ui/cli/tap-endpoints.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-expert.c b/ui/cli/tap-expert.c
index 224f6d4dfc9e5db95ae738757850ba0fda5ceb21..b7eaf5e47995363dfca4f756cda28b2260a0d550 100644 (file)
--- a/ui/cli/tap-expert.c
+++ b/ui/cli/tap-expert.c
@@ -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
  */
 
 

diff --git a/ui/cli/tap-exportobject.c b/ui/cli/tap-exportobject.c
index aae061c99628ba3d603b8ac860a547189a801a6e..b1f08e1abe8b4b0043d65d47e026afc443457eaa 100644 (file)
--- a/ui/cli/tap-exportobject.c
+++ b/ui/cli/tap-exportobject.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-exportobject.h b/ui/cli/tap-exportobject.h
index ca4ca67de3053cc71bcf74f7ea2bdc70f92ca672..182fd1af18ad151d28429be6e5d0bb5c34d4fadf 100644 (file)
--- a/ui/cli/tap-exportobject.h
+++ b/ui/cli/tap-exportobject.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 __TAP_EXPORT_OBJECT_H__
 #define __TAP_EXPORT_OBJECT_H__

diff --git a/ui/cli/tap-flow.c b/ui/cli/tap-flow.c
index ba80b856a7c6f626f4f34b4aa7995f7ab6d5a5cc..55178fa61fa09368722cd21e395193def195c52c 100644 (file)
--- a/ui/cli/tap-flow.c
+++ b/ui/cli/tap-flow.c
@@ -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*/
 
 /* This module provides udp and tcp follow stream capabilities to tshark.
  * It is only used by tshark and not wireshark.

diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c
index a96dd5f9de43d5289b6a8e719169d35d48d31949..a22d4590b5f248036b860f0e5c45a4227430cb59 100644 (file)
--- a/ui/cli/tap-follow.c
+++ b/ui/cli/tap-follow.c
@@ -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*/
 
 /* This module provides udp and tcp follow stream capabilities to tshark.
  * It is only used by tshark and not wireshark.

diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c
index e30a9ff69ddc9b868e01288c1a12610901b25794..d769c82c4fb66895b8509e9497cccbef5dc0ff30 100644 (file)
--- a/ui/cli/tap-funnel.c
+++ b/ui/cli/tap-funnel.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/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c
index b934314a07f78cc27271cd8ecce9e185345b6587..a3d13ee75ec2475306d177f09d7f98d383b6ad6e 100644 (file)
--- a/ui/cli/tap-gsm_astat.c
+++ b/ui/cli/tap-gsm_astat.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*/
 
 /*
  * This TAP provides statistics for the GSM A Interface:

diff --git a/ui/cli/tap-hosts.c b/ui/cli/tap-hosts.c
index 39b1017dfc6e46df0d3687c343a989c51a5af522..69b7ccb9f71efba41ca133d2f5761f5a63bc1157 100644 (file)
--- a/ui/cli/tap-hosts.c
+++ b/ui/cli/tap-hosts.c
@@ -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*/
 
 /* Dump our collected IPv4- and IPv6-to-hostname mappings */
 

diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c
index af70d2416a059ebd231aba39a6385191646b0bb5..93cfbab64d2c392f8835884aa127645bf76671e1 100644 (file)
--- a/ui/cli/tap-httpstat.c
+++ b/ui/cli/tap-httpstat.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c
index 840988f2f9b620d997f121c34b6fca26cc45ba21..c2d14336dfffb27227ccf5f10d6ed382224a56c6 100644 (file)
--- a/ui/cli/tap-icmpstat.c
+++ b/ui/cli/tap-icmpstat.c
@@ -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*/
 
 /* This module provides icmp echo request/reply SRT statistics to tshark.
  * It is only used by tshark and not wireshark

diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c
index 0d067bbe7f404e007898af154092a272115ffeb5..88a462fbb3569b8b7929d1acd6c79c068add1b86 100644 (file)
--- a/ui/cli/tap-icmpv6stat.c
+++ b/ui/cli/tap-icmpv6stat.c
@@ -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*/
 
 /* This module provides icmpv6 echo request/reply SRT statistics to tshark.
  * It is only used by tshark and not wireshark

diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c
index e0f0c54e698f88cfe868fa43605a617f3c7067d6..c4186aaa83cc80631ff4380045cc231cdc4cccc9 100644 (file)
--- a/ui/cli/tap-iostat.c
+++ b/ui/cli/tap-iostat.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c
index 3ca7fa68b924a59361ec8704ab5a54aa8356b13b..fa2df3cf26fcb8684cd766cb4b628f6b046b7110 100644 (file)
--- a/ui/cli/tap-iousers.c
+++ b/ui/cli/tap-iousers.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c
index 9738bef977e8110e199f5927023656a7abfe266c..de35425d2dd9fddbfcba9c7b7cf458a4bdb08275 100644 (file)
--- a/ui/cli/tap-macltestat.c
+++ b/ui/cli/tap-macltestat.c
@@ -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
  */
 
 

diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c
index d4c7b8b855540926e677b029a3fca83aacb305d0..9bed7fb656f15a5a8092324e655e94aa9bc0bf80 100644 (file)
--- a/ui/cli/tap-protocolinfo.c
+++ b/ui/cli/tap-protocolinfo.c
@@ -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*/
 
 /* This module provides Protocol Column Info tap for tshark */
 

diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c
index cab2ce4f7adc2d2878543e7c2fa02af39344ccff..1defd98423e5ab902db5fe0082e6eda4a9a5b937 100644 (file)
--- a/ui/cli/tap-protohierstat.c
+++ b/ui/cli/tap-protohierstat.c
@@ -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*/
 
 /* This module provides ProtocolHierarchyStatistics for tshark */
 

diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c
index d7fce85f9c55ac5cd73569070b5459ac41326810..02967dc4e02bdeba544fc342992cdc9d302e6fd4 100644 (file)
--- a/ui/cli/tap-rlcltestat.c
+++ b/ui/cli/tap-rlcltestat.c
@@ -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
  */
 
 

diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c
index 6650491075f12c0120c38cb4edb029fbb6a3b1b1..c0602839d10cdebf93deb5c585a7bef3a4166afd 100644 (file)
--- a/ui/cli/tap-rpcprogs.c
+++ b/ui/cli/tap-rpcprogs.c
@@ -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*/
 
 /* This module provides rpc call/reply SRT statistics to tshark.
  * It is only used by tshark and not wireshark

diff --git a/ui/cli/tap-rtd.c b/ui/cli/tap-rtd.c
index cbaef97fab90f0348508ad23b5ffa61e95630dd7..480b239f75ba2caf6827fbf6c050a59b806905cb 100644 (file)
--- a/ui/cli/tap-rtd.c
+++ b/ui/cli/tap-rtd.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c
index f8d598dc3076d0afb651e64ef25ac6b903cb630c..f6569d463b703f05c945092e30656388937d1e75 100644 (file)
--- a/ui/cli/tap-rtp.c
+++ b/ui/cli/tap-rtp.c
@@ -12,7 +12,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*/
 
 /*
  * This TAP provides statistics for RTP streams

diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
index 276cc6a1f49bab68bf00771bff4b9296bc7e117e..ec2de3edd5b20911bcd29dcad00cad64c44ffe54 100644 (file)
--- a/ui/cli/tap-rtspstat.c
+++ b/ui/cli/tap-rtspstat.c
@@ -8,7 +8,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/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c
index b27da537556ed665d075176f098c53f3836586b2..b471301cca49e42cc68a4e7169999903824a2271 100644 (file)
--- a/ui/cli/tap-sctpchunkstat.c
+++ b/ui/cli/tap-sctpchunkstat.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-simple_stattable.c b/ui/cli/tap-simple_stattable.c
index e28b5648a3d4ebbd59e483f4d6c43c1fd60d3ef2..4390d2e98e98e27e148c98b2307b662798646798 100644 (file)
--- a/ui/cli/tap-simple_stattable.c
+++ b/ui/cli/tap-simple_stattable.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c
index c2e106dd98321ef1e78fc8bad6afbe51f01ab791..090605b01a7356d8a7eba61850649fa4775f5a0f 100644 (file)
--- a/ui/cli/tap-sipstat.c
+++ b/ui/cli/tap-sipstat.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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c
index c428e9fc70fe064ac011e9d71233e1a5f1b78923..5874b3dee7ba9d4e2820acb5f2ef1ed27831110c 100644 (file)
--- a/ui/cli/tap-smbsids.c
+++ b/ui/cli/tap-smbsids.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-srt.c b/ui/cli/tap-srt.c
index 6fc1743a6d0b76645cd4a61a36451d9d021e0757..fd881015b6638b12f12a5038a7549da96b773d92 100644 (file)
--- a/ui/cli/tap-srt.c
+++ b/ui/cli/tap-srt.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-stats_tree.c b/ui/cli/tap-stats_tree.c
index 4107bbf55d70ddcf3c8e56d066fae2df4eb09e6e..8062a6ac8300787055e7314b0429b3dd7126e484 100644 (file)
--- a/ui/cli/tap-stats_tree.c
+++ b/ui/cli/tap-stats_tree.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c
index 6ec6ee4f0ad685f48d7c88ec41260d764914b74f..6f5c4f00635a17f85e1d93c38a35b55b2e439921 100644 (file)
--- a/ui/cli/tap-sv.c
+++ b/ui/cli/tap-sv.c
@@ -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*/
 
 
 #include "config.h"

diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c
index 55c4f123e027a886c9567891df8ae24cc4a66d2c..15e9afd4aa7213c4d8395341b9e6c4252fb110c9 100644 (file)
--- a/ui/cli/tap-wspstat.c
+++ b/ui/cli/tap-wspstat.c
@@ -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*/
 
 /* This module provides WSP  statistics to tshark.
  * It is only used by tshark and not wireshark

diff --git a/ui/cli/tshark-tap.h b/ui/cli/tshark-tap.h
index 56fe981bdac47e3d4556e126f63469038154016a..76bc9823ffe1e3e514004d8990e9826fff5b423d 100644 (file)
--- a/ui/cli/tshark-tap.h
+++ b/ui/cli/tshark-tap.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 __TSHARK_TAP_H__
 #define __TSHARK_TAP_H__
 

diff --git a/ui/commandline.c b/ui/commandline.c
index e29a64ebb21908d630408fec86eeaf73cf4d8264..2c249dad91c6964423020a00cd0daab1d55ad58d 100644 (file)
--- a/ui/commandline.c
+++ b/ui/commandline.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/commandline.h b/ui/commandline.h
index ef2b204b37901bf69c2da2d23f0d35d30de7e83c..981aaadf6e13a6d434bc97aae6e6aef31e2ef45c 100644 (file)
--- a/ui/commandline.h
+++ b/ui/commandline.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 __COMMANDLINE_H__
 #define __COMMANDLINE_H__

diff --git a/ui/console.c b/ui/console.c
index 2a791288bc4bf6ece9f9eec30853b75ce108952b..d0b7f74e55ba6f54cc8b0bb61de896daefba300e 100644 (file)
--- a/ui/console.c
+++ b/ui/console.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/console.h b/ui/console.h
index 48c775c7c48cfe0e5e08afcdfa87e7fd98596082..18cf0288dafc4dc95579c94bbad245499b880828 100644 (file)
--- a/ui/console.h
+++ b/ui/console.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 __CONSOLE_H__
 #define __CONSOLE_H__

diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c
index e52bb67d874cca78b05f7d280eceaa0996c972cc..9634112bda0660e69ab97c4ee1a268ff17d50145 100644 (file)
--- a/ui/decode_as_utils.c
+++ b/ui/decode_as_utils.c
@@ -5,7 +5,7 @@
  * By David Hampton <dhampton@mac.com>
  * Copyright 2001 David Hampton
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 #include "config.h"
 
 #include <stdlib.h>

diff --git a/ui/decode_as_utils.h b/ui/decode_as_utils.h
index 9b2d9e8b67f501a89859f87571bb52c1e42e0a7b..1c121d4f841ecbe431ca4e4e4865ff73a2d05ab6 100644 (file)
--- a/ui/decode_as_utils.h
+++ b/ui/decode_as_utils.h
@@ -5,7 +5,7 @@
  * By David Hampton <dhampton@mac.com>
  * Copyright 2001 David Hampton
  *
- * SPDX-License-Identifier: GPL-2.0+*
+ * SPDX-License-Identifier: GPL-2.0-or-later*
  */
 
 #ifndef __DECODE_AS_UTILS_H__

diff --git a/ui/dissect_opts.c b/ui/dissect_opts.c
index 18ccf552f7f4f06291f754dc89a0105925ad9189..33f284b1e7cb9164cb5efe8359cf68dc5301b7be 100644 (file)
--- a/ui/dissect_opts.c
+++ b/ui/dissect_opts.c
@@ -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*/
 
 #include <config.h>
 

diff --git a/ui/dissect_opts.h b/ui/dissect_opts.h
index fb7cd0212151810b467a69512bd8aab8755c05f8..71bb5ef4d4f5ddc5344d536eeab826d3a9edcbfd 100644 (file)
--- a/ui/dissect_opts.h
+++ b/ui/dissect_opts.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*/
 
 
 /** @file

diff --git a/ui/export_object_ui.c b/ui/export_object_ui.c
index c24e5bf9a23dd5d7c6369a76d19c48c9cc3f6a17..71e464336bc217bd23721d7d8bb546ecc322e309 100644 (file)
--- a/ui/export_object_ui.c
+++ b/ui/export_object_ui.c
@@ -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 */
 
 #include "config.h"
 

diff --git a/ui/export_object_ui.h b/ui/export_object_ui.h
index e58083ec76d926c3b14b45e2245eec20f3191c89..20b139000514e29c508cfb4ea2b167c78dedea9e 100644 (file)
--- a/ui/export_object_ui.h
+++ b/ui/export_object_ui.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 __EXPORT_OBJECT_UI_H__
 #define __EXPORT_OBJECT_UI_H__

diff --git a/ui/export_pdu_ui_utils.c b/ui/export_pdu_ui_utils.c
index b9216aa5942498f36201b24eff6f64c42c2f534e..869ec334db8407d8d4b9d5c99974223eb0fad40c 100644 (file)
--- a/ui/export_pdu_ui_utils.c
+++ b/ui/export_pdu_ui_utils.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*/
 
 #include "config.h"
 

diff --git a/ui/export_pdu_ui_utils.h b/ui/export_pdu_ui_utils.h
index 80556600ee6c145d192f2f23cfeb64d6f0cafe4a..43b43f956a180c1a49e66823c06b877a9e65a936 100644 (file)
--- a/ui/export_pdu_ui_utils.h
+++ b/ui/export_pdu_ui_utils.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 EXPORT_PDU_UI_UTILS_H
 #define EXPORT_PDU_UI_UTILS_H

diff --git a/ui/failure_message.c b/ui/failure_message.c
index 9c200d08cde998237c5f81d818a2b28ecb9767b5..49dc05a4a76aecb3f75ff0811828bb9a1eaf4617 100644 (file)
--- a/ui/failure_message.c
+++ b/ui/failure_message.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/failure_message.h b/ui/failure_message.h
index ae37f63cf7decfcd5c21c6841fa424a73f536491..28014424144b63f399443259ab10a233ebc4012f 100644 (file)
--- a/ui/failure_message.h
+++ b/ui/failure_message.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 __FAILURE_MESSAGE_H__
 #define __FAILURE_MESSAGE_H__

diff --git a/ui/file_dialog.h b/ui/file_dialog.h
index 15aed533b5809a29b734a5190e80047fc3ecba9b..f931fa8f9e716cadf57bb192a48acfa684e538a9 100644 (file)
--- a/ui/file_dialog.h
+++ b/ui/file_dialog.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2006 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __FILE_DIALOG_H__
 #define __FILE_DIALOG_H__

diff --git a/ui/filter_files.c b/ui/filter_files.c
index 3748eec98c3f54ca14acb8e0ba5ce6954a7a0471..1a30f2fffe9ea6e94fe53d13b9aac62e59a84ead 100644 (file)
--- a/ui/filter_files.c
+++ b/ui/filter_files.c
@@ -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*/
 
 #include <config.h>
 

diff --git a/ui/filter_files.h b/ui/filter_files.h
index e0d4551a10b897dd40542fefb99dff7795e6564b..f293f4e691d698c2ca75f00a979de7cd637c58b0 100644 (file)
--- a/ui/filter_files.h
+++ b/ui/filter_files.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 __UI_FILTERS_H__
 #define __UI_FILTERS_H__

diff --git a/ui/firewall_rules.c b/ui/firewall_rules.c
index 55dbcc88812837db622ec503ff3ccca8a375edae..566dd83b01c97586e5350787954037388795062f 100644 (file)
--- a/ui/firewall_rules.c
+++ b/ui/firewall_rules.c
@@ -1,6 +1,6 @@
 /* firewall_rules_dlg.c
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /*
  * Generate firewall ACL rules based on packet addresses and ports.

diff --git a/ui/firewall_rules.h b/ui/firewall_rules.h
index aa7174833f082100802eae6c9aa37a2181b88924..a1833ec48fe22759c4407aadee46b6fc8b6dc38f 100644 (file)
--- a/ui/firewall_rules.h
+++ b/ui/firewall_rules.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2006 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #ifndef __UI_FIREWALL_RULES_H__
 #define __UI_FIREWALL_RULES_H__

diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c
index e6845833099d0a6b2d4c10da6ef509009ad22d46..027d945afa89479a16d4b58f6d95d87effcc9f27 100644 (file)
--- a/ui/gtk/fileset_dlg.c
+++ b/ui/gtk/fileset_dlg.c
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/help_url.c b/ui/help_url.c
index fd4d7f6fdec78a9582595bac7864236da324dd10..1d4893512973f733b8371a611616b45cbaf1c82b 100644 (file)
--- a/ui/help_url.c
+++ b/ui/help_url.c
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2000 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 

diff --git a/ui/help_url.h b/ui/help_url.h
index 672c9f183a8d1aea6ffbf7d8caeef71178125d2c..bf2cfdc86c4b0cb562c6867c8efeb8e7d4faf902 100644 (file)
--- a/ui/help_url.h
+++ b/ui/help_url.h
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2000 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*
+ * SPDX-License-Identifier: GPL-2.0-or-later*
  */
 
 #ifndef __HELP_URL_H__

diff --git a/ui/iface_lists.c b/ui/iface_lists.c
index d4d394d4b1472c916e32ce236770383f5f958a95..a495b1b6fd72e79335a7741ab1b1209f452a507f 100644 (file)
--- a/ui/iface_lists.c
+++ b/ui/iface_lists.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/iface_lists.h b/ui/iface_lists.h
index ad80010a46bacfbe9b40cdc2d3bdbc1065923a7d..f749f453b647b67e617cc70243b93771d9b441dc 100644 (file)
--- a/ui/iface_lists.h
+++ b/ui/iface_lists.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 __IFACE_LISTS_H__
 #define __IFACE_LISTS_H__

diff --git a/ui/iface_toolbar.c b/ui/iface_toolbar.c
index f84851867e942aa4041bd35e8872e95a8aa1456f..64cb22ddac81e78db00e965463e5fb3596e84f0b 100644 (file)
--- a/ui/iface_toolbar.c
+++ b/ui/iface_toolbar.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/iface_toolbar.h b/ui/iface_toolbar.h
index 13d8acf6cb5f9125162a7b13bcfd049b0526cbef..9e10e622db5a01d4e50e6471305547500cc3ffa5 100644 (file)
--- a/ui/iface_toolbar.h
+++ b/ui/iface_toolbar.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 __IFACE_TOOLBAR_H__
 #define __IFACE_TOOLBAR_H__

diff --git a/ui/io_graph_item.c b/ui/io_graph_item.c
index 6608f103f2cd8ad56117693bca828ca060b0274a..a40ac027ee90946f147edba2887d90442571d61d 100644 (file)
--- a/ui/io_graph_item.c
+++ b/ui/io_graph_item.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*/
 
 #include "config.h"
 

diff --git a/ui/io_graph_item.h b/ui/io_graph_item.h
index f7dded0db4ac7b5fc03d587b855883d6c6600bc5..9ef92d76f1d757658ef2061d7cc88f130b299cb1 100644 (file)
--- a/ui/io_graph_item.h
+++ b/ui/io_graph_item.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 __IO_GRAPH_ITEM_H__
 #define __IO_GRAPH_ITEM_H__

diff --git a/ui/language.c b/ui/language.c
index f9eedad83b89d736fcb59d27062d57b7b49c2f6c..7c41622f17dcc5ecf52409b1255788f9eafa512f 100644 (file)
--- a/ui/language.c
+++ b/ui/language.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/language.h b/ui/language.h
index ee277c98f75d3c377dca2af0f988ec777a214431..4be1deeca0fda9da5f0a39d4f43b3ba9e34a8d7a 100644 (file)
--- a/ui/language.h
+++ b/ui/language.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 __LANGUAGE_H__
 #define __LANGUAGE_H__

diff --git a/ui/last_open_dir.h b/ui/last_open_dir.h
index ede7378f1bb3bd6c486e7565703941ba759f78ac..62709b38f3e616af9cf3c876e4322dffedda9cfc 100644 (file)
--- a/ui/last_open_dir.h
+++ b/ui/last_open_dir.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 __UI_LAST_OPEN_DIR_H__
 #define __UI_LAST_OPEN_DIR_H__

diff --git a/ui/main_statusbar.h b/ui/main_statusbar.h
index ea4788edfea5d38136fd0382b0cbb74e8625654c..64874db053242e01ffbbe964a3b9fd4bffff4283 100644 (file)
--- a/ui/main_statusbar.h
+++ b/ui/main_statusbar.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 __MAIN_STATUSBAR_H__
 #define __MAIN_STATUSBAR_H__

diff --git a/ui/make-taps.c b/ui/make-taps.c
index 6c48ac097412d97b6f36483d68f1b2719cd2d518..e1ad4431c66279f96f84b9daa41097622b7a9956 100644 (file)
--- a/ui/make-taps.c
+++ b/ui/make-taps.c
@@ -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
  */
 
 #include <stdlib.h>

diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c
index fbaf0ac1d0a011e9e02bbc7c8777338f85b72970..32f3df701d12cbdc1c815cbad1ff1fdc50c34cbb 100644 (file)
--- a/ui/mcast_stream.c
+++ b/ui/mcast_stream.c
@@ -12,7 +12,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/ui/mcast_stream.h b/ui/mcast_stream.h
index 78278bef8f65ce2532dde25bb03f2848b683e06c..943fba14ca772bc064442bc9709cd6b7764fa8ed 100644 (file)
--- a/ui/mcast_stream.h
+++ b/ui/mcast_stream.h
@@ -12,7 +12,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 __MCAST_STREAM_H__
 #define __MCAST_STREAM_H__

diff --git a/ui/packet_list_utils.c b/ui/packet_list_utils.c
index 3c13c2dfdf775c91a17da0b270ce604646cc1ddd..5599cdad143600c49e0da084d5d4085d8b099bc8 100644 (file)
--- a/ui/packet_list_utils.c
+++ b/ui/packet_list_utils.c
@@ -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 */
 
 #include "config.h"
 

diff --git a/ui/packet_list_utils.h b/ui/packet_list_utils.h
index d8cbad72f5e0ac397f7706b4b44dbfe9ea22da2a..d0b7bcd40f1a9499c93cc10ffab63bcc77c4a7f5 100644 (file)
--- a/ui/packet_list_utils.h
+++ b/ui/packet_list_utils.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 __PACKET_LIST_UTILS_H__
 #define __PACKET_LIST_UTILS_H__

diff --git a/ui/packet_range.c b/ui/packet_range.c
index abd791a5a5bed4ab9319d5b980313ea1774dcb1f..6edd391f38547cf30d68242cba801452bf07442a 100644 (file)
--- a/ui/packet_range.c
+++ b/ui/packet_range.c
@@ -8,7 +8,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/ui/packet_range.h b/ui/packet_range.h
index fce2884181d2482b7d64751956d3c10fee9513a9..dec0e618132cfc579ab35bb6d6bc9d8967545d8e 100644 (file)
--- a/ui/packet_range.h
+++ b/ui/packet_range.h
@@ -8,7 +8,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 __PACKET_RANGE_H__
 #define __PACKET_RANGE_H__

diff --git a/ui/persfilepath_opt.c b/ui/persfilepath_opt.c
index 04d7c13cb506c42c41a70dd99a9156b83c168768..3b5dcba35ec88f4226cd4ad83f6b64ce6302b93f 100644 (file)
--- a/ui/persfilepath_opt.c
+++ b/ui/persfilepath_opt.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/persfilepath_opt.h b/ui/persfilepath_opt.h
index 7229d3e4db2bf0dd693fc887f9e5246ff15e55b5..356ee9733cf19ca7f7b3a18bac4eda837539283f 100644 (file)
--- a/ui/persfilepath_opt.h
+++ b/ui/persfilepath_opt.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 PERSFILEPATH_OPT_H
 #define PERSFILEPATH_OPT_H

diff --git a/ui/preference_utils.c b/ui/preference_utils.c
index a4bf7b06da3f7746a63ce93ea6d8f15e299439dc..4914b9192bf0079c78c31195dc47114eebef4e70 100644 (file)
--- a/ui/preference_utils.c
+++ b/ui/preference_utils.c
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/preference_utils.h b/ui/preference_utils.h
index 9364eeeb73718ca07574a539918e6c49e9e8818a..aaed9b6ab98c2a9e3575566ec226d0b13f9c52fc 100644 (file)
--- a/ui/preference_utils.h
+++ b/ui/preference_utils.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 __PREFRENCE_UTILS_H__

diff --git a/ui/profile.c b/ui/profile.c
index b8b51fda2ebf01402f9ab080e565eccc764561a9..16fba49857a01b958edb889f76d779a3aa66aaa6 100644 (file)
--- a/ui/profile.c
+++ b/ui/profile.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/profile.h b/ui/profile.h
index 00e579f4d5ff137ce3840e21e861b10e75932120..0aa279bd72975341bec3e0cebe09e6d9d9e84137 100644 (file)
--- a/ui/profile.h
+++ b/ui/profile.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 __PROFILE_H__
 #define __PROFILE_H__

diff --git a/ui/progress_dlg.h b/ui/progress_dlg.h
index 8cfc30ac46107be69003360ee2f3a15a533f9105..22eac9b7b642f771d8107541e55e29542aa0e70f 100644 (file)
--- a/ui/progress_dlg.h
+++ b/ui/progress_dlg.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 __PROGRESS_DLG_H__
 #define __PROGRESS_DLG_H__

diff --git a/ui/proto_hier_stats.c b/ui/proto_hier_stats.c
index 66a550b491507474f9112ce74a59f9c2ab0fa8d1..91d93941ace4ecb17104a44ac1db75f4edb71317 100644 (file)
--- a/ui/proto_hier_stats.c
+++ b/ui/proto_hier_stats.c
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/proto_hier_stats.h b/ui/proto_hier_stats.h
index 0b8cea60df2209e5f1877ceaee447a54d496f5b6..e3b42594aa02d14a3454e978e726af45f3285bdc 100644 (file)
--- a/ui/proto_hier_stats.h
+++ b/ui/proto_hier_stats.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 __UI_PROTO_HIER_STATS_H__

diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
index 187793dfa81e479f7e8d563d7c109b55bd26079b..21449b9698548b2ecc34e3a4a184e3b048658087 100644 (file)
--- a/ui/qt/about_dialog.cpp
+++ b/ui/qt/about_dialog.cpp
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/qt/about_dialog.h b/ui/qt/about_dialog.h
index ec1f2450cd179fb32bbfac836434fcdaf2849d0e..79d00c318fd32e14dfaa04179b445c290959ea30 100644 (file)
--- a/ui/qt/about_dialog.h
+++ b/ui/qt/about_dialog.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 ABOUT_DIALOG_H

diff --git a/ui/qt/accordion_frame.cpp b/ui/qt/accordion_frame.cpp
index 22a132da201537ee5ee160ae35741a75428d300c..ec1d0be7410036876426cc046a5932b9cb531d44 100644 (file)
--- a/ui/qt/accordion_frame.cpp
+++ b/ui/qt/accordion_frame.cpp
@@ -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*/
 
 #include "config.h"
 #include <glib.h>

diff --git a/ui/qt/accordion_frame.h b/ui/qt/accordion_frame.h
index 6306af07d85aea766bd263efd3d93e2340d71d11..2be96ce5f2e012d00be5c5a463183c50f90c7141 100644 (file)
--- a/ui/qt/accordion_frame.h
+++ b/ui/qt/accordion_frame.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 ACCORDION_FRAME_H
 #define ACCORDION_FRAME_H

diff --git a/ui/qt/address_editor_frame.cpp b/ui/qt/address_editor_frame.cpp
index ea7f92a3659b281274c488a038869ac1a2e4d398..3c2087a7d1b23427a93c336389e9d19ea0e420c1 100644 (file)
--- a/ui/qt/address_editor_frame.cpp
+++ b/ui/qt/address_editor_frame.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/address_editor_frame.h b/ui/qt/address_editor_frame.h
index cc7e81a13eca2ec450566cdcbdfa2336efb2b0ba..15d745f535cf90ebf65b8aef735beced1246cfa7 100644 (file)
--- a/ui/qt/address_editor_frame.h
+++ b/ui/qt/address_editor_frame.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 ADDRESS_EDITOR_FRAME_H
 #define ADDRESS_EDITOR_FRAME_H

diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp
index 68808d2d5e7bd00af94b3a4b600f11bd0f71072e..4da92d8b3fc83e82d635513d6d8dc7820997ab05 100644 (file)
--- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp
+++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp
@@ -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*/
 
 #include "bluetooth_att_server_attributes_dialog.h"
 #include <ui_bluetooth_att_server_attributes_dialog.h>

diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.h b/ui/qt/bluetooth_att_server_attributes_dialog.h
index d0d1bb636dd4858224f1e297a1bf506f82b786c7..6ddbc7ce6926a86626d6b6e0aaffc3ab76b764ec 100644 (file)
--- a/ui/qt/bluetooth_att_server_attributes_dialog.h
+++ b/ui/qt/bluetooth_att_server_attributes_dialog.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 BLUETOOTH_ATT_SERVER_ATTRIBUTES_DIALOG_H
 #define BLUETOOTH_ATT_SERVER_ATTRIBUTES_DIALOG_H

diff --git a/ui/qt/bluetooth_device_dialog.cpp b/ui/qt/bluetooth_device_dialog.cpp
index c606677c31694fba2d5d50dc0ac313db2cc424f0..8ff5067b5b8f3686874e72b08e57486b57ee467a 100644 (file)
--- a/ui/qt/bluetooth_device_dialog.cpp
+++ b/ui/qt/bluetooth_device_dialog.cpp
@@ -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*/
 
 #include "bluetooth_device_dialog.h"
 #include <ui_bluetooth_device_dialog.h>

diff --git a/ui/qt/bluetooth_device_dialog.h b/ui/qt/bluetooth_device_dialog.h
index d4c21b6d0a4e4822d4d70a814b5dcbd6078e7025..0ab306d71883ce4e1c9ac00847084c2aa863eb8a 100644 (file)
--- a/ui/qt/bluetooth_device_dialog.h
+++ b/ui/qt/bluetooth_device_dialog.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 BLUETOOTH_DEVICE_DIALOG_H
 #define BLUETOOTH_DEVICE_DIALOG_H

diff --git a/ui/qt/bluetooth_devices_dialog.cpp b/ui/qt/bluetooth_devices_dialog.cpp
index b5e345186184fe2ca40f189ed6b8ac03e66c9afa..a0b6c1d76cd9f34e9f453bd3d5d9a88504966b2f 100644 (file)
--- a/ui/qt/bluetooth_devices_dialog.cpp
+++ b/ui/qt/bluetooth_devices_dialog.cpp
@@ -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*/
 
 #include "bluetooth_devices_dialog.h"
 #include <ui_bluetooth_devices_dialog.h>

diff --git a/ui/qt/bluetooth_devices_dialog.h b/ui/qt/bluetooth_devices_dialog.h
index 0c9acd4cfd1f5d68ded1f7eace3073e8bf804f85..e2bfc84181ff8f73f9ffea803a5b21720c9fbde2 100644 (file)
--- a/ui/qt/bluetooth_devices_dialog.h
+++ b/ui/qt/bluetooth_devices_dialog.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 BLUETOOTH_DEVICES_DIALOG_H
 #define BLUETOOTH_DEVICES_DIALOG_H

diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp
index a6cacb84c1618f604f4b74ae590cff1a5b7570aa..baf76ee777c90824a72fc950905536ef36d821cb 100644 (file)
--- a/ui/qt/bluetooth_hci_summary_dialog.cpp
+++ b/ui/qt/bluetooth_hci_summary_dialog.cpp
@@ -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*/
 
 #include "bluetooth_hci_summary_dialog.h"
 #include <ui_bluetooth_hci_summary_dialog.h>

diff --git a/ui/qt/bluetooth_hci_summary_dialog.h b/ui/qt/bluetooth_hci_summary_dialog.h
index a878dd074aaa76bf86cbf7531941d710b0d2d9fd..6149044452a9ecae2254eb3ff77736578097a125 100644 (file)
--- a/ui/qt/bluetooth_hci_summary_dialog.h
+++ b/ui/qt/bluetooth_hci_summary_dialog.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 BLUETOOTH_HCI_SUMMARY_DIALOG_H
 #define BLUETOOTH_HCI_SUMMARY_DIALOG_H

diff --git a/ui/qt/byte_view_tab.cpp b/ui/qt/byte_view_tab.cpp
index 0a60475cc4d5d731f1f539cf36ed5f578670531a..9b945c649e598477ab323bfd1d043e4189d479ad 100644 (file)
--- a/ui/qt/byte_view_tab.cpp
+++ b/ui/qt/byte_view_tab.cpp
@@ -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*/
 
 #include "byte_view_tab.h"
 

diff --git a/ui/qt/byte_view_tab.h b/ui/qt/byte_view_tab.h
index 87e5f73d374a96940ed20cb56afd06828bd7cc92..b3144f2886f8a36e9b7768c26d5e86aaa39f1a55 100644 (file)
--- a/ui/qt/byte_view_tab.h
+++ b/ui/qt/byte_view_tab.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 BYTE_VIEW_TAB_H
 #define BYTE_VIEW_TAB_H

diff --git a/ui/qt/capture_file.cpp b/ui/qt/capture_file.cpp
index 594ae87563bac974ac1dfe3faa3100e8218da6c0..49975352dfedb6ab398010eb16698d52e39df8ed 100644 (file)
--- a/ui/qt/capture_file.cpp
+++ b/ui/qt/capture_file.cpp
@@ -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*/
 
 #include "capture_file.h"
 

diff --git a/ui/qt/capture_file.h b/ui/qt/capture_file.h
index 5601cf602b6dbb064cca04507c19f718772d2674..a6a75f69c88e231fd6a40f1ae1c841e9168c6202 100644 (file)
--- a/ui/qt/capture_file.h
+++ b/ui/qt/capture_file.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 CAPTURE_FILE_H
 #define CAPTURE_FILE_H

diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp
index cb95ffd4d12885c8723a182bd70f421dc7911e31..4d9426011826e2faf302865ccdd7d8559d4dfd05 100644 (file)
--- a/ui/qt/capture_file_dialog.cpp
+++ b/ui/qt/capture_file_dialog.cpp
@@ -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*/
 
 #include <wiretap/wtap.h>
 

diff --git a/ui/qt/capture_file_dialog.h b/ui/qt/capture_file_dialog.h
index 234f6c6240c1366c577bd0e995fee1f38f50e9fa..f235d5dc1165718d571116ffdfaa50356584fc8f 100644 (file)
--- a/ui/qt/capture_file_dialog.h
+++ b/ui/qt/capture_file_dialog.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 CAPTURE_FILE_DIALOG_H
 #define CAPTURE_FILE_DIALOG_H

diff --git a/ui/qt/capture_file_properties_dialog.cpp b/ui/qt/capture_file_properties_dialog.cpp
index d97b4beaa1ef0ce711647a202c03dc091cf5caae..0c4a72e1ad04cc73b28e5c066ce72a1bcc758459 100644 (file)
--- a/ui/qt/capture_file_properties_dialog.cpp
+++ b/ui/qt/capture_file_properties_dialog.cpp
@@ -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*/
 
 #include "capture_file_properties_dialog.h"
 #include <ui_capture_file_properties_dialog.h>

diff --git a/ui/qt/capture_file_properties_dialog.h b/ui/qt/capture_file_properties_dialog.h
index 6298b122a09f9ae343164e88125d5f9a5e371e75..8f683125b6c339639ae64f57e06bdc8f58e5abcd 100644 (file)
--- a/ui/qt/capture_file_properties_dialog.h
+++ b/ui/qt/capture_file_properties_dialog.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 CAPTURE_FILE_PROPERTIES_DIALOG_H
 #define CAPTURE_FILE_PROPERTIES_DIALOG_H

diff --git a/ui/qt/capture_filter_syntax_worker.cpp b/ui/qt/capture_filter_syntax_worker.cpp
index 7064d13f4129ace09874f7b7a337d7b760e7f79a..8a118e3142f37c6176c42ad9047a7bf579a9e5a2 100644 (file)
--- a/ui/qt/capture_filter_syntax_worker.cpp
+++ b/ui/qt/capture_filter_syntax_worker.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/capture_filter_syntax_worker.h b/ui/qt/capture_filter_syntax_worker.h
index 34ccc74f64461e16743e3215643b068f6fabe4e9..8dcb2cba65ce77ab5e74d9b7d1b3457b19eb8a8c 100644 (file)
--- a/ui/qt/capture_filter_syntax_worker.h
+++ b/ui/qt/capture_filter_syntax_worker.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 CAPTURE_FILTER_SYNTAX_WORKER_H
 #define CAPTURE_FILTER_SYNTAX_WORKER_H

diff --git a/ui/qt/capture_info_dialog.cpp b/ui/qt/capture_info_dialog.cpp
index 7427dc71d0b236dbbfbdc813d1869d2a315f3df5..25532d7a12668188156a931aa3657b6712053e18 100644 (file)
--- a/ui/qt/capture_info_dialog.cpp
+++ b/ui/qt/capture_info_dialog.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/capture_info_dialog.h b/ui/qt/capture_info_dialog.h
index 37a12e8634d307a4f7aa030ec8587a291b0b6cb7..c8b0013613ac8e4d8e5dacc4ba72c7ec28f35427 100644 (file)
--- a/ui/qt/capture_info_dialog.h
+++ b/ui/qt/capture_info_dialog.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 CAPTURE_INFO_DIALOG_H
 #define CAPTURE_INFO_DIALOG_H

diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp
index ecfe201829e7545147a130c2ee5ffb7abadb54ee..6874ff14f133b0aa4630e5636898dd9f6a000c0c 100644 (file)
--- a/ui/qt/capture_interfaces_dialog.cpp
+++ b/ui/qt/capture_interfaces_dialog.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/capture_interfaces_dialog.h b/ui/qt/capture_interfaces_dialog.h
index 789331082b6e2e21f0b78c98d9a27be5a9806235..7deb13f311f621951e8d00fa56fa4e2514f68938 100644 (file)
--- a/ui/qt/capture_interfaces_dialog.h
+++ b/ui/qt/capture_interfaces_dialog.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 CAPTURE_INTERFACES_DIALOG_H

diff --git a/ui/qt/capture_preferences_frame.cpp b/ui/qt/capture_preferences_frame.cpp
index aa0d4149f247543cd2e89b955d23e7024d451156..b31581461245135b398ea3d13235aac6a0876803 100644 (file)
--- a/ui/qt/capture_preferences_frame.cpp
+++ b/ui/qt/capture_preferences_frame.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/capture_preferences_frame.h b/ui/qt/capture_preferences_frame.h
index 0f3759aca53d953793b3fc00b04d4fb7ecac01bd..e8af0a50ffd25bdc894360442b0059aa6b7f4424 100644 (file)
--- a/ui/qt/capture_preferences_frame.h
+++ b/ui/qt/capture_preferences_frame.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 CAPTURE_PREFERENCES_FRAME_H
 #define CAPTURE_PREFERENCES_FRAME_H

diff --git a/ui/qt/coloring_rules_dialog.cpp b/ui/qt/coloring_rules_dialog.cpp
index 9b0ffca04747c4e9e4c2daca67d354145fc246c9..ab19bb561390003fac5aab677012c51216757ed4 100644 (file)
--- a/ui/qt/coloring_rules_dialog.cpp
+++ b/ui/qt/coloring_rules_dialog.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/coloring_rules_dialog.h b/ui/qt/coloring_rules_dialog.h
index 6051759dda677363589b5b9d438ca5333ab91abd..c1c5e6d5fc016cc3c7720f29f8a7fc5ffe0e0681 100644 (file)
--- a/ui/qt/coloring_rules_dialog.h
+++ b/ui/qt/coloring_rules_dialog.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 COLORING_RULES_DIALOG_H
 #define COLORING_RULES_DIALOG_H

diff --git a/ui/qt/column_editor_frame.cpp b/ui/qt/column_editor_frame.cpp
index f82a7a2c3812d26a82357dbdb91ed1696ff92b7f..dba4ecc4b5c7c4161fd8a5735c6192275bf1c348 100644 (file)
--- a/ui/qt/column_editor_frame.cpp
+++ b/ui/qt/column_editor_frame.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/column_editor_frame.h b/ui/qt/column_editor_frame.h
index 2ef6277a7d7dfa8f27a92013e95a6d1986e59c41..1e9ce64f555a92a4f3fe0001db4352dfec85cce1 100644 (file)
--- a/ui/qt/column_editor_frame.h
+++ b/ui/qt/column_editor_frame.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 COLUMN_EDITOR_FRAME_H
 #define COLUMN_EDITOR_FRAME_H

diff --git a/ui/qt/column_preferences_frame.cpp b/ui/qt/column_preferences_frame.cpp
index 5d93ff33759cdff5d1c7d7910fa8dac93e111051..394588a18cb13179229029e4f170b3691c9511ec 100644 (file)
--- a/ui/qt/column_preferences_frame.cpp
+++ b/ui/qt/column_preferences_frame.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/column_preferences_frame.h b/ui/qt/column_preferences_frame.h
index a9e2c08c8c6c34a1c30954b37a8ff9585cb6ca46..59b63ca51b17643fbe24f81ece7f9fa2387ad844 100644 (file)
--- a/ui/qt/column_preferences_frame.h
+++ b/ui/qt/column_preferences_frame.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 COLUMN_PREFERENCES_FRAME_H
 #define COLUMN_PREFERENCES_FRAME_H

diff --git a/ui/qt/compiled_filter_output.cpp b/ui/qt/compiled_filter_output.cpp
index c82f3dd7a30c41d4fab304c4af7bc4637c8de67a..1e6661b8ca86418e22ad97a88872acdae55e4271 100644 (file)
--- a/ui/qt/compiled_filter_output.cpp
+++ b/ui/qt/compiled_filter_output.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/compiled_filter_output.h b/ui/qt/compiled_filter_output.h
index 3310eeeb8c0aa25d9a3f8930c2f18bce7de875bc..d7af289af744429c88e745258152203594442568 100644 (file)
--- a/ui/qt/compiled_filter_output.h
+++ b/ui/qt/compiled_filter_output.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 COMPILEDFILTEROUTPUT_H
 #define COMPILEDFILTEROUTPUT_H

diff --git a/ui/qt/conversation_colorize_action.cpp b/ui/qt/conversation_colorize_action.cpp
index d41139b8bb1217277c461b84c7253b96f59539f1..da3720fde39d6c1379499b09d6b3e724e0eb9b52 100644 (file)
--- a/ui/qt/conversation_colorize_action.cpp
+++ b/ui/qt/conversation_colorize_action.cpp
@@ -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*/
 
 #include "conversation_colorize_action.h"
 

diff --git a/ui/qt/conversation_colorize_action.h b/ui/qt/conversation_colorize_action.h
index 59c7c77b93b49fd6e9832f2d39665e61b2e53735..f78cdc042830b2ccd146061e65a2f138dc7dee4c 100644 (file)
--- a/ui/qt/conversation_colorize_action.h
+++ b/ui/qt/conversation_colorize_action.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 CONVERSATIONCOLORIZEACTION_H
 #define CONVERSATIONCOLORIZEACTION_H

diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp
index 2d23e15ed72a8d6c1e19cc3bcbbfa27e288cf175..1687628e1ff05681f99c932ce45c71239fc048c8 100644 (file)
--- a/ui/qt/conversation_dialog.cpp
+++ b/ui/qt/conversation_dialog.cpp
@@ -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*/
 
 #include "conversation_dialog.h"
 

diff --git a/ui/qt/conversation_dialog.h b/ui/qt/conversation_dialog.h
index 4954135bccbb4d0b10f7e2adb308adbfe99a674f..94a5e776f6570d74656c25f4c4ca724c4e769f81 100644 (file)
--- a/ui/qt/conversation_dialog.h
+++ b/ui/qt/conversation_dialog.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 CONVERSATION_DIALOG_H
 #define CONVERSATION_DIALOG_H

diff --git a/ui/qt/conversation_hash_tables_dialog.cpp b/ui/qt/conversation_hash_tables_dialog.cpp
index e60b9346ce03fad0f6aac8eee5d1f5ad9bf70cd3..3aa3e85ec726b3f0a1e1e5bb3fcc8fc545ad18ea 100644 (file)
--- a/ui/qt/conversation_hash_tables_dialog.cpp
+++ b/ui/qt/conversation_hash_tables_dialog.cpp
@@ -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*/
 
 #include "conversation_hash_tables_dialog.h"
 #include <ui_conversation_hash_tables_dialog.h>

diff --git a/ui/qt/conversation_hash_tables_dialog.h b/ui/qt/conversation_hash_tables_dialog.h
index 1f20a0b345f4efb94e29ed8bde74f27022c6a2f5..00c4bfa60abc2407a842336719c897cfcbac3319 100644 (file)
--- a/ui/qt/conversation_hash_tables_dialog.h
+++ b/ui/qt/conversation_hash_tables_dialog.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 CONVERSATION_HASH_TABLES_DIALOG_H
 #define CONVERSATION_HASH_TABLES_DIALOG_H

diff --git a/ui/qt/decode_as_dialog.cpp b/ui/qt/decode_as_dialog.cpp
index 23d9719d0d9623cda8635152fb55673b54f62c13..22168a4496e514b337e4b5c728c8985a0a40eb04 100644 (file)
--- a/ui/qt/decode_as_dialog.cpp
+++ b/ui/qt/decode_as_dialog.cpp
@@ -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*/
 
 #include "decode_as_dialog.h"
 #include <ui_decode_as_dialog.h>

diff --git a/ui/qt/decode_as_dialog.h b/ui/qt/decode_as_dialog.h
index 6e0df067c3eab263d5d5e56220ef1115f4423e5b..19be96d8615d2ddb62a70900c3cb2cd0b295ebf6 100644 (file)
--- a/ui/qt/decode_as_dialog.h
+++ b/ui/qt/decode_as_dialog.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 DECODE_AS_DIALOG_H
 #define DECODE_AS_DIALOG_H

diff --git a/ui/qt/display_filter_expression_dialog.cpp b/ui/qt/display_filter_expression_dialog.cpp
index 629a39fa54eef3812256a5b2ff1407724b45c5c9..8c19d69c13b92da53d7b6a20a62f53c0438a1641 100644 (file)
--- a/ui/qt/display_filter_expression_dialog.cpp
+++ b/ui/qt/display_filter_expression_dialog.cpp
@@ -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*/
 
 #include <algorithm>
 

diff --git a/ui/qt/display_filter_expression_dialog.h b/ui/qt/display_filter_expression_dialog.h
index 808c341dfa077969e86f7dc96a48aa01d1c44c38..4715f7307f3bec9d6b1c0016635673321f492fdd 100644 (file)
--- a/ui/qt/display_filter_expression_dialog.h
+++ b/ui/qt/display_filter_expression_dialog.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 DISPLAY_FILTER_EXPRESSION_DIALOG_H
 #define DISPLAY_FILTER_EXPRESSION_DIALOG_H

diff --git a/ui/qt/dissector_tables_dialog.cpp b/ui/qt/dissector_tables_dialog.cpp
index 91d55dc8a657917b661a3e148453f20214df5c8e..e3f4fcab85a7c5f0a80489e02f331359c23e0fc2 100644 (file)
--- a/ui/qt/dissector_tables_dialog.cpp
+++ b/ui/qt/dissector_tables_dialog.cpp
@@ -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
  */
 
  #include "config.h"

diff --git a/ui/qt/dissector_tables_dialog.h b/ui/qt/dissector_tables_dialog.h
index 6f3f3d57286eea5485f21c728856e34876ab7012..85386fb76c918898b9131c32bfc22b07c03134c9 100644 (file)
--- a/ui/qt/dissector_tables_dialog.h
+++ b/ui/qt/dissector_tables_dialog.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 DISSECTOR_TABLES_DIALOG_H

diff --git a/ui/qt/enabled_protocols_dialog.cpp b/ui/qt/enabled_protocols_dialog.cpp
index 32bd27b64e51de9a0db6aaa97b2b1e06886df079..3c796b21be4783129a4935de984d605d4d5f9b45 100644 (file)
--- a/ui/qt/enabled_protocols_dialog.cpp
+++ b/ui/qt/enabled_protocols_dialog.cpp
@@ -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*/
 
 #include "enabled_protocols_dialog.h"
 #include <ui_enabled_protocols_dialog.h>

diff --git a/ui/qt/enabled_protocols_dialog.h b/ui/qt/enabled_protocols_dialog.h
index 412b2387c7048235e852d471ab884b3e9981233f..f7642bb841ab5fdf56ea4c7e4a8db148f0170df0 100644 (file)
--- a/ui/qt/enabled_protocols_dialog.h
+++ b/ui/qt/enabled_protocols_dialog.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 ENABLED_PROTOCOLS_DIALOG_H
 #define ENABLED_PROTOCOLS_DIALOG_H

diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp
index 5a71c9f69cd1df2f6ab02a26b195cde2977ba4dc..20b79e8881c50d8190c5d8d049971592b490f2bb 100644 (file)
--- a/ui/qt/endpoint_dialog.cpp
+++ b/ui/qt/endpoint_dialog.cpp
@@ -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*/
 
 #include "endpoint_dialog.h"
 

diff --git a/ui/qt/endpoint_dialog.h b/ui/qt/endpoint_dialog.h
index c55d31034c2d975aa6797eeb11770e7048050d65..5ca6084e54cefec9082a3d5f6a0006833f014334 100644 (file)
--- a/ui/qt/endpoint_dialog.h
+++ b/ui/qt/endpoint_dialog.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 ENDPOINT_DIALOG_H
 #define ENDPOINT_DIALOG_H

diff --git a/ui/qt/expert_info_dialog.cpp b/ui/qt/expert_info_dialog.cpp
index 64df4ddf12ea3ef7df90d1206a9c9173de6498c0..c6aa2c72230fe3ec2ef576c8a6669c9100d60765 100644 (file)
--- a/ui/qt/expert_info_dialog.cpp
+++ b/ui/qt/expert_info_dialog.cpp
@@ -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*/
 
 #include "expert_info_dialog.h"
 #include <ui_expert_info_dialog.h>

diff --git a/ui/qt/expert_info_dialog.h b/ui/qt/expert_info_dialog.h
index 69603bdbd631f77c44e4412cc85cd0049fd60bd5..0840a577579b8b889bed65eaba11eb209fa54ebc 100644 (file)
--- a/ui/qt/expert_info_dialog.h
+++ b/ui/qt/expert_info_dialog.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 EXPERT_INFO_DIALOG_H
 #define EXPERT_INFO_DIALOG_H

diff --git a/ui/qt/export_dissection_dialog.cpp b/ui/qt/export_dissection_dialog.cpp
index 81e0e3264436d9ed9e892c9de35698720e911e65..447638fc1e28341f71c2e03f2fcbf4496a63f8eb 100644 (file)
--- a/ui/qt/export_dissection_dialog.cpp
+++ b/ui/qt/export_dissection_dialog.cpp
@@ -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*/
 
 #include "export_dissection_dialog.h"
 

diff --git a/ui/qt/export_dissection_dialog.h b/ui/qt/export_dissection_dialog.h
index c4992eb0d7348afb751422bbf828f0befead4fb2..b6ac1072be509ad923d0c8095a413c3d9cb2d53d 100644 (file)
--- a/ui/qt/export_dissection_dialog.h
+++ b/ui/qt/export_dissection_dialog.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 EXPORT_DISSECTION_DIALOG_H
 #define EXPORT_DISSECTION_DIALOG_H

diff --git a/ui/qt/export_object_action.cpp b/ui/qt/export_object_action.cpp
index 188b7bb5c1e11aaff732f24fdabdd28ea4644027..0ed8fe6af596bd7bace32ea58f2e80eaa42cd40d 100644 (file)
--- a/ui/qt/export_object_action.cpp
+++ b/ui/qt/export_object_action.cpp
@@ -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*/
 
 #include <config.h>
 

diff --git a/ui/qt/export_object_action.h b/ui/qt/export_object_action.h
index 759ebfc5c8f82b41f276b37bc58cc3ddfd777602..077d979ad1ab5b0ac4a8377930bfd9cdf81eb9ef 100644 (file)
--- a/ui/qt/export_object_action.h
+++ b/ui/qt/export_object_action.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 EXPORTOBJECTACTION_H
 #define EXPORTOBJECTACTION_H

diff --git a/ui/qt/export_object_dialog.cpp b/ui/qt/export_object_dialog.cpp
index d0ebc69cc49dee32cf4f07d4b1acc18d6ddca946..f0057998dde5feb5a11f604cc4b92aacc3184242 100644 (file)
--- a/ui/qt/export_object_dialog.cpp
+++ b/ui/qt/export_object_dialog.cpp
@@ -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
  */
 
 #include "export_object_dialog.h"

diff --git a/ui/qt/export_object_dialog.h b/ui/qt/export_object_dialog.h
index c28c965e679e847a7adc0c431b33b8d0e1f1d301..5fa873516635146c1ad22c27e8d09df007298b92 100644 (file)
--- a/ui/qt/export_object_dialog.h
+++ b/ui/qt/export_object_dialog.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 EXPORT_OBJECT_DIALOG_H

diff --git a/ui/qt/export_pdu_dialog.cpp b/ui/qt/export_pdu_dialog.cpp
index 6386848611e690bff74db8c38730af759636e147..a30fd523d786ed763371ca63687173fdc120e828 100644 (file)
--- a/ui/qt/export_pdu_dialog.cpp
+++ b/ui/qt/export_pdu_dialog.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/export_pdu_dialog.h b/ui/qt/export_pdu_dialog.h
index 0139ff6477407ad8f1ac4175202d61a3cf566afc..a6afbce030959a3ffa0ba7088e72ee4db424b099 100644 (file)
--- a/ui/qt/export_pdu_dialog.h
+++ b/ui/qt/export_pdu_dialog.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 EXPORT_PDU_DIALOG_H
 #define EXPORT_PDU_DIALOG_H

diff --git a/ui/qt/extcap_argument.cpp b/ui/qt/extcap_argument.cpp
index 76fc06040927b31298a653577df5ad984fa4b58a..1d97d47930a8c0b0fea2a470d8e862c6c10cce4f 100644 (file)
--- a/ui/qt/extcap_argument.cpp
+++ b/ui/qt/extcap_argument.cpp
@@ -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*/
 
 #include <extcap_argument.h>
 

diff --git a/ui/qt/extcap_argument.h b/ui/qt/extcap_argument.h
index 23cc4b42f42781a7da8cfcdff7b0c2468e28253d..f7fd27ce37ee09012035d4d81b8b6301f7bd1e34 100644 (file)
--- a/ui/qt/extcap_argument.h
+++ b/ui/qt/extcap_argument.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 UI_QT_EXTCAP_ARGUMENT_H_
 #define UI_QT_EXTCAP_ARGUMENT_H_

diff --git a/ui/qt/extcap_argument_file.cpp b/ui/qt/extcap_argument_file.cpp
index ebda3d28071a37abe930cfacdb24c1bf3b057a01..9a708cc347221ec230fdd6dd840a0f30f46d9b4c 100644 (file)
--- a/ui/qt/extcap_argument_file.cpp
+++ b/ui/qt/extcap_argument_file.cpp
@@ -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*/
 
 #include <extcap_argument.h>
 #include <extcap_argument_file.h>

diff --git a/ui/qt/extcap_argument_file.h b/ui/qt/extcap_argument_file.h
index a1e1c9e706ef95a1b24406080b78a6f608260d9b..5e8eeeedca11e30f24dbf4508dba24c78f306c7b 100644 (file)
--- a/ui/qt/extcap_argument_file.h
+++ b/ui/qt/extcap_argument_file.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 UI_QT_EXTCAP_ARGUMENT_FILE_H_
 #define UI_QT_EXTCAP_ARGUMENT_FILE_H_

diff --git a/ui/qt/extcap_argument_multiselect.cpp b/ui/qt/extcap_argument_multiselect.cpp
index 91db6378032fc77519fa0c5a749718b46b14de67..92c44eab4558816f00e9bde0712e15e62c74e85d 100644 (file)
--- a/ui/qt/extcap_argument_multiselect.cpp
+++ b/ui/qt/extcap_argument_multiselect.cpp
@@ -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*/
 
 #include <extcap_argument.h>
 #include <extcap_argument_file.h>

diff --git a/ui/qt/extcap_argument_multiselect.h b/ui/qt/extcap_argument_multiselect.h
index 86b0671b26355ddeb4c9455c1b0365a3d19fdf22..ef894455814c7be19a80b0fe6fac6638c5f5aada 100644 (file)
--- a/ui/qt/extcap_argument_multiselect.h
+++ b/ui/qt/extcap_argument_multiselect.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 UI_QT_EXTCAP_ARGUMENT_MULTISELECT_H_
 #define UI_QT_EXTCAP_ARGUMENT_MULTISELECT_H_

diff --git a/ui/qt/extcap_options_dialog.cpp b/ui/qt/extcap_options_dialog.cpp
index 35f1d7637ab7af725d022a7ce38a1db9914acab9..cd7e386e48093fae6da1f2b92bacbb090dc8437e 100644 (file)
--- a/ui/qt/extcap_options_dialog.cpp
+++ b/ui/qt/extcap_options_dialog.cpp
@@ -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*/
 
 #include <config.h>
 

diff --git a/ui/qt/extcap_options_dialog.h b/ui/qt/extcap_options_dialog.h
index ce89c52917372e78f1793f1bd1b4cafc913fe39c..a57852841247b4914d05eb37d970dc0547d3a3b3 100644 (file)
--- a/ui/qt/extcap_options_dialog.h
+++ b/ui/qt/extcap_options_dialog.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 EXTCAP_OPTIONS_DIALOG_H

diff --git a/ui/qt/file_set_dialog.cpp b/ui/qt/file_set_dialog.cpp
index a8e792f407b2beb56bedf5056924a00f0c9cdeed..7f21892700ecafc6bc2cfe416ea93121a7bc5572 100644 (file)
--- a/ui/qt/file_set_dialog.cpp
+++ b/ui/qt/file_set_dialog.cpp
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/qt/file_set_dialog.h b/ui/qt/file_set_dialog.h
index 49c994c7c683a7f36ab3a6aaf6a2319cee880513..3d976e7771b9048f5ea70506be61e3ee5178cea2 100644 (file)
--- a/ui/qt/file_set_dialog.h
+++ b/ui/qt/file_set_dialog.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 FILE_SET_DIALOG_H

diff --git a/ui/qt/filter_action.cpp b/ui/qt/filter_action.cpp
index dcff4312dc20401a3a141b78168b724966061497..2991343352332e5556e2729e8bae16b98c0c5f93 100644 (file)
--- a/ui/qt/filter_action.cpp
+++ b/ui/qt/filter_action.cpp
@@ -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*/
 
 #include "filter_action.h"
 

diff --git a/ui/qt/filter_action.h b/ui/qt/filter_action.h
index e43d7f4f043de66974571254ebac9eead4bbc970..8b6b99c6ebb52157450ecf276e67c8ab693f705e 100644 (file)
--- a/ui/qt/filter_action.h
+++ b/ui/qt/filter_action.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*/
 
 /* Derived from gtk/filter_utils.h */
 

diff --git a/ui/qt/filter_dialog.cpp b/ui/qt/filter_dialog.cpp
index 518a7aca4317461d347a8829fbf16f8507d2e1f1..7e51d2f345e3cd41ea8cfdcc94869ca371188268 100644 (file)
--- a/ui/qt/filter_dialog.cpp
+++ b/ui/qt/filter_dialog.cpp
@@ -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*/
 
 #include <config.h>
 

diff --git a/ui/qt/filter_dialog.h b/ui/qt/filter_dialog.h
index 22ca87e4cb1e3c94d44802fafdada9f8c51b90ae..743ccb6830d67e381ee77ca5e3dcd4af0e2e40b7 100644 (file)
--- a/ui/qt/filter_dialog.h
+++ b/ui/qt/filter_dialog.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 FILTER_DIALOG_H
 #define FILTER_DIALOG_H

diff --git a/ui/qt/filter_expression_frame.cpp b/ui/qt/filter_expression_frame.cpp
index 8c938c9e86c97c4216c1fcc3527dd718f87a3e69..08fdd0922d9d5f5b2d85cf85409e24fb7dcf64b3 100644 (file)
--- a/ui/qt/filter_expression_frame.cpp
+++ b/ui/qt/filter_expression_frame.cpp
@@ -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
  */
 
 #include "filter_expression_frame.h"

diff --git a/ui/qt/filter_expression_frame.h b/ui/qt/filter_expression_frame.h
index dc2013301cf538cac6e6d1ec36a403662d34b044..23494dafa2fa3012a5f2232e16b638a599c4bca6 100644 (file)
--- a/ui/qt/filter_expression_frame.h
+++ b/ui/qt/filter_expression_frame.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 FILTER_EXPRESSION_FRAME_H

diff --git a/ui/qt/firewall_rules_dialog.cpp b/ui/qt/firewall_rules_dialog.cpp
index ef7b4310ae6909b5950dc9cf11f6f9e597612e4a..a7a49229f57cd07c235020c366204c17f81ea35d 100644 (file)
--- a/ui/qt/firewall_rules_dialog.cpp
+++ b/ui/qt/firewall_rules_dialog.cpp
@@ -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*/
 
 #include <config.h>
 

diff --git a/ui/qt/firewall_rules_dialog.h b/ui/qt/firewall_rules_dialog.h
index a0d3037880b3ebd15d141adc1d8d9d751584349f..761e890df23c74976d3465a48d3ba2f57c0002f6 100644 (file)
--- a/ui/qt/firewall_rules_dialog.h
+++ b/ui/qt/firewall_rules_dialog.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 FIREWALL_RULES_DIALOG_H
 #define FIREWALL_RULES_DIALOG_H

diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index a04608bc625c5eb21aabd885a22add46042f1561..6ffdc2c9670ab6577794a4c7bffadabcee0afa68 100644 (file)
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -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*/
 
 #include "follow_stream_dialog.h"
 #include <ui_follow_stream_dialog.h>

diff --git a/ui/qt/follow_stream_dialog.h b/ui/qt/follow_stream_dialog.h
index c2c22f1520a8c2177416d50b1a23540c8e2d02bf..070c376877f5a612fdc722545cc56630cd334398 100644 (file)
--- a/ui/qt/follow_stream_dialog.h
+++ b/ui/qt/follow_stream_dialog.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 FOLLOW_STREAM_DIALOG_H
 #define FOLLOW_STREAM_DIALOG_H

diff --git a/ui/qt/font_color_preferences_frame.cpp b/ui/qt/font_color_preferences_frame.cpp
index 908d3b25fcdb13d21b64b8210cfd7cb8d2cde723..76873459e6481505a5c2cd7346568caa0ff8b7f4 100644 (file)
--- a/ui/qt/font_color_preferences_frame.cpp
+++ b/ui/qt/font_color_preferences_frame.cpp
@@ -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
  */
 #include <config.h>
 

diff --git a/ui/qt/font_color_preferences_frame.h b/ui/qt/font_color_preferences_frame.h
index 55c02ede75090fa7d46fdf295e9de02ddd5dd804..6bac996231f069f2ee8ef3a4bcc51e23067d0951 100644 (file)
--- a/ui/qt/font_color_preferences_frame.h
+++ b/ui/qt/font_color_preferences_frame.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 FONT_COLOR_PREFERENCES_FRAME_H
 #define FONT_COLOR_PREFERENCES_FRAME_H

diff --git a/ui/qt/funnel_statistics.cpp b/ui/qt/funnel_statistics.cpp
index 51c7d3b11148858302a55b7896e096a1a9773738..1eac12ca2b515e38066c96fbf637c513b4ce5374 100644 (file)
--- a/ui/qt/funnel_statistics.cpp
+++ b/ui/qt/funnel_statistics.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/funnel_statistics.h b/ui/qt/funnel_statistics.h
index 41a12e63a354f91c7824e47a3be2f8d84a279c4c..7db3c20313066e2870390d543ef4d9d79ea23c77 100644 (file)
--- a/ui/qt/funnel_statistics.h
+++ b/ui/qt/funnel_statistics.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 FUNNELSTATISTICS_H
 #define FUNNELSTATISTICS_H

diff --git a/ui/qt/funnel_string_dialog.cpp b/ui/qt/funnel_string_dialog.cpp
index 20d40fb9ff465fc2a730295552e5a07198c87b42..401172ac5f358487e1f1e5cdc7c7bbec649b4c46 100644 (file)
--- a/ui/qt/funnel_string_dialog.cpp
+++ b/ui/qt/funnel_string_dialog.cpp
@@ -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*/
 
 #include "funnel_string_dialog.h"
 #include <ui_funnel_string_dialog.h>

diff --git a/ui/qt/funnel_string_dialog.h b/ui/qt/funnel_string_dialog.h
index 3eb3674ba3eabbd989724534f356d2ebd48d687b..608e8b7114f21ad80670a28574ad545e7bbbaec8 100644 (file)
--- a/ui/qt/funnel_string_dialog.h
+++ b/ui/qt/funnel_string_dialog.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 FUNNEL_STRING_DIALOG_H
 #define FUNNEL_STRING_DIALOG_H

diff --git a/ui/qt/funnel_text_dialog.cpp b/ui/qt/funnel_text_dialog.cpp
index d9c10a24ae1bdf920e01b5f89d65b9f717803be1..faa426e504da93ba401d4d7ba4f49239a6189a6c 100644 (file)
--- a/ui/qt/funnel_text_dialog.cpp
+++ b/ui/qt/funnel_text_dialog.cpp
@@ -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*/
 
 #include "funnel_text_dialog.h"
 #include <ui_funnel_text_dialog.h>

diff --git a/ui/qt/funnel_text_dialog.h b/ui/qt/funnel_text_dialog.h
index 16cbb130d524889c1663ff6b5e2121d3a288bdfe..16031c6af2cb48a9ff8d53f4f9893236f27373f0 100644 (file)
--- a/ui/qt/funnel_text_dialog.h
+++ b/ui/qt/funnel_text_dialog.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 FUNNEL_TEXT_DIALOG_H
 #define FUNNEL_TEXT_DIALOG_H

diff --git a/ui/qt/geometry_state_dialog.cpp b/ui/qt/geometry_state_dialog.cpp
index 9f7e3ec3e3a22eed9602ffa81391e27577790788..4ef86a72dae4ded820068c6a471f119f771949e6 100644 (file)
--- a/ui/qt/geometry_state_dialog.cpp
+++ b/ui/qt/geometry_state_dialog.cpp
@@ -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*/
 
 #include "geometry_state_dialog.h"
 #include <ui/qt/utils/qt_ui_utils.h>

diff --git a/ui/qt/geometry_state_dialog.h b/ui/qt/geometry_state_dialog.h
index 22698ab65c1799f83b9e005c79ec9aacea1d42da..277851cc024c883780282cc319bf465c22daa05f 100644 (file)
--- a/ui/qt/geometry_state_dialog.h
+++ b/ui/qt/geometry_state_dialog.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 GEOMETRY_STATE_DIALOG_H
 #define GEOMETRY_STATE_DIALOG_H

diff --git a/ui/qt/gpl-template.txt b/ui/qt/gpl-template.txt
index c8a976deae5c18b3427da4a75c03df5a5bc50eb4..7db6500c062c74e7cc2f75cfc8fde7c628019b07 100644 (file)
--- a/ui/qt/gpl-template.txt
+++ b/ui/qt/gpl-template.txt
@@ -4,4 +4,4 @@
  * 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/ui/qt/gsm_map_summary_dialog.cpp b/ui/qt/gsm_map_summary_dialog.cpp
index 585f7c36c2c1a14dc08eb1140aede9abcda53db7..2dacb48b0692e0e96874e9b708b1bf829a56d45f 100644 (file)
--- a/ui/qt/gsm_map_summary_dialog.cpp
+++ b/ui/qt/gsm_map_summary_dialog.cpp
@@ -8,7 +8,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 "gsm_map_summary_dialog.h"
 #include <ui_gsm_map_summary_dialog.h>

diff --git a/ui/qt/gsm_map_summary_dialog.h b/ui/qt/gsm_map_summary_dialog.h
index efe6c4c317ed136d26850292c8a03fde0799cb91..8e1cfae2f2a3061414771209031cf8127ec83cec 100644 (file)
--- a/ui/qt/gsm_map_summary_dialog.h
+++ b/ui/qt/gsm_map_summary_dialog.h
@@ -8,7 +8,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 GSM_MAP_SUMMARY_DIALOG_H
 #define GSM_MAP_SUMMARY_DIALOG_H

diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
index f67f317659aea8844e2d9eccaf00d84a7603f68a..d5411a60168b1bbbfd0a3934a30dbc93ab78ec3a 100644 (file)
--- a/ui/qt/iax2_analysis_dialog.cpp
+++ b/ui/qt/iax2_analysis_dialog.cpp
@@ -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*/
 
 #include "iax2_analysis_dialog.h"
 #include <ui_iax2_analysis_dialog.h>

diff --git a/ui/qt/iax2_analysis_dialog.h b/ui/qt/iax2_analysis_dialog.h
index c1a86417d39c03dfebfcaea2aa66cdb3ccb7d296..a29207f8457a07f6a86e266038e6d8a7ed6b1673 100644 (file)
--- a/ui/qt/iax2_analysis_dialog.h
+++ b/ui/qt/iax2_analysis_dialog.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 IAX2_ANALYSIS_DIALOG_H
 #define IAX2_ANALYSIS_DIALOG_H

diff --git a/ui/qt/import_text_dialog.cpp b/ui/qt/import_text_dialog.cpp
index 3f07e154104ac19f74e0f925b13c2c96ec8cf3dd..0bcff538a9780f9834c8d8c97870efd284405911 100644 (file)
--- a/ui/qt/import_text_dialog.cpp
+++ b/ui/qt/import_text_dialog.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/import_text_dialog.h b/ui/qt/import_text_dialog.h
index acc3911aadf5e6b1f1f94f4d70efd18d22053fa6..261dea68cd269f7d0ca0497646701a47b8a4e4d0 100644 (file)
--- a/ui/qt/import_text_dialog.h
+++ b/ui/qt/import_text_dialog.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 IMPORT_TEXT_DIALOG_H
 #define IMPORT_TEXT_DIALOG_H

diff --git a/ui/qt/interface_frame.cpp b/ui/qt/interface_frame.cpp
index d20e04bf2593ffdacb8f6c648c73f0b3b8d3e386..756812865f537ff2fa39f9dea59c027ef235ecbd 100644 (file)
--- a/ui/qt/interface_frame.cpp
+++ b/ui/qt/interface_frame.cpp
@@ -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*/
 #include "config.h"
 #include <ui_interface_frame.h>
 

diff --git a/ui/qt/interface_frame.h b/ui/qt/interface_frame.h
index 1d3036d74cf3631ca963e687a80dac1767c3951d..5879db4f24fd5a29b4b91d7a6eb46fe3537da1da 100644 (file)
--- a/ui/qt/interface_frame.h
+++ b/ui/qt/interface_frame.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 INTERFACE_FRAME_H
 #define INTERFACE_FRAME_H

diff --git a/ui/qt/interface_toolbar.cpp b/ui/qt/interface_toolbar.cpp
index aebb5d887183fc1b2aa424b2a83036399726f44f..6262dd0803d3186cb5dc1c970d0798fad89a45f2 100644 (file)
--- a/ui/qt/interface_toolbar.cpp
+++ b/ui/qt/interface_toolbar.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/interface_toolbar.h b/ui/qt/interface_toolbar.h
index 41412117294606b30fd7fc7acf20f211b3b695ff..4806ce7d01aa46157b4b09a2670df8bb369eb68f 100644 (file)
--- a/ui/qt/interface_toolbar.h
+++ b/ui/qt/interface_toolbar.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 INTERFACE_TOOLBAR_H
 #define INTERFACE_TOOLBAR_H

diff --git a/ui/qt/interface_toolbar_reader.cpp b/ui/qt/interface_toolbar_reader.cpp
index 8fc5d6755678df83bf411cee433af01b68ca85c8..1e3ee907fb7e796b8b9712969ef919b0daf10df4 100644 (file)
--- a/ui/qt/interface_toolbar_reader.cpp
+++ b/ui/qt/interface_toolbar_reader.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/interface_toolbar_reader.h b/ui/qt/interface_toolbar_reader.h
index d412e0d2cdb23df6c1bdf677e762b3307e9f4c65..7e27402cd5dba3decf811add6b4b59f989d15a13 100644 (file)
--- a/ui/qt/interface_toolbar_reader.h
+++ b/ui/qt/interface_toolbar_reader.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 INTERFACE_TOOLBAR_READER_H
 #define INTERFACE_TOOLBAR_READER_H

diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp
index 0822638009a1437d1020707280cd83150d353f9d..0ee85cbdcc672dcc3ee952723a01f3b2dc3b73c3 100644 (file)
--- a/ui/qt/io_graph_dialog.cpp
+++ b/ui/qt/io_graph_dialog.cpp
@@ -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*/
 
 #include "io_graph_dialog.h"
 #include <ui_io_graph_dialog.h>

diff --git a/ui/qt/io_graph_dialog.h b/ui/qt/io_graph_dialog.h
index b84014f96f1961fcda1049114a2e0fbb65a91476..9f85c7ece372c4fa13b411b43059a7632bec7db1 100644 (file)
--- a/ui/qt/io_graph_dialog.h
+++ b/ui/qt/io_graph_dialog.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 IO_GRAPH_DIALOG_H
 #define IO_GRAPH_DIALOG_H

diff --git a/ui/qt/layout_preferences_frame.cpp b/ui/qt/layout_preferences_frame.cpp
index f003eccb1eb88ef33cdf515579d3546ee71c48d6..7ce625b9a94dee0565c0cc5e7dd6a80704aacd3d 100644 (file)
--- a/ui/qt/layout_preferences_frame.cpp
+++ b/ui/qt/layout_preferences_frame.cpp
@@ -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
  */
 
 #include <config.h>

diff --git a/ui/qt/layout_preferences_frame.h b/ui/qt/layout_preferences_frame.h
index cad718c95b6e04a4f643b8f2f516734b62ac5aeb..6062d1139d29e1025caa89da2f8649b91c953e60 100644 (file)
--- a/ui/qt/layout_preferences_frame.h
+++ b/ui/qt/layout_preferences_frame.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 LAYOUT_PREFERENCES_FRAME_H
 #define LAYOUT_PREFERENCES_FRAME_H

diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp
index 606c8ab08cafb500d612ef05101d6d723f7ebb84..71863b31045e0019f9f3340efa6c4b22ebb2a944 100644 (file)
--- a/ui/qt/lbm_lbtrm_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp
@@ -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*/
 
 #include "lbm_lbtrm_transport_dialog.h"
 #include <ui_lbm_lbtrm_transport_dialog.h>

diff --git a/ui/qt/lbm_lbtrm_transport_dialog.h b/ui/qt/lbm_lbtrm_transport_dialog.h
index 9b176c21b4649dbe4399656b95d5a7e0d71660bd..514fda2d1bed2e6009b64067ac30847e687c5975 100644 (file)
--- a/ui/qt/lbm_lbtrm_transport_dialog.h
+++ b/ui/qt/lbm_lbtrm_transport_dialog.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 LBM_LBTRM_TRANSPORT_DIALOG_H
 #define LBM_LBTRM_TRANSPORT_DIALOG_H

diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp
index b8376043e1a8efabf71bdc1c46447215fd97ad25..636d3a151e9abd4a9ccbf846790a2fc84d917af3 100644 (file)
--- a/ui/qt/lbm_lbtru_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtru_transport_dialog.cpp
@@ -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*/
 
 #include "lbm_lbtru_transport_dialog.h"
 #include <ui_lbm_lbtru_transport_dialog.h>

diff --git a/ui/qt/lbm_lbtru_transport_dialog.h b/ui/qt/lbm_lbtru_transport_dialog.h
index 636484015396c83564fa9b92310a1329a581d930..42cfca5accfae6b30f02a4883ffc4059ca63f63e 100644 (file)
--- a/ui/qt/lbm_lbtru_transport_dialog.h
+++ b/ui/qt/lbm_lbtru_transport_dialog.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 LBM_LBTRU_TRANSPORT_DIALOG_H
 #define LBM_LBTRU_TRANSPORT_DIALOG_H

diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp
index 78e27caa2773aaeba695c6a0693ae5e5085a23b4..a7ddb42e100c525cdbfbd46d151e0a9712cd0e18 100644 (file)
--- a/ui/qt/lbm_stream_dialog.cpp
+++ b/ui/qt/lbm_stream_dialog.cpp
@@ -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*/
 
 // Adapted from stats_tree_packet.cpp
 

diff --git a/ui/qt/lbm_stream_dialog.h b/ui/qt/lbm_stream_dialog.h
index 1698e4143fea464ecb55e9540dd9205ed666f71a..5ea776a376a7890a1fb5702d0d1ae6e063d46bd5 100644 (file)
--- a/ui/qt/lbm_stream_dialog.h
+++ b/ui/qt/lbm_stream_dialog.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 LBM_STREAM_DIALOG_H
 #define LBM_STREAM_DIALOG_H

diff --git a/ui/qt/lte_mac_statistics_dialog.cpp b/ui/qt/lte_mac_statistics_dialog.cpp
index 2f2780b1042b4ace1e5bff75de4e0255fbd0c0a7..7cb3966b1316b25b7596155ac0b17c2f703806f1 100644 (file)
--- a/ui/qt/lte_mac_statistics_dialog.cpp
+++ b/ui/qt/lte_mac_statistics_dialog.cpp
@@ -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*/
 
 #include "lte_mac_statistics_dialog.h"
 

diff --git a/ui/qt/lte_mac_statistics_dialog.h b/ui/qt/lte_mac_statistics_dialog.h
index 99a98a55a73d7e89c60cf6ba3b64486ea970f970..3a8bdf004e7c9ed7be563a203b01d583bfd54989 100644 (file)
--- a/ui/qt/lte_mac_statistics_dialog.h
+++ b/ui/qt/lte_mac_statistics_dialog.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 __LTE_MAC_STATISTICS_DIALOG_H__
 #define __LTE_MAC_STATISTICS_DIALOG_H__

diff --git a/ui/qt/lte_rlc_graph_dialog.cpp b/ui/qt/lte_rlc_graph_dialog.cpp
index e456e34abd292ac16dc2151d3b135d638a9f074b..9020dd998272e62c92477cec0f90676ad795268b 100644 (file)
--- a/ui/qt/lte_rlc_graph_dialog.cpp
+++ b/ui/qt/lte_rlc_graph_dialog.cpp
@@ -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*/
 
 #include "lte_rlc_graph_dialog.h"
 #include <ui_lte_rlc_graph_dialog.h>

diff --git a/ui/qt/lte_rlc_graph_dialog.h b/ui/qt/lte_rlc_graph_dialog.h
index b731d5e6f94a7223969069fb0bf710bb92751691..6da4dd39fe4f39685653024ea9596b21c7598906 100644 (file)
--- a/ui/qt/lte_rlc_graph_dialog.h
+++ b/ui/qt/lte_rlc_graph_dialog.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 LTE_RLC_GRAPH_DIALOG_H
 #define LTE_RLC_GRAPH_DIALOG_H

diff --git a/ui/qt/lte_rlc_statistics_dialog.cpp b/ui/qt/lte_rlc_statistics_dialog.cpp
index 71d0d80fbccec667b14e9a3423bab630fa09c58d..a9c2ed6c4fb1dffb20fceda7c01824f0149a0edc 100644 (file)
--- a/ui/qt/lte_rlc_statistics_dialog.cpp
+++ b/ui/qt/lte_rlc_statistics_dialog.cpp
@@ -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*/
 
 #include "lte_rlc_statistics_dialog.h"
 

diff --git a/ui/qt/lte_rlc_statistics_dialog.h b/ui/qt/lte_rlc_statistics_dialog.h
index 4250a9b41f4f109408c11af6bf1db598d76a56b7..cefe9f186c447bba7287ee71253fae5cb5d38d5c 100644 (file)
--- a/ui/qt/lte_rlc_statistics_dialog.h
+++ b/ui/qt/lte_rlc_statistics_dialog.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 __LTE_RLC_STATISTICS_DIALOG_H__
 #define __LTE_RLC_STATISTICS_DIALOG_H__

diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index 3e2767f0f922b0071a0a5f6709637e12759eeee0..54ec5bab15d4c6792973799bdc19ae5f5829e9f8 100644 (file)
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/qt/main_status_bar.h b/ui/qt/main_status_bar.h
index 0f6a1429dade1b6773dbf70d1b58bc5d0216d55b..c0674d7dc3f7764bb71db50e2b7418e1cb093bef 100644 (file)
--- a/ui/qt/main_status_bar.h
+++ b/ui/qt/main_status_bar.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 MAIN_STATUS_BAR_H

diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp
index f0874ede6fcd70bc049ca7c94fb6c8799765e812..42de3776c7fc25ddbafe3faf9fe87ee64f5a5347 100644 (file)
--- a/ui/qt/main_welcome.cpp
+++ b/ui/qt/main_welcome.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/main_welcome.h b/ui/qt/main_welcome.h
index 6f56904d90e9450fcec67c2351a86673469c78a9..eb6fc55ca447f4b937282f740a82520599cf215d 100644 (file)
--- a/ui/qt/main_welcome.h
+++ b/ui/qt/main_welcome.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 MAIN_WELCOME_H
 #define MAIN_WELCOME_H

diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index bb24456955afb43183c35711329928ffded4a88c..a93eb5d32938062c3f7b031e2ddc228b33830529 100644 (file)
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -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
  */
 
 #include "main_window.h"

diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index 043309c68ac9522f4b0bbf9ec74748ae9ba4216b..20dad060066cee65dfb6fc8261736fa4ee18a29b 100644 (file)
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.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 MAINWINDOW_H

diff --git a/ui/qt/main_window_preferences_frame.cpp b/ui/qt/main_window_preferences_frame.cpp
index 182c13d1516c6bc4f58ec42ba8a724575ed506b9..f83b86e0e69b0ca22488cf2625effc2c1d63d0bd 100644 (file)
--- a/ui/qt/main_window_preferences_frame.cpp
+++ b/ui/qt/main_window_preferences_frame.cpp
@@ -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
  */
 
 #include "wireshark_application.h"

diff --git a/ui/qt/main_window_preferences_frame.h b/ui/qt/main_window_preferences_frame.h
index 230bc5c6c0d8b917fc79f710e3f53bff4f930917..0ae4fb73531de67c802e1fe1e27c416009ae1b01 100644 (file)
--- a/ui/qt/main_window_preferences_frame.h
+++ b/ui/qt/main_window_preferences_frame.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 MAIN_WINDOW_PREFERENCES_FRAME_H

diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 5b5dbc4ead6d1c271180c63e8e768dda39fd6996..26abffd4ff9159952690f735ab940c0eced14ef3 100644 (file)
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -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
  */
 
 #include <config.h>

diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
index 37533b010411afd7eb1080098165cf15f95efd2a..7142e976a210baa8a16d499862efb3fa6ca31aa2 100644 (file)
--- a/ui/qt/manage_interfaces_dialog.cpp
+++ b/ui/qt/manage_interfaces_dialog.cpp
@@ -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*/
 
 #include <glib.h>
 #include "manage_interfaces_dialog.h"

diff --git a/ui/qt/manage_interfaces_dialog.h b/ui/qt/manage_interfaces_dialog.h
index bbd91c0beee69564df4538a51820e86b79d1d5fa..a43dd9d5fd0c9bfc3093d4327ea4992eb10ec107 100644 (file)
--- a/ui/qt/manage_interfaces_dialog.h
+++ b/ui/qt/manage_interfaces_dialog.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 MANAGE_INTERFACES_DIALOG_H
 #define MANAGE_INTERFACES_DIALOG_H

diff --git a/ui/qt/manager/preference_manager.cpp b/ui/qt/manager/preference_manager.cpp
index 26e64e040ca2627c1772cd9bf82ba441dbb4084f..54c2cfb7b037fd8074c17bcb4de6f36ac790dd98 100644 (file)
--- a/ui/qt/manager/preference_manager.cpp
+++ b/ui/qt/manager/preference_manager.cpp
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/qt/manager/preference_manager.h b/ui/qt/manager/preference_manager.h
index 99dc16d0beef4568332fece811cfd72bb24aef6a..f6b995d9435fe38f2696d00c8c42173858b200bc 100644 (file)
--- a/ui/qt/manager/preference_manager.h
+++ b/ui/qt/manager/preference_manager.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 PREFERENCE_MANAGER_H

diff --git a/ui/qt/manager/wireshark_preference.cpp b/ui/qt/manager/wireshark_preference.cpp
index b83a98306fbf856d65a2f87d37b24b2bc9941c61..9774d7d0ed31aec5a0bcf195f741719ab3148c07 100644 (file)
--- a/ui/qt/manager/wireshark_preference.cpp
+++ b/ui/qt/manager/wireshark_preference.cpp
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/qt/manager/wireshark_preference.h b/ui/qt/manager/wireshark_preference.h
index d8f124190d31a972c23ef1c9468a501ff68686cf..11cba3141577e287681de2462015f71929e39b3e 100644 (file)
--- a/ui/qt/manager/wireshark_preference.h
+++ b/ui/qt/manager/wireshark_preference.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 WIRESHARK_PREFERENCE_H

diff --git a/ui/qt/models/astringlist_list_model.cpp b/ui/qt/models/astringlist_list_model.cpp
index 6156b4496654d5d0226b239cd440e5f8218e4e8d..01106334866aba104b783206a63eba1fe5c5a052 100644 (file)
--- a/ui/qt/models/astringlist_list_model.cpp
+++ b/ui/qt/models/astringlist_list_model.cpp
@@ -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
  */
 
 #include <QSortFilterProxyModel>

diff --git a/ui/qt/models/astringlist_list_model.h b/ui/qt/models/astringlist_list_model.h
index ddefe4d8dd41c9de512659c6cf287f4aaa86e4b6..516540b36b7aae39f418257531e28f3fa20c75e3 100644 (file)
--- a/ui/qt/models/astringlist_list_model.h
+++ b/ui/qt/models/astringlist_list_model.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 ASTRINGLIST_LIST_MODEL_H

diff --git a/ui/qt/models/cache_proxy_model.cpp b/ui/qt/models/cache_proxy_model.cpp
index 3ce250cedc66cc149d7f8318934cf74906684825..48909352b2b14124ab057feef9bed1b931cffdab 100644 (file)
--- a/ui/qt/models/cache_proxy_model.cpp
+++ b/ui/qt/models/cache_proxy_model.cpp
@@ -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*/
 
 #include <ui/qt/models/cache_proxy_model.h>
 

diff --git a/ui/qt/models/cache_proxy_model.h b/ui/qt/models/cache_proxy_model.h
index b31cb1a5e3f1e095a95e847da53b5dea25c41226..f3628039ad93afecc7e07fa5fc1f7853fb9a3269 100644 (file)
--- a/ui/qt/models/cache_proxy_model.h
+++ b/ui/qt/models/cache_proxy_model.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 CACHE_PROXY_MODEL_H
 #define CACHE_PROXY_MODEL_H

diff --git a/ui/qt/models/decode_as_delegate.cpp b/ui/qt/models/decode_as_delegate.cpp
index f9bbc789b450dc3cac195691dda780ce42207ff8..16d6665c6a6a434b1c211c75b84ee3a70625c940 100644 (file)
--- a/ui/qt/models/decode_as_delegate.cpp
+++ b/ui/qt/models/decode_as_delegate.cpp
@@ -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*/
 
 #include "decode_as_delegate.h"
 

diff --git a/ui/qt/models/decode_as_delegate.h b/ui/qt/models/decode_as_delegate.h
index 43db595a9c180c8bc79b615d614860b21e253b40..3e3a6b5906ba41864db61ab6f97cafec6469c8e2 100644 (file)
--- a/ui/qt/models/decode_as_delegate.h
+++ b/ui/qt/models/decode_as_delegate.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 DECODE_AS_DELEGATE_H
 #define DECODE_AS_DELEGATE_H

diff --git a/ui/qt/models/decode_as_model.cpp b/ui/qt/models/decode_as_model.cpp
index ea08effbf213b0164571561c4c9d5cc150a2e2bf..59e077c80e66a95d8eb08536aec8161bb32e057b 100644 (file)
--- a/ui/qt/models/decode_as_model.cpp
+++ b/ui/qt/models/decode_as_model.cpp
@@ -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*/
 
 #include "decode_as_model.h"
 #include <epan/to_str.h>

diff --git a/ui/qt/models/decode_as_model.h b/ui/qt/models/decode_as_model.h
index 5638a232cecdf71cd9319155b4f5931a8b2b7840..1c37cfddb5b4422cbe16677be39bbb402918704d 100644 (file)
--- a/ui/qt/models/decode_as_model.h
+++ b/ui/qt/models/decode_as_model.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 DECODE_AS_MODEL_H
 #define DECODE_AS_MODEL_H

diff --git a/ui/qt/models/dissector_tables_model.cpp b/ui/qt/models/dissector_tables_model.cpp
index 327098eb680a38acf2aa4ebfccd6012b0d57a82d..9b7ac681bc9d2bf6ac4f98579d2e5caf56baeb0d 100644 (file)
--- a/ui/qt/models/dissector_tables_model.cpp
+++ b/ui/qt/models/dissector_tables_model.cpp
@@ -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
  */
 
 #include <ui/qt/models/dissector_tables_model.h>

diff --git a/ui/qt/models/dissector_tables_model.h b/ui/qt/models/dissector_tables_model.h
index 824cc51b28e1da4b7284364daca7cf743f316a48..c36648cc6a7c1deae3642f66792613d57e9c3619 100644 (file)
--- a/ui/qt/models/dissector_tables_model.h
+++ b/ui/qt/models/dissector_tables_model.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 DISSECTOR_TABLES_MODEL_H

diff --git a/ui/qt/models/enabled_protocols_model.cpp b/ui/qt/models/enabled_protocols_model.cpp
index 3693a62efbe7e6166a5831a8a4ea6bfa689291ba..46ae46d685d87149b54fd9613bfd5eb3e8678b67 100644 (file)
--- a/ui/qt/models/enabled_protocols_model.cpp
+++ b/ui/qt/models/enabled_protocols_model.cpp
@@ -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
  */
 
 #include <QSortFilterProxyModel>

diff --git a/ui/qt/models/enabled_protocols_model.h b/ui/qt/models/enabled_protocols_model.h
index 98b95c963064c85127ab116f4b5fcecf9a9b1a8a..a7d6339ca6290187b171bd627a785734e5567dd1 100644 (file)
--- a/ui/qt/models/enabled_protocols_model.h
+++ b/ui/qt/models/enabled_protocols_model.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 ENABLED_PROTOCOLS_MODEL_H

diff --git a/ui/qt/models/expert_info_model.cpp b/ui/qt/models/expert_info_model.cpp
index 5b34fbed5e1792f5a73613c5c7629cc28cc8bccb..6f16fec56d9667680efdd8f48d63e41a6798b33a 100644 (file)
--- a/ui/qt/models/expert_info_model.cpp
+++ b/ui/qt/models/expert_info_model.cpp
@@ -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
  */
 
 #include "expert_info_model.h"

diff --git a/ui/qt/models/expert_info_model.h b/ui/qt/models/expert_info_model.h
index 32aabd3fee00dd965cbbad39ee5b08b929148cac..50c9c61daea6116e945af3ee559381b72e6053ab 100644 (file)
--- a/ui/qt/models/expert_info_model.h
+++ b/ui/qt/models/expert_info_model.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 EXPERT_INFO_MODEL_H

diff --git a/ui/qt/models/expert_info_proxy_model.cpp b/ui/qt/models/expert_info_proxy_model.cpp
index 797b6043ec49c1ff043221577386a0858e13b4b5..8417ab0f39ad5e0bd609ce431b8f6c855491993c 100644 (file)
--- a/ui/qt/models/expert_info_proxy_model.cpp
+++ b/ui/qt/models/expert_info_proxy_model.cpp
@@ -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
  */
 
 #include <ui/qt/models/expert_info_model.h>

diff --git a/ui/qt/models/expert_info_proxy_model.h b/ui/qt/models/expert_info_proxy_model.h
index 3926e0e9e5e41242268204544e99baee7566e6d9..9295141d64cc84cc8705549052491d5aafab8564 100644 (file)
--- a/ui/qt/models/expert_info_proxy_model.h
+++ b/ui/qt/models/expert_info_proxy_model.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 EXPERT_INFO_PROXY_MODEL_H

diff --git a/ui/qt/models/export_objects_model.cpp b/ui/qt/models/export_objects_model.cpp
index 2b18a07542962429fccad8347e6b275668878091..cade148a2488b7653ae339ba102309f18645593d 100644 (file)
--- a/ui/qt/models/export_objects_model.cpp
+++ b/ui/qt/models/export_objects_model.cpp
@@ -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
  */
 
 #include "export_objects_model.h"

diff --git a/ui/qt/models/export_objects_model.h b/ui/qt/models/export_objects_model.h
index 35eeac78b55522c73e9c54c053ebe173d006fdce..8e0bac21b525a1f12203f450793ebbd316047123 100644 (file)
--- a/ui/qt/models/export_objects_model.h
+++ b/ui/qt/models/export_objects_model.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 EXPORT_OBJECTS_MODEL_H

diff --git a/ui/qt/models/fileset_entry_model.cpp b/ui/qt/models/fileset_entry_model.cpp
index d3ce1dba67d50646d8e22d441b066e1f7f406b3f..2c91179e84129b1984b1c47b88b0a6b915c6d3d1 100644 (file)
--- a/ui/qt/models/fileset_entry_model.cpp
+++ b/ui/qt/models/fileset_entry_model.cpp
@@ -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
  */
 
 #include <ui/qt/models/fileset_entry_model.h>

diff --git a/ui/qt/models/fileset_entry_model.h b/ui/qt/models/fileset_entry_model.h
index 1a4b97a15e490999bc9ddd32141e66a614fb5d8e..e528033dca73b3414303595d0f080e15dd58668f 100644 (file)
--- a/ui/qt/models/fileset_entry_model.h
+++ b/ui/qt/models/fileset_entry_model.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 FILESET_ENTRY_MODEL_H

diff --git a/ui/qt/models/info_proxy_model.cpp b/ui/qt/models/info_proxy_model.cpp
index 197cc9e0d881ec502896b5e80c24ba856e3231bd..de8fecded600b4c153c2eddcfa5710f876ceb9d4 100644 (file)
--- a/ui/qt/models/info_proxy_model.cpp
+++ b/ui/qt/models/info_proxy_model.cpp
@@ -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
  */
 
 #include <config.h>

diff --git a/ui/qt/models/info_proxy_model.h b/ui/qt/models/info_proxy_model.h
index 9574882f5aa04c9c48ed817c1f3f3260f7fc6251..63c762b3fa9bfe85208055c1d917750d01bb99b3 100644 (file)
--- a/ui/qt/models/info_proxy_model.h
+++ b/ui/qt/models/info_proxy_model.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 INFO_PROXY_MODEL_H

diff --git a/ui/qt/models/interface_sort_filter_model.cpp b/ui/qt/models/interface_sort_filter_model.cpp
index ac189f923f020402c9b3e89cd8010131884b4230..2ab5b9656bc069ff050d3a3e122ff6fdbc703305 100644 (file)
--- a/ui/qt/models/interface_sort_filter_model.cpp
+++ b/ui/qt/models/interface_sort_filter_model.cpp
@@ -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*/
 
 #include <ui/qt/models/interface_tree_model.h>
 #include <ui/qt/models/interface_tree_cache_model.h>

diff --git a/ui/qt/models/interface_sort_filter_model.h b/ui/qt/models/interface_sort_filter_model.h
index 45e0ea72df741a14b0cb7e8014f026209d0d3cc3..6d24f3d9e6295c833990312b52f3caefff145da8 100644 (file)
--- a/ui/qt/models/interface_sort_filter_model.h
+++ b/ui/qt/models/interface_sort_filter_model.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 INTERFACE_SORT_FILTER_MODEL_H
 #define INTERFACE_SORT_FILTER_MODEL_H

diff --git a/ui/qt/models/interface_tree_cache_model.cpp b/ui/qt/models/interface_tree_cache_model.cpp
index 4d8a416c9f5d7d8a74c860ae3d4e8770622e8d07..9d718977b0ccfcb70cb5e5a2e735d0d7519a04ae 100644 (file)
--- a/ui/qt/models/interface_tree_cache_model.cpp
+++ b/ui/qt/models/interface_tree_cache_model.cpp
@@ -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*/
 
 
 #include <ui/qt/models/interface_tree_cache_model.h>

diff --git a/ui/qt/models/interface_tree_cache_model.h b/ui/qt/models/interface_tree_cache_model.h
index 6af031c1f1a581119500afdd65a6e64141f89036..f7d3bac98a682d7a1d98030737b71610928b34aa 100644 (file)
--- a/ui/qt/models/interface_tree_cache_model.h
+++ b/ui/qt/models/interface_tree_cache_model.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 INTERFACE_TREE_CACHE_MODEL_H_
 #define INTERFACE_TREE_CACHE_MODEL_H_

diff --git a/ui/qt/models/interface_tree_model.cpp b/ui/qt/models/interface_tree_model.cpp
index ef0483b524d88b153e8cfdb325e039eaae1295e1..91a292662355b77cb1f91cb297c842afafa55422 100644 (file)
--- a/ui/qt/models/interface_tree_model.cpp
+++ b/ui/qt/models/interface_tree_model.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/models/interface_tree_model.h b/ui/qt/models/interface_tree_model.h
index c8154197d5a78ab8106ec5386c54f3d3dab64978..67a9eb7c5e7f3b0a7db5f77a45a04fae4dc32c59 100644 (file)
--- a/ui/qt/models/interface_tree_model.h
+++ b/ui/qt/models/interface_tree_model.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 INTERFACE_TREE_MODEL_H
 #define INTERFACE_TREE_MODEL_H

diff --git a/ui/qt/models/numeric_value_chooser_delegate.cpp b/ui/qt/models/numeric_value_chooser_delegate.cpp
index d4a10cf8f80027b7e629fea5d08169de8884ad15..fc7e9eb5d52f87c00263af8e00bec41f83c217a8 100644 (file)
--- a/ui/qt/models/numeric_value_chooser_delegate.cpp
+++ b/ui/qt/models/numeric_value_chooser_delegate.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/models/numeric_value_chooser_delegate.h b/ui/qt/models/numeric_value_chooser_delegate.h
index 08292ad2636d75f2ecdce85c770c32610561935d..2b9627023cb2d913ca167b5a8769e820311d3761 100644 (file)
--- a/ui/qt/models/numeric_value_chooser_delegate.h
+++ b/ui/qt/models/numeric_value_chooser_delegate.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 NUMERIC_VALUE_CHOOSER_DELEGATE_H_
 #define NUMERIC_VALUE_CHOOSER_DELEGATE_H_

diff --git a/ui/qt/models/packet_list_model.cpp b/ui/qt/models/packet_list_model.cpp
index f3ba380890de982096f2b6ba657cd57ed4511b41..3601427e2ef068d20e4886957a032671ff0e0210 100644 (file)
--- a/ui/qt/models/packet_list_model.cpp
+++ b/ui/qt/models/packet_list_model.cpp
@@ -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*/
 
 #include <algorithm>
 

diff --git a/ui/qt/models/packet_list_model.h b/ui/qt/models/packet_list_model.h
index d65718609ef1767bfba2b4735320728e33632217..9cd64df433123a35162bc66648ef86da3d346213 100644 (file)
--- a/ui/qt/models/packet_list_model.h
+++ b/ui/qt/models/packet_list_model.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 PACKET_LIST_MODEL_H
 #define PACKET_LIST_MODEL_H

diff --git a/ui/qt/models/packet_list_record.cpp b/ui/qt/models/packet_list_record.cpp
index 0b8d84e5741b9c2018307eb2bca87e356485bb84..6e9c6c331695236cd36b3cd4badf8c2679102954 100644 (file)
--- a/ui/qt/models/packet_list_record.cpp
+++ b/ui/qt/models/packet_list_record.cpp
@@ -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*/
 
 #include "packet_list_record.h"
 

diff --git a/ui/qt/models/packet_list_record.h b/ui/qt/models/packet_list_record.h
index 3df8d0db9b32c7a83527ad791eb368616403e282..a5a623d8ab127faaa62f1fabde71aac297213130 100644 (file)
--- a/ui/qt/models/packet_list_record.h
+++ b/ui/qt/models/packet_list_record.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 PACKET_LIST_RECORD_H
 #define PACKET_LIST_RECORD_H

diff --git a/ui/qt/models/path_chooser_delegate.cpp b/ui/qt/models/path_chooser_delegate.cpp
index 8943b7f986692b19342bc6a3ca7d3f9c88c4ba0d..72ba84065087e0f8e1aa6fa0bc2a1901634da524 100644 (file)
--- a/ui/qt/models/path_chooser_delegate.cpp
+++ b/ui/qt/models/path_chooser_delegate.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/models/path_chooser_delegate.h b/ui/qt/models/path_chooser_delegate.h
index 395e1a9af7c40d1e56d6532ef92f4d8945bd0e0f..8777e2500b07810d7796ce528d10b7732d25409f 100644 (file)
--- a/ui/qt/models/path_chooser_delegate.h
+++ b/ui/qt/models/path_chooser_delegate.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 PATH_CHOOSER_DELEGATE_H_
 #define PATH_CHOOSER_DELEGATE_H_

diff --git a/ui/qt/models/percent_bar_delegate.cpp b/ui/qt/models/percent_bar_delegate.cpp
index e4d7edc285ff8e14a18d8b07693ec3ea6e2a7cae..81573c0bdc7fc404f15f02119255083b3b2b70a1 100644 (file)
--- a/ui/qt/models/percent_bar_delegate.cpp
+++ b/ui/qt/models/percent_bar_delegate.cpp
@@ -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*/
 
 #include <ui/qt/models/percent_bar_delegate.h>
 

diff --git a/ui/qt/models/percent_bar_delegate.h b/ui/qt/models/percent_bar_delegate.h
index a9ebb869195f26ea6f5f54eff23a2ea628bc5246..345826d8a63df8010e2f4ddc6f930bab6938b03f 100644 (file)
--- a/ui/qt/models/percent_bar_delegate.h
+++ b/ui/qt/models/percent_bar_delegate.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 PERCENTBARDELEGATE_H
 #define PERCENTBARDELEGATE_H

diff --git a/ui/qt/models/pref_delegate.cpp b/ui/qt/models/pref_delegate.cpp
index ab25b6ceaa84c408cc3decfa5d9c7e3707895785..2d0669564ecafabcf5b89c8493283f0c78c291e6 100644 (file)
--- a/ui/qt/models/pref_delegate.cpp
+++ b/ui/qt/models/pref_delegate.cpp
@@ -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
  */
 
 #include <ui/qt/models/pref_delegate.h>

diff --git a/ui/qt/models/pref_delegate.h b/ui/qt/models/pref_delegate.h
index 23e8744bb01f0efef20d2cf71f28b2c4723e78d5..c7495443c6b0026e6c3def0caf3d2bbcac46b6a2 100644 (file)
--- a/ui/qt/models/pref_delegate.h
+++ b/ui/qt/models/pref_delegate.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 PREF_DELEGATE_H

diff --git a/ui/qt/models/pref_models.cpp b/ui/qt/models/pref_models.cpp
index 9d199e7f60d3e83abdb2bb2d1e3ac641deb1676b..2db38654981fed89b10e23b5d84fe62897d0673a 100644 (file)
--- a/ui/qt/models/pref_models.cpp
+++ b/ui/qt/models/pref_models.cpp
@@ -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
  */
 
 #include <ui/qt/models/pref_models.h>

diff --git a/ui/qt/models/pref_models.h b/ui/qt/models/pref_models.h
index b34959ca995484971c4465e1c440345b708d882a..09e8e14ac6681a7f3e1d22fea5c316960297ef27 100644 (file)
--- a/ui/qt/models/pref_models.h
+++ b/ui/qt/models/pref_models.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 PREF_MODELS_H

diff --git a/ui/qt/models/proto_tree_model.cpp b/ui/qt/models/proto_tree_model.cpp
index 276b5a8f26320c452b15a45ec30540d5d37af9c0..637d0d00726a2d04b95ba56a897abda78c2b9ec3 100644 (file)
--- a/ui/qt/models/proto_tree_model.cpp
+++ b/ui/qt/models/proto_tree_model.cpp
@@ -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
  */
 
 #include <ui/qt/models/proto_tree_model.h>

diff --git a/ui/qt/models/proto_tree_model.h b/ui/qt/models/proto_tree_model.h
index dce8060b9d1bc9c9dc9d7d30d8a777295b4fe9c7..41a95941d707f1cdaea8df580fca7f7bc3562abc 100644 (file)
--- a/ui/qt/models/proto_tree_model.h
+++ b/ui/qt/models/proto_tree_model.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 PROTO_TREE_MODEL_H

diff --git a/ui/qt/models/related_packet_delegate.cpp b/ui/qt/models/related_packet_delegate.cpp
index 1519ffda597fb3d48dc4959b1264eb20dac138c6..23d9152744b3b1f8feb0cc4dc0ce1faff644b619 100644 (file)
--- a/ui/qt/models/related_packet_delegate.cpp
+++ b/ui/qt/models/related_packet_delegate.cpp
@@ -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*/
 
 #include <ui/qt/models/related_packet_delegate.h>
 #include "packet_list_record.h"

diff --git a/ui/qt/models/related_packet_delegate.h b/ui/qt/models/related_packet_delegate.h
index 29dc0ad0864d716d216a2959ec452ff84e5c3c5f..db9da84fdb1732be8dc80dd5a6a9c7c8d42cdad7 100644 (file)
--- a/ui/qt/models/related_packet_delegate.h
+++ b/ui/qt/models/related_packet_delegate.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 RELATED_PACKET_DELEGATE_H
 #define RELATED_PACKET_DELEGATE_H

diff --git a/ui/qt/models/sparkline_delegate.cpp b/ui/qt/models/sparkline_delegate.cpp
index df4490354403506587e5188b57a4123adfab358a..a99245c190d0b359a61143d2d4137df569699fb6 100644 (file)
--- a/ui/qt/models/sparkline_delegate.cpp
+++ b/ui/qt/models/sparkline_delegate.cpp
@@ -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*/
 
 #include <ui/qt/models/sparkline_delegate.h>
 

diff --git a/ui/qt/models/sparkline_delegate.h b/ui/qt/models/sparkline_delegate.h
index 5d6b11e1ff8c2881d4eaa5e833ce497686b6e4d8..48c9f52201e769e7ee9ff4d2394afab0a985565e 100644 (file)
--- a/ui/qt/models/sparkline_delegate.h
+++ b/ui/qt/models/sparkline_delegate.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 SPARKLINE_DELEGATE_H
 #define SPARKLINE_DELEGATE_H

diff --git a/ui/qt/models/supported_protocols_model.cpp b/ui/qt/models/supported_protocols_model.cpp
index 335e615c40e5beba76334df64acdf2a11ecaeeed..8f5b54e195a4dbf703c5d198d67bce1bc043e308 100644 (file)
--- a/ui/qt/models/supported_protocols_model.cpp
+++ b/ui/qt/models/supported_protocols_model.cpp
@@ -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
  */
 
 #include <QSortFilterProxyModel>

diff --git a/ui/qt/models/supported_protocols_model.h b/ui/qt/models/supported_protocols_model.h
index 77359c30916be8a8d4595f6f2ddbb508ad6788ce..75fee84ba722f6548d81324f3f688d24dbb08172 100644 (file)
--- a/ui/qt/models/supported_protocols_model.h
+++ b/ui/qt/models/supported_protocols_model.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 SUPPORTED_PROTOCOLS_MODEL_H

diff --git a/ui/qt/models/timeline_delegate.cpp b/ui/qt/models/timeline_delegate.cpp
index 453927b8956a636aac9b00b34215d4e9086cbef3..721c5d2e17f5d1f162430c7cc837b34cf17b3932 100644 (file)
--- a/ui/qt/models/timeline_delegate.cpp
+++ b/ui/qt/models/timeline_delegate.cpp
@@ -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*/
 
 #include <ui/qt/models/timeline_delegate.h>
 

diff --git a/ui/qt/models/timeline_delegate.h b/ui/qt/models/timeline_delegate.h
index 4c9ca6fb242dea2acba718d6a41c07fcc9dd577c..5597d7dfda560b310ce7a5282007ce5b6a44ca67 100644 (file)
--- a/ui/qt/models/timeline_delegate.h
+++ b/ui/qt/models/timeline_delegate.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 TIMELINE_DELEGATE_H
 #define TIMELINE_DELEGATE_H

diff --git a/ui/qt/models/tree_model_helpers.h b/ui/qt/models/tree_model_helpers.h
index 440f7d5fa18afb818f8a658dc2bd3db582bd5339..6585ef6e4e4f97e5afd1b6884a29682628840628 100644 (file)
--- a/ui/qt/models/tree_model_helpers.h
+++ b/ui/qt/models/tree_model_helpers.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 TREE_MODEL_HELPERS_H

diff --git a/ui/qt/models/uat_delegate.cpp b/ui/qt/models/uat_delegate.cpp
index 49cd56b96b1d50af0d6941684892e0bccc0dfedd..afe5771d1452fed4cdafbaf8a6cf691651506cb0 100644 (file)
--- a/ui/qt/models/uat_delegate.cpp
+++ b/ui/qt/models/uat_delegate.cpp
@@ -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*/
 
 #include <ui/qt/models/uat_delegate.h>
 #include "epan/value_string.h"

diff --git a/ui/qt/models/uat_delegate.h b/ui/qt/models/uat_delegate.h
index 932d56be09448ffd79cdb96b033ef8ccec98d3b3..0f1c7455ee60850deb464fc31c5ce34cb5218b52 100644 (file)
--- a/ui/qt/models/uat_delegate.h
+++ b/ui/qt/models/uat_delegate.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 UAT_DELEGATE_H
 #define UAT_DELEGATE_H

diff --git a/ui/qt/models/uat_model.cpp b/ui/qt/models/uat_model.cpp
index 3174da89b100dbd754d7cb549ae0076247c9a2e5..5ae86e9c91780f5c54ab7c5568f3b7dd2d41c59f 100644 (file)
--- a/ui/qt/models/uat_model.cpp
+++ b/ui/qt/models/uat_model.cpp
@@ -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*/
 
 #include "uat_model.h"
 #include <epan/to_str.h>

diff --git a/ui/qt/models/uat_model.h b/ui/qt/models/uat_model.h
index bd847e115d8b2ebb0aaaf4113179b99cfff7763b..299f04c10203804a0c48904f1f6c49388ef049d5 100644 (file)
--- a/ui/qt/models/uat_model.h
+++ b/ui/qt/models/uat_model.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 UAT_MODEL_H
 #define UAT_MODEL_H

diff --git a/ui/qt/models/url_link_delegate.cpp b/ui/qt/models/url_link_delegate.cpp
index 205a35921a3637f14e324694193d5c1707a5ab86..a00eb4833b1c304260d4a3f7c4b4e5488a2e5d8a 100644 (file)
--- a/ui/qt/models/url_link_delegate.cpp
+++ b/ui/qt/models/url_link_delegate.cpp
@@ -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
  */
 
 #include <ui/qt/models/url_link_delegate.h>

diff --git a/ui/qt/models/url_link_delegate.h b/ui/qt/models/url_link_delegate.h
index c35a611d18cc611ad6fa1744f1e10692ca34de2b..4167704f52b7feb28a632e215115a37817b462d9 100644 (file)
--- a/ui/qt/models/url_link_delegate.h
+++ b/ui/qt/models/url_link_delegate.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 URL_LINK_DELEGATE_H

diff --git a/ui/qt/models/voip_calls_info_model.cpp b/ui/qt/models/voip_calls_info_model.cpp
index 4a066d8d00360bd97b5a1e5c141cec81328de667..be15e6c72851b47a09f0c89c8d92397d8b70c9ae 100644 (file)
--- a/ui/qt/models/voip_calls_info_model.cpp
+++ b/ui/qt/models/voip_calls_info_model.cpp
@@ -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*/
 
 #include "voip_calls_info_model.h"
 #include <wsutil/utf8_entities.h>

diff --git a/ui/qt/models/voip_calls_info_model.h b/ui/qt/models/voip_calls_info_model.h
index b50d4dbbb4122bd0a87f06c5e386ef2c2bca43a8..7c00f3166ab29d5fabcbd9c32cf58ac2a2afe88f 100644 (file)
--- a/ui/qt/models/voip_calls_info_model.h
+++ b/ui/qt/models/voip_calls_info_model.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 VOIP_CALLS_INFO_MODEL_H
 #define VOIP_CALLS_INFO_MODEL_H

diff --git a/ui/qt/module_preferences_scroll_area.cpp b/ui/qt/module_preferences_scroll_area.cpp
index 68b0fa392f7e4ea09f923361fc1311570666d875..2cb5330080e1d0cd36a176d0c6a4396ca7192fb9 100644 (file)
--- a/ui/qt/module_preferences_scroll_area.cpp
+++ b/ui/qt/module_preferences_scroll_area.cpp
@@ -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*/
 
 #include "module_preferences_scroll_area.h"
 #include <ui_module_preferences_scroll_area.h>

diff --git a/ui/qt/module_preferences_scroll_area.h b/ui/qt/module_preferences_scroll_area.h
index 67de217cd6ab21651f8444752f2fc5e6d10e1415..103b17fd6080fe6abbd423a954027c9e282f0315 100644 (file)
--- a/ui/qt/module_preferences_scroll_area.h
+++ b/ui/qt/module_preferences_scroll_area.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 MODULE_PREFERENCES_SCROLL_AREA_H
 #define MODULE_PREFERENCES_SCROLL_AREA_H

diff --git a/ui/qt/mtp3_summary_dialog.cpp b/ui/qt/mtp3_summary_dialog.cpp
index 31d6fdcfdd09c5cfd8e51632c59fe7c38ad80a67..466eafe2efe0bad185c7771f57ee48bda8d277ac 100644 (file)
--- a/ui/qt/mtp3_summary_dialog.cpp
+++ b/ui/qt/mtp3_summary_dialog.cpp
@@ -8,7 +8,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 "mtp3_summary_dialog.h"
 #include <ui_mtp3_summary_dialog.h>

diff --git a/ui/qt/mtp3_summary_dialog.h b/ui/qt/mtp3_summary_dialog.h
index 79fed44532de8d622ed21bf139949ec0dba40d2b..f75c36f42005dac604d729b933ab7303dbda2b95 100644 (file)
--- a/ui/qt/mtp3_summary_dialog.h
+++ b/ui/qt/mtp3_summary_dialog.h
@@ -8,7 +8,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 MTP3_SUMMARY_DIALOG_H
 #define MTP3_SUMMARY_DIALOG_H

diff --git a/ui/qt/multicast_statistics_dialog.cpp b/ui/qt/multicast_statistics_dialog.cpp
index a5e7778651d1f6c7f242542c144526b14e82454c..04578bd23ab887492928b4019ee896a939d8e46c 100644 (file)
--- a/ui/qt/multicast_statistics_dialog.cpp
+++ b/ui/qt/multicast_statistics_dialog.cpp
@@ -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*/
 
 #include "multicast_statistics_dialog.h"
 

diff --git a/ui/qt/multicast_statistics_dialog.h b/ui/qt/multicast_statistics_dialog.h
index a23bedda95701d1d202f122cbad9318186953e81..9bbcb398b47aff9ff615b3e2539a839618b22b22 100644 (file)
--- a/ui/qt/multicast_statistics_dialog.h
+++ b/ui/qt/multicast_statistics_dialog.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 MULTICASTSTATISTICSDIALOG_H
 #define MULTICASTSTATISTICSDIALOG_H

diff --git a/ui/qt/packet_comment_dialog.cpp b/ui/qt/packet_comment_dialog.cpp
index 5f1af825f10a14bdb8b18ba5dc74bc409a3a287d..fa111a9c57b542aae55dedfec231d94b3d14c268 100644 (file)
--- a/ui/qt/packet_comment_dialog.cpp
+++ b/ui/qt/packet_comment_dialog.cpp
@@ -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*/
 
 #include "packet_comment_dialog.h"
 #include <ui_packet_comment_dialog.h>

diff --git a/ui/qt/packet_comment_dialog.h b/ui/qt/packet_comment_dialog.h
index 88dd5e7d30429046d4126647a19cd05ee9c4cbd9..b19b719166e0b194f41b410b8b03cd5ad9aeb837 100644 (file)
--- a/ui/qt/packet_comment_dialog.h
+++ b/ui/qt/packet_comment_dialog.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 PACKET_COMMENT_DIALOG_H
 #define PACKET_COMMENT_DIALOG_H

diff --git a/ui/qt/packet_dialog.cpp b/ui/qt/packet_dialog.cpp
index 4539a828d1f88abc92c09595ba901e6ebd453cfe..326fd71aa97ca87f80fd7a8e8a3333dd4f0feef7 100644 (file)
--- a/ui/qt/packet_dialog.cpp
+++ b/ui/qt/packet_dialog.cpp
@@ -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
  */
 
 #include "packet_dialog.h"

diff --git a/ui/qt/packet_dialog.h b/ui/qt/packet_dialog.h
index b9ba62e90e70231fa8a5370312c71ff49436d37d..4779dd6f64d8809870827484a5f44d17d2f7bd14 100644 (file)
--- a/ui/qt/packet_dialog.h
+++ b/ui/qt/packet_dialog.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 PACKET_DIALOG_H
 #define PACKET_DIALOG_H

diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp
index e8c8608fd03795b925209c7ec52b1482c9e5cb7c..a80a71aaaddfce2798ececcbb27a4d9e75382c1b 100644 (file)
--- a/ui/qt/packet_format_group_box.cpp
+++ b/ui/qt/packet_format_group_box.cpp
@@ -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*/
 
 #include "packet_format_group_box.h"
 #include <ui_packet_format_group_box.h>

diff --git a/ui/qt/packet_format_group_box.h b/ui/qt/packet_format_group_box.h
index a194d1ece57e6d842de8d3136043d97f7d621b7b..2171f2fd256c7f6cb37533438b7e5d5272a30a89 100644 (file)
--- a/ui/qt/packet_format_group_box.h
+++ b/ui/qt/packet_format_group_box.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 PACKET_FORMAT_GROUP_BOX_H

diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index e3ede1a325601f90b2ff86f131ba047b6e5b6868..9ddf6cec8e668e9aba7548cd13df8840e380d7ed 100644 (file)
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -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
  */
 
 #include <ui/qt/packet_list.h>

diff --git a/ui/qt/packet_list.h b/ui/qt/packet_list.h
index 3f4d339288654a0a5847e0084d98a92c41687ad6..db1556f9761b2b02d4e9978629fca352a5df10fb 100644 (file)
--- a/ui/qt/packet_list.h
+++ b/ui/qt/packet_list.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 PACKET_LIST_H

diff --git a/ui/qt/packet_range_group_box.cpp b/ui/qt/packet_range_group_box.cpp
index 2411bafd33ad6ba595f31b13d93b06e5cd9570c8..0981c1e44ea1dc7806f20c6446e8374fa243f8ef 100644 (file)
--- a/ui/qt/packet_range_group_box.cpp
+++ b/ui/qt/packet_range_group_box.cpp
@@ -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*/
 
 #include "packet_range_group_box.h"
 #include <ui_packet_range_group_box.h>

diff --git a/ui/qt/packet_range_group_box.h b/ui/qt/packet_range_group_box.h
index 05fbeec441da0afffc9cf42bf6ada40137cebe0d..8629d806c40ffc1bc71a9a844c7d363ad10b8597 100644 (file)
--- a/ui/qt/packet_range_group_box.h
+++ b/ui/qt/packet_range_group_box.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 PACKET_RANGE_GROUP_BOX_H
 #define PACKET_RANGE_GROUP_BOX_H

diff --git a/ui/qt/preference_editor_frame.cpp b/ui/qt/preference_editor_frame.cpp
index 5be2635c3c0a1195a359c587e33d34ba6abbdb28..e2b9e8605ea56d239f832f30fb1374cfdfb32f76 100644 (file)
--- a/ui/qt/preference_editor_frame.cpp
+++ b/ui/qt/preference_editor_frame.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/preference_editor_frame.h b/ui/qt/preference_editor_frame.h
index 0863c3983994820ba097c9be57495279b7a5c0c6..6cef56097073a0bb9c424d47d1da0dd4e24f5f6b 100644 (file)
--- a/ui/qt/preference_editor_frame.h
+++ b/ui/qt/preference_editor_frame.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 PREFERENCE_EDITOR_FRAME_H
 #define PREFERENCE_EDITOR_FRAME_H

diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp
index c15c6ceb26b3a53a138cfd26209d47b9ef4272c2..2b14ef42b068f1553dfea0d7b7392ac321b8ec41 100644 (file)
--- a/ui/qt/preferences_dialog.cpp
+++ b/ui/qt/preferences_dialog.cpp
@@ -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
  */
 
 #include "preferences_dialog.h"

diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h
index 04925bcd7f485a7d423375cf298b2d2a7fbfe7dd..5bc95ade5a5e67d6c23d8519cbbaa7de9cb9aa8c 100644 (file)
--- a/ui/qt/preferences_dialog.h
+++ b/ui/qt/preferences_dialog.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 PREFERENCES_DIALOG_H

diff --git a/ui/qt/print_dialog.cpp b/ui/qt/print_dialog.cpp
index ba9fa4a8556900c5bec94a63e74843c2b623d4ae..59f1915803e4fb70eae2c509a4507e32ec6189ea 100644 (file)
--- a/ui/qt/print_dialog.cpp
+++ b/ui/qt/print_dialog.cpp
@@ -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*/
 
 #include "print_dialog.h"
 #include <ui_print_dialog.h>

diff --git a/ui/qt/print_dialog.h b/ui/qt/print_dialog.h
index 6c4ef68bd5846e14b9b0d490f3c318e391832eaf..9900d10b95fb6da89757f54004b8cfe99745346c 100644 (file)
--- a/ui/qt/print_dialog.h
+++ b/ui/qt/print_dialog.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 PRINT_DIALOG_H
 #define PRINT_DIALOG_H

diff --git a/ui/qt/profile_dialog.cpp b/ui/qt/profile_dialog.cpp
index 102156433f1e557a148cfd3954844fe1830469b6..81ca9ba5f7e396408561be536bddfb535682e5ac 100644 (file)
--- a/ui/qt/profile_dialog.cpp
+++ b/ui/qt/profile_dialog.cpp
@@ -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*/
 
 #include "config.h"
 #include <glib.h>

diff --git a/ui/qt/profile_dialog.h b/ui/qt/profile_dialog.h
index 1263113c4500b39471e4094d436ebe9a641eb74d..aca0ff8db24945f99fbd0809733d2269d595c3cd 100644 (file)
--- a/ui/qt/profile_dialog.h
+++ b/ui/qt/profile_dialog.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 PROFILE_DIALOG_H
 #define PROFILE_DIALOG_H

diff --git a/ui/qt/progress_frame.cpp b/ui/qt/progress_frame.cpp
index 846bb7fa990a4543c73bb96505ab7ce9491699b8..d3dfb9ef4a01548cd1a9956cf69265a6bf93cb6e 100644 (file)
--- a/ui/qt/progress_frame.cpp
+++ b/ui/qt/progress_frame.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/progress_frame.h b/ui/qt/progress_frame.h
index 2d9dfe757462b867e156dda5e3b8ed9a00501bfb..ff5c6dc59bdea1f387647fff82c3aa4c10366466 100644 (file)
--- a/ui/qt/progress_frame.h
+++ b/ui/qt/progress_frame.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 PROGRESS_FRAME_H
 #define PROGRESS_FRAME_H

diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp
index ed9da842f6f6e2110e1701f7767cfcc84b9545ea..6b25f7156db8837c859d17d9f52d675795f01fc0 100644 (file)
--- a/ui/qt/proto_tree.cpp
+++ b/ui/qt/proto_tree.cpp
@@ -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
  */
 
 #include <stdio.h>

diff --git a/ui/qt/proto_tree.h b/ui/qt/proto_tree.h
index 8394b698157804589a8bc3e18357aaa0322c79d9..9dada379eb78dad497487f9873d8c3a00f300f02 100644 (file)
--- a/ui/qt/proto_tree.h
+++ b/ui/qt/proto_tree.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 PROTO_TREE_H

diff --git a/ui/qt/protocol_hierarchy_dialog.cpp b/ui/qt/protocol_hierarchy_dialog.cpp
index 2d9b36cf0366e352586cbaae2138d44a7b1a9418..d6688ddd6285145c9b8fd3748cbb7508f9311b04 100644 (file)
--- a/ui/qt/protocol_hierarchy_dialog.cpp
+++ b/ui/qt/protocol_hierarchy_dialog.cpp
@@ -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*/
 
 #include "protocol_hierarchy_dialog.h"
 #include <ui_protocol_hierarchy_dialog.h>

diff --git a/ui/qt/protocol_hierarchy_dialog.h b/ui/qt/protocol_hierarchy_dialog.h
index 0a24179af6f3f918492a015c3cde2c45dbfe842c..40f8125cee91f423b0171f630b79f17b1b22f2e9 100644 (file)
--- a/ui/qt/protocol_hierarchy_dialog.h
+++ b/ui/qt/protocol_hierarchy_dialog.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 PROTOCOL_HIERARCHY_DIALOG_H
 #define PROTOCOL_HIERARCHY_DIALOG_H

diff --git a/ui/qt/protocol_preferences_menu.cpp b/ui/qt/protocol_preferences_menu.cpp
index 31d4154271d341f0a87ce243905d48dbc114b371..1ad2fd67597a84a81664100e8a791928e29d9bde 100644 (file)
--- a/ui/qt/protocol_preferences_menu.cpp
+++ b/ui/qt/protocol_preferences_menu.cpp
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/qt/protocol_preferences_menu.h b/ui/qt/protocol_preferences_menu.h
index 4672aba7d0e757f4fd9d02692810e9fc730f11f3..4dfcda12e6fab8a3fe281d43bbb9139b2d2df4b1 100644 (file)
--- a/ui/qt/protocol_preferences_menu.h
+++ b/ui/qt/protocol_preferences_menu.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 __PROTOCOL_PREFERENCES_MENU_H__

diff --git a/ui/qt/recent_file_status.cpp b/ui/qt/recent_file_status.cpp
index 4829de40b5cfe422567e6ab00efff0570ff3f6fc..3cf9333f4d89971970b474c2ddfd28dced49a01b 100644 (file)
--- a/ui/qt/recent_file_status.cpp
+++ b/ui/qt/recent_file_status.cpp
@@ -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
  */
 
 #include "recent_file_status.h"

diff --git a/ui/qt/recent_file_status.h b/ui/qt/recent_file_status.h
index c012d3519551af68b3d25178b7a08e1ff5dce6c7..098c953ae5c9d736b9cbe841f2490305bc5e3a57 100644 (file)
--- a/ui/qt/recent_file_status.h
+++ b/ui/qt/recent_file_status.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 RECENT_FILE_STATUS_H

diff --git a/ui/qt/remote_capture_dialog.cpp b/ui/qt/remote_capture_dialog.cpp
index ecc2675b08bbf473b33ba51b7427a319c83158a1..d205f9f6ef4a2cacd912b6d4d39edff5e09034ab 100644 (file)
--- a/ui/qt/remote_capture_dialog.cpp
+++ b/ui/qt/remote_capture_dialog.cpp
@@ -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*/
 
 // XXX This shouldn't exist. These controls should be in ManageInterfacesDialog instead.
 

diff --git a/ui/qt/remote_capture_dialog.h b/ui/qt/remote_capture_dialog.h
index ab6b7a58a9fa931aef2a27981b0676cca9afa36a..8cc70be73b667d441fef254d9bb9bb55ec722d20 100644 (file)
--- a/ui/qt/remote_capture_dialog.h
+++ b/ui/qt/remote_capture_dialog.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 REMOTE_CAPTURE_DIALOG_H
 #define REMOTE_CAPTURE_DIALOG_H

diff --git a/ui/qt/remote_settings_dialog.cpp b/ui/qt/remote_settings_dialog.cpp
index 4575c481f391de5eb1fdae21ba6a0d63642fd5d5..272a2aa0746607eba7c52a3d9a6a9410fdf46d0e 100644 (file)
--- a/ui/qt/remote_settings_dialog.cpp
+++ b/ui/qt/remote_settings_dialog.cpp
@@ -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*/
 
 // XXX This shouldn't exist. These controls should be in ManageInterfacesDialog instead.
 

diff --git a/ui/qt/remote_settings_dialog.h b/ui/qt/remote_settings_dialog.h
index eab8dd0dd6439fe72d6d87af170e8742a82878e2..948582de0e4707588b3db3f16c592391d8ddecfe 100644 (file)
--- a/ui/qt/remote_settings_dialog.h
+++ b/ui/qt/remote_settings_dialog.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 REMOTE_SETTINGS_DIALOG_H
 #define REMOTE_SETTINGS_DIALOG_H

diff --git a/ui/qt/resolved_addresses_dialog.cpp b/ui/qt/resolved_addresses_dialog.cpp
index a7091339f31fd4ecc53e76b4f4ff0f9dbf5dd723..ece27bb294152d2587f1e81cfd3bdec3bbc7c3d7 100644 (file)
--- a/ui/qt/resolved_addresses_dialog.cpp
+++ b/ui/qt/resolved_addresses_dialog.cpp
@@ -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*/
 
 #include "resolved_addresses_dialog.h"
 #include <ui_resolved_addresses_dialog.h>

diff --git a/ui/qt/resolved_addresses_dialog.h b/ui/qt/resolved_addresses_dialog.h
index 54ed0e139d5e5191fd3bd20861599cfb28957ee7..ff87a334673cc1bbccb64a73c5f6a16e4caf5f7e 100644 (file)
--- a/ui/qt/resolved_addresses_dialog.h
+++ b/ui/qt/resolved_addresses_dialog.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 RESOLVED_ADDRESSES_DIALOG_H
 #define RESOLVED_ADDRESSES_DIALOG_H

diff --git a/ui/qt/response_time_delay_dialog.cpp b/ui/qt/response_time_delay_dialog.cpp
index b2dbedd507a7dd987c82e3c20d71b8a92cff8179..fe22a2893a691ffea0ca6f12763936f93515c259 100644 (file)
--- a/ui/qt/response_time_delay_dialog.cpp
+++ b/ui/qt/response_time_delay_dialog.cpp
@@ -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*/
 
 #include "response_time_delay_dialog.h"
 

diff --git a/ui/qt/response_time_delay_dialog.h b/ui/qt/response_time_delay_dialog.h
index 41f70b21c7c3fa4686783757d54707f70ed1a0b0..99413060a2939c0de40a31666805a9ddac44ae9d 100644 (file)
--- a/ui/qt/response_time_delay_dialog.h
+++ b/ui/qt/response_time_delay_dialog.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 __RESPONSE_TIME_DELAY_DIALOG_H__
 #define __RESPONSE_TIME_DELAY_DIALOG_H__

diff --git a/ui/qt/rpc_service_response_time_dialog.cpp b/ui/qt/rpc_service_response_time_dialog.cpp
index ab2d5c9e87762e9a1bb59f208489cd25880255e7..30db4c5e06e891b919f4c3a124e569718c15a488 100644 (file)
--- a/ui/qt/rpc_service_response_time_dialog.cpp
+++ b/ui/qt/rpc_service_response_time_dialog.cpp
@@ -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*/
 
 // warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data
 #ifdef _MSC_VER

diff --git a/ui/qt/rpc_service_response_time_dialog.h b/ui/qt/rpc_service_response_time_dialog.h
index 064d89ff66440fe2de334154ad890a04c3be1ac7..a474914e6e4fd4d152baafabab6f172e4ea17f36 100644 (file)
--- a/ui/qt/rpc_service_response_time_dialog.h
+++ b/ui/qt/rpc_service_response_time_dialog.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 __RPC_SERVICE_RESPONSE_TIME_DIALOG_H__
 #define __RPC_SERVICE_RESPONSE_TIME_DIALOG_H__

diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp
index 76eda663b25076378f7d343569bc6430778c0bc5..b8a950344dd5fbd7151120b54e75162564a0edc1 100644 (file)
--- a/ui/qt/rtp_analysis_dialog.cpp
+++ b/ui/qt/rtp_analysis_dialog.cpp
@@ -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*/
 
 #include "rtp_analysis_dialog.h"
 #include <ui_rtp_analysis_dialog.h>

diff --git a/ui/qt/rtp_analysis_dialog.h b/ui/qt/rtp_analysis_dialog.h
index 26cabdad4b09f63fdf8cb1401df429d908fc3443..227b99e0e048a740ae0de1bb7841b0a4d12de071 100644 (file)
--- a/ui/qt/rtp_analysis_dialog.h
+++ b/ui/qt/rtp_analysis_dialog.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 RTP_ANALYSIS_DIALOG_H
 #define RTP_ANALYSIS_DIALOG_H

diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp
index 1e4a8404dc641d11c0ce9c69876c35f1612a77bc..10a5bed40cf0127204f7003c6b8725b5f395ef19 100644 (file)
--- a/ui/qt/rtp_audio_stream.cpp
+++ b/ui/qt/rtp_audio_stream.cpp
@@ -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*/
 
 #include "rtp_audio_stream.h"
 

diff --git a/ui/qt/rtp_audio_stream.h b/ui/qt/rtp_audio_stream.h
index ff13d3037d1474c0b3071bed347814606468faca..4d57e50714143bf2cc277fe34cacfb3da5cf4336 100644 (file)
--- a/ui/qt/rtp_audio_stream.h
+++ b/ui/qt/rtp_audio_stream.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 RTPAUDIOSTREAM_H
 #define RTPAUDIOSTREAM_H

diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp
index 5de3299e17ed40eb4434f91f92366ce0e48125be..b42cb55231135d84eee513ee2e43233627a72e0c 100644 (file)
--- a/ui/qt/rtp_player_dialog.cpp
+++ b/ui/qt/rtp_player_dialog.cpp
@@ -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*/
 
 #include "rtp_player_dialog.h"
 #include <ui_rtp_player_dialog.h>

diff --git a/ui/qt/rtp_player_dialog.h b/ui/qt/rtp_player_dialog.h
index d999616cf9a349813dd4cc15f34e4bc282e5db06..fa82911f4a516ca4cb0bec5c5548a5748e085aa8 100644 (file)
--- a/ui/qt/rtp_player_dialog.h
+++ b/ui/qt/rtp_player_dialog.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 RTP_PLAYER_DIALOG_H
 #define RTP_PLAYER_DIALOG_H

diff --git a/ui/qt/rtp_stream_dialog.cpp b/ui/qt/rtp_stream_dialog.cpp
index 52e4841a66708acbb840da86b43926c2093553d8..48228305f13037f58a3618b9f3ee088af5b6254a 100644 (file)
--- a/ui/qt/rtp_stream_dialog.cpp
+++ b/ui/qt/rtp_stream_dialog.cpp
@@ -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*/
 
 #include "rtp_stream_dialog.h"
 #include <ui_rtp_stream_dialog.h>

diff --git a/ui/qt/rtp_stream_dialog.h b/ui/qt/rtp_stream_dialog.h
index 28e87324e16ddb52add5bd35c6aee90668ab2065..5f79c853bf28d85a4b6acfb6bfb10b71b6ee1d5b 100644 (file)
--- a/ui/qt/rtp_stream_dialog.h
+++ b/ui/qt/rtp_stream_dialog.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 RTP_STREAM_DIALOG_H
 #define RTP_STREAM_DIALOG_H

diff --git a/ui/qt/scsi_service_response_time_dialog.cpp b/ui/qt/scsi_service_response_time_dialog.cpp
index eb2870f092a54df8a06792ad036b912277364daf..d08eefeaf2fda2c0ffed71c350abad33db5b9769 100644 (file)
--- a/ui/qt/scsi_service_response_time_dialog.cpp
+++ b/ui/qt/scsi_service_response_time_dialog.cpp
@@ -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*/
 
 #include "scsi_service_response_time_dialog.h"
 

diff --git a/ui/qt/scsi_service_response_time_dialog.h b/ui/qt/scsi_service_response_time_dialog.h
index 1313dfc8057046e45b69ba3a7713a9345730d26d..8eb50fd3f922f4a13acb4b54613d8758b0f9bea3 100644 (file)
--- a/ui/qt/scsi_service_response_time_dialog.h
+++ b/ui/qt/scsi_service_response_time_dialog.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 __SCSI_SERVICE_RESPONSE_TIME_DIALOG_H__
 #define __SCSI_SERVICE_RESPONSE_TIME_DIALOG_H__

diff --git a/ui/qt/sctp_all_assocs_dialog.cpp b/ui/qt/sctp_all_assocs_dialog.cpp
index 96a7a5e8160cb334e845a954714efaede16d9def..ebe97d6163e7f882f4c120c203bc79af2287c828 100644 (file)
--- a/ui/qt/sctp_all_assocs_dialog.cpp
+++ b/ui/qt/sctp_all_assocs_dialog.cpp
@@ -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*/
 
 #include "sctp_all_assocs_dialog.h"
 #include <ui_sctp_all_assocs_dialog.h>

diff --git a/ui/qt/sctp_all_assocs_dialog.h b/ui/qt/sctp_all_assocs_dialog.h
index 6d0e75d3085b700802bfe5c3d2045b10ff805672..12ea73e1019f32e8374af033c9a31d6687c19ac2 100644 (file)
--- a/ui/qt/sctp_all_assocs_dialog.h
+++ b/ui/qt/sctp_all_assocs_dialog.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 SCTP_ALL_ASSOCS_DIALOG_H
 #define SCTP_ALL_ASSOCS_DIALOG_H

diff --git a/ui/qt/sctp_assoc_analyse_dialog.cpp b/ui/qt/sctp_assoc_analyse_dialog.cpp
index dabb2ae23c751bbf896612aae8498b2a6f9b38d4..02c4e1bd0bbdf211b15fd6bf12a896fa0f6f70ed 100644 (file)
--- a/ui/qt/sctp_assoc_analyse_dialog.cpp
+++ b/ui/qt/sctp_assoc_analyse_dialog.cpp
@@ -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*/
 
 #include "epan/to_str.h"
 

diff --git a/ui/qt/sctp_assoc_analyse_dialog.h b/ui/qt/sctp_assoc_analyse_dialog.h
index ddcb3969f89aba20e3badb0326ac6ad089a703a5..71b6ce42fafa1f3e7406fc4716cad7b90d980c92 100644 (file)
--- a/ui/qt/sctp_assoc_analyse_dialog.h
+++ b/ui/qt/sctp_assoc_analyse_dialog.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 SCTP_ASSOC_ANALYSE_DIALOG_H
 #define SCTP_ASSOC_ANALYSE_DIALOG_H

diff --git a/ui/qt/sctp_chunk_statistics_dialog.cpp b/ui/qt/sctp_chunk_statistics_dialog.cpp
index 8d57fbada7e21cb7c23d81a7d7a31182abb687ad..af9ccee0205315df67d82e7ac71bc3f2820738f6 100644 (file)
--- a/ui/qt/sctp_chunk_statistics_dialog.cpp
+++ b/ui/qt/sctp_chunk_statistics_dialog.cpp
@@ -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*/
 
 #include "sctp_chunk_statistics_dialog.h"
 #include <ui_sctp_chunk_statistics_dialog.h>

diff --git a/ui/qt/sctp_chunk_statistics_dialog.h b/ui/qt/sctp_chunk_statistics_dialog.h
index c1355a8c825c1d1f020f68d0253169f94139053e..9c288cf03ab8e706fdf8d383a11bb14e9111e0f7 100644 (file)
--- a/ui/qt/sctp_chunk_statistics_dialog.h
+++ b/ui/qt/sctp_chunk_statistics_dialog.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 SCTP_CHUNK_STATISTICS_DIALOG_H
 #define SCTP_CHUNK_STATISTICS_DIALOG_H

diff --git a/ui/qt/sctp_graph_arwnd_dialog.cpp b/ui/qt/sctp_graph_arwnd_dialog.cpp
index 872b023a0d0c0efdaa7784dce11e0bc70462a691..891e51e852ff5f1bdfc08419cf51d7323b954543 100644 (file)
--- a/ui/qt/sctp_graph_arwnd_dialog.cpp
+++ b/ui/qt/sctp_graph_arwnd_dialog.cpp
@@ -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*/
 
 #include "sctp_graph_arwnd_dialog.h"
 #include <ui_sctp_graph_arwnd_dialog.h>

diff --git a/ui/qt/sctp_graph_arwnd_dialog.h b/ui/qt/sctp_graph_arwnd_dialog.h
index 5a6ac1bd0bf77c95428ab41fcc84f6cf2dd92d11..5785cefb64963080a745ab83865be2715c19c298 100644 (file)
--- a/ui/qt/sctp_graph_arwnd_dialog.h
+++ b/ui/qt/sctp_graph_arwnd_dialog.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 SCTP_GRAPH_ARWND_DIALOG_H
 #define SCTP_GRAPH_ARWND_DIALOG_H

diff --git a/ui/qt/sctp_graph_byte_dialog.cpp b/ui/qt/sctp_graph_byte_dialog.cpp
index 45a4345a89b085fa716954887fd00c9462af930b..afe227136eb073c4ea4313458dccb3066c8632ec 100644 (file)
--- a/ui/qt/sctp_graph_byte_dialog.cpp
+++ b/ui/qt/sctp_graph_byte_dialog.cpp
@@ -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*/
 
 #include "sctp_graph_byte_dialog.h"
 #include <ui_sctp_graph_byte_dialog.h>

diff --git a/ui/qt/sctp_graph_byte_dialog.h b/ui/qt/sctp_graph_byte_dialog.h
index 4b8f3a85edc08cf0d7402337fed697f87dbcbfab..df4353fc56eee32765b825991b1db26989e51c64 100644 (file)
--- a/ui/qt/sctp_graph_byte_dialog.h
+++ b/ui/qt/sctp_graph_byte_dialog.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 SCTP_GRAPH_BYTE_DIALOG_H
 #define SCTP_GRAPH_BYTE_DIALOG_H

diff --git a/ui/qt/sctp_graph_dialog.cpp b/ui/qt/sctp_graph_dialog.cpp
index 47d38f58e5736bf11911a82d918fdea0589049f8..a5afe34738ce8cf5a93bdd3c205ca3df6ec116e1 100644 (file)
--- a/ui/qt/sctp_graph_dialog.cpp
+++ b/ui/qt/sctp_graph_dialog.cpp
@@ -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*/
 
 #include <wsutil/utf8_entities.h>
 

diff --git a/ui/qt/sctp_graph_dialog.h b/ui/qt/sctp_graph_dialog.h
index 94839f37d52ead63f1e547659e15b5e9c21ee2cc..22b6527e4cda7e631717718cd5297601fc0ee0e9 100644 (file)
--- a/ui/qt/sctp_graph_dialog.h
+++ b/ui/qt/sctp_graph_dialog.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 SCTP_GRAPH_DIALOG_H
 #define SCTP_GRAPH_DIALOG_H

diff --git a/ui/qt/search_frame.cpp b/ui/qt/search_frame.cpp
index 9bd5f9bf4e20578b6c97adfa5aefa4eb82e5547b..a5e704cb3dc8a3375f9653c5f7147a584c2cd5e6 100644 (file)
--- a/ui/qt/search_frame.cpp
+++ b/ui/qt/search_frame.cpp
@@ -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*/
 
 #include "search_frame.h"
 #include <ui_search_frame.h>

diff --git a/ui/qt/search_frame.h b/ui/qt/search_frame.h
index f943dad7fb8d375e439d53803dfa8e4fe39eb304..0917dbfa6c526587e6d5e121b73866d17778c810 100644 (file)
--- a/ui/qt/search_frame.h
+++ b/ui/qt/search_frame.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 SEARCH_FRAME_H
 #define SEARCH_FRAME_H

diff --git a/ui/qt/sequence_diagram.cpp b/ui/qt/sequence_diagram.cpp
index cf33d7dfbe31db5e1aad119d65417dd03fe6b359..e826f3a459a0b6ad8a6b0ae7a0878f0f184bbf86 100644 (file)
--- a/ui/qt/sequence_diagram.cpp
+++ b/ui/qt/sequence_diagram.cpp
@@ -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*/
 
 #include "sequence_diagram.h"
 

diff --git a/ui/qt/sequence_diagram.h b/ui/qt/sequence_diagram.h
index 1a3ad327e03ba28450960b56b04eb6d7d55a69db..4167699e22b92fa098f3f98b2cce020fea0a7fd1 100644 (file)
--- a/ui/qt/sequence_diagram.h
+++ b/ui/qt/sequence_diagram.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 SEQUENCE_DIAGRAM_H
 #define SEQUENCE_DIAGRAM_H

diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp
index 6f747ea91be2d6d894a9dd8e7409d837c142d26a..be255e57e3af36b39cd56b8610248e3bda3fc9a7 100644 (file)
--- a/ui/qt/sequence_dialog.cpp
+++ b/ui/qt/sequence_dialog.cpp
@@ -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*/
 
 #include "sequence_dialog.h"
 #include <ui_sequence_dialog.h>

diff --git a/ui/qt/sequence_dialog.h b/ui/qt/sequence_dialog.h
index 7087ac357a671b4788d9ae722fee60286ea8ccd7..84c297dce808a8698091b92d1db5a3af00f9c68f 100644 (file)
--- a/ui/qt/sequence_dialog.h
+++ b/ui/qt/sequence_dialog.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 SEQUENCE_DIALOG_H
 #define SEQUENCE_DIALOG_H

diff --git a/ui/qt/service_response_time_dialog.cpp b/ui/qt/service_response_time_dialog.cpp
index 3f9f10dfb26a719e1cf7f870212cfa3febcbdbcd..5dc6e736a2a4bdcffb3f40cfab8135a6fe1155fd 100644 (file)
--- a/ui/qt/service_response_time_dialog.cpp
+++ b/ui/qt/service_response_time_dialog.cpp
@@ -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*/
 
 #include "service_response_time_dialog.h"
 

diff --git a/ui/qt/service_response_time_dialog.h b/ui/qt/service_response_time_dialog.h
index 329df609edb50e31f5481b45589285576a5d6d3d..8dd593855209463e94832c5784a3d207d462020f 100644 (file)
--- a/ui/qt/service_response_time_dialog.h
+++ b/ui/qt/service_response_time_dialog.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 __SERVICE_RESPONSE_TIME_DIALOG_H__
 #define __SERVICE_RESPONSE_TIME_DIALOG_H__

diff --git a/ui/qt/show_packet_bytes_dialog.cpp b/ui/qt/show_packet_bytes_dialog.cpp
index 0051ba1ea8c6e7fea6f42231877fdd3db35bd1e4..87de6a542549f0063dd36f36d6c80b78f320bf66 100644 (file)
--- a/ui/qt/show_packet_bytes_dialog.cpp
+++ b/ui/qt/show_packet_bytes_dialog.cpp
@@ -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*/
 
 #include "show_packet_bytes_dialog.h"
 #include <ui_show_packet_bytes_dialog.h>

diff --git a/ui/qt/show_packet_bytes_dialog.h b/ui/qt/show_packet_bytes_dialog.h
index 21294236ef33668eead74a3daaab539ab003c54a..8382b945e5976711446a441fd69e3e1feb7ea53b 100644 (file)
--- a/ui/qt/show_packet_bytes_dialog.h
+++ b/ui/qt/show_packet_bytes_dialog.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 SHOW_PACKET_BYTES_DIALOG_H
 #define SHOW_PACKET_BYTES_DIALOG_H

diff --git a/ui/qt/simple_dialog.cpp b/ui/qt/simple_dialog.cpp
index 6b58dc4bf4c10e57381450e90924f47dbf258a17..636333c2924b1bdd5ce30bc6c3fa61834757b175 100644 (file)
--- a/ui/qt/simple_dialog.cpp
+++ b/ui/qt/simple_dialog.cpp
@@ -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*/
 
 #include "simple_dialog.h"
 

diff --git a/ui/qt/simple_dialog.h b/ui/qt/simple_dialog.h
index 06404190cfc588b3523d36330388526c711289a9..4bfd3f1465252f1d5c003e7ea581f04604b09f46 100644 (file)
--- a/ui/qt/simple_dialog.h
+++ b/ui/qt/simple_dialog.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 SIMPLE_DIALOG_H
 #define SIMPLE_DIALOG_H

diff --git a/ui/qt/simple_statistics_dialog.cpp b/ui/qt/simple_statistics_dialog.cpp
index f1e4f5c42a617b22921e3db2f3b9b84a6c1e428e..3bdcc29723a6904f70617e628941ad28fb206399 100644 (file)
--- a/ui/qt/simple_statistics_dialog.cpp
+++ b/ui/qt/simple_statistics_dialog.cpp
@@ -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*/
 
 #include "simple_statistics_dialog.h"
 

diff --git a/ui/qt/simple_statistics_dialog.h b/ui/qt/simple_statistics_dialog.h
index 6892bcd561a032cf84355cf2c43a937d7d98623c..a1fe6929d5569d20fd8dad1f466331f253dc730e 100644 (file)
--- a/ui/qt/simple_statistics_dialog.h
+++ b/ui/qt/simple_statistics_dialog.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 __SIMPLE_STATISTICS_DIALOG_H__
 #define __SIMPLE_STATISTICS_DIALOG_H__

diff --git a/ui/qt/splash_overlay.cpp b/ui/qt/splash_overlay.cpp
index a34c7d156bcfe417bf1139660e692aadec822f7a..0131f58e2aa2abe6ce0365ef6489cdec2618b876 100644 (file)
--- a/ui/qt/splash_overlay.cpp
+++ b/ui/qt/splash_overlay.cpp
@@ -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*/
 
 #include "splash_overlay.h"
 #include <ui_splash_overlay.h>

diff --git a/ui/qt/splash_overlay.h b/ui/qt/splash_overlay.h
index a8a501fe7f2bafb15046c0de05ce6959047049fa..32d5fa1fd936305bcd6904350ada5dee4a6a4e30 100644 (file)
--- a/ui/qt/splash_overlay.h
+++ b/ui/qt/splash_overlay.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 SPLASH_OVERLAY_H
 #define SPLASH_OVERLAY_H

diff --git a/ui/qt/stats_tree_dialog.cpp b/ui/qt/stats_tree_dialog.cpp
index ca8feb06dbcc602570e5e1f2747fedca4f1dd41d..83654d1ff3d9fb55404b3876b6e551d127dc440b 100644 (file)
--- a/ui/qt/stats_tree_dialog.cpp
+++ b/ui/qt/stats_tree_dialog.cpp
@@ -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*/
 
 #include "stats_tree_dialog.h"
 

diff --git a/ui/qt/stats_tree_dialog.h b/ui/qt/stats_tree_dialog.h
index 2a895d5abce78137a4da259168e33850b9e248b6..c17a50f48ca306cbb90cdeea3bd8396d7e93fd75 100644 (file)
--- a/ui/qt/stats_tree_dialog.h
+++ b/ui/qt/stats_tree_dialog.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 STATS_TREE_DIALOG_H
 #define STATS_TREE_DIALOG_H

diff --git a/ui/qt/supported_protocols_dialog.cpp b/ui/qt/supported_protocols_dialog.cpp
index 726f713c1630c9a54b333f5d12835f42a233294b..a680db53821a9233e4468e73b1c57297de28db1a 100644 (file)
--- a/ui/qt/supported_protocols_dialog.cpp
+++ b/ui/qt/supported_protocols_dialog.cpp
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/qt/supported_protocols_dialog.h b/ui/qt/supported_protocols_dialog.h
index 585da1898f3bb723336d9938f6c0c1e8391715c7..f65e17a4157f6fcc9e60fb93e73967cf286c3f3e 100644 (file)
--- a/ui/qt/supported_protocols_dialog.h
+++ b/ui/qt/supported_protocols_dialog.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 SUPPORTED_PROTOCOLS_DIALOG_H

diff --git a/ui/qt/tabnav_tree_widget.cpp b/ui/qt/tabnav_tree_widget.cpp
index ab2aa4f276046a8fc6222e1cd10d399ced5b185b..b80f77a97fa7aa54c175cd5410604995693ef68b 100644 (file)
--- a/ui/qt/tabnav_tree_widget.cpp
+++ b/ui/qt/tabnav_tree_widget.cpp
@@ -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*/
 
 #include "tabnav_tree_widget.h"
 

diff --git a/ui/qt/tabnav_tree_widget.h b/ui/qt/tabnav_tree_widget.h
index 83e234d31fb94cb9b0f6f8a8ba0cd8a8b4bd9082..c10074cfc678c02142cd8f41ba08c89eb2125bf0 100644 (file)
--- a/ui/qt/tabnav_tree_widget.h
+++ b/ui/qt/tabnav_tree_widget.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 TABNAV_TREE_WIDGET_H
 #define TABNAV_TREE_WIDGET_H

diff --git a/ui/qt/tap_parameter_dialog.cpp b/ui/qt/tap_parameter_dialog.cpp
index c2e42c891e6a610406b03514f682a27a0d656fb9..4072117b744174506580cdb58bf9e96c0e846a77 100644 (file)
--- a/ui/qt/tap_parameter_dialog.cpp
+++ b/ui/qt/tap_parameter_dialog.cpp
@@ -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*/
 
 /*
  * @file Tap parameter dialog class

diff --git a/ui/qt/tap_parameter_dialog.h b/ui/qt/tap_parameter_dialog.h
index 71268f82cb4d56fb0977264284d7e15d0b5e769c..0d701acf358cd35ef93d8c6d5d01ce178e6377b1 100644 (file)
--- a/ui/qt/tap_parameter_dialog.h
+++ b/ui/qt/tap_parameter_dialog.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 TAP_PARAMETER_DIALOG_H
 #define TAP_PARAMETER_DIALOG_H

diff --git a/ui/qt/tcp_stream_dialog.cpp b/ui/qt/tcp_stream_dialog.cpp
index 33be836eeeab993160fbc5657e541937a03f835b..64143d4731462552c7bff71ab1bbdd4832b6cab0 100644 (file)
--- a/ui/qt/tcp_stream_dialog.cpp
+++ b/ui/qt/tcp_stream_dialog.cpp
@@ -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*/
 
 #include "tcp_stream_dialog.h"
 #include <ui_tcp_stream_dialog.h>

diff --git a/ui/qt/tcp_stream_dialog.h b/ui/qt/tcp_stream_dialog.h
index 7f17fc445731108f635f027e3bab08a49b1b627f..a422cd9abe9e526c2633c65a4ee7d4ed137d8473 100644 (file)
--- a/ui/qt/tcp_stream_dialog.h
+++ b/ui/qt/tcp_stream_dialog.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 TCP_STREAM_DIALOG_H
 #define TCP_STREAM_DIALOG_H

diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
index f18b6d5ceb85cfbac50c88b5c0863f4427ac12f5..93882c09a377a5630e8bb09b4e80d7f6a84f7293 100644 (file)
--- a/ui/qt/time_shift_dialog.cpp
+++ b/ui/qt/time_shift_dialog.cpp
@@ -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*/
 
 #include "time_shift_dialog.h"
 #include <ui_time_shift_dialog.h>

diff --git a/ui/qt/time_shift_dialog.h b/ui/qt/time_shift_dialog.h
index 0a9f85f3050e7c3eb122d3d15cd527240be5a349..10f87f05a099b43337c4f31929f87bf4330cbf3b 100644 (file)
--- a/ui/qt/time_shift_dialog.h
+++ b/ui/qt/time_shift_dialog.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 TIME_SHIFT_DIALOG_H
 #define TIME_SHIFT_DIALOG_H

diff --git a/ui/qt/traffic_table_dialog.cpp b/ui/qt/traffic_table_dialog.cpp
index 9cb6fffe64b2e0e73b9cda8baa50deaace7835f8..8cbe863dfe71be7389112886990ed2f950054c16 100644 (file)
--- a/ui/qt/traffic_table_dialog.cpp
+++ b/ui/qt/traffic_table_dialog.cpp
@@ -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*/
 
 #include "log.h"
 #include "traffic_table_dialog.h"

diff --git a/ui/qt/traffic_table_dialog.h b/ui/qt/traffic_table_dialog.h
index ed7317f7c1bc45962f5bbba4b60d6d380f42f5c6..681b41e5b34e21826afe75defd3f260f9d98246f 100644 (file)
--- a/ui/qt/traffic_table_dialog.h
+++ b/ui/qt/traffic_table_dialog.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 TRAFFIC_TABLE_DIALOG_H
 #define TRAFFIC_TABLE_DIALOG_H

diff --git a/ui/qt/uat_dialog.cpp b/ui/qt/uat_dialog.cpp
index 203590f00ae9c559755c47d3f46e80c184d3e8a9..deef940beb820f1bf28a5b24f1a1c63961d2d62b 100644 (file)
--- a/ui/qt/uat_dialog.cpp
+++ b/ui/qt/uat_dialog.cpp
@@ -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*/
 
 #include "uat_dialog.h"
 #include <ui_uat_dialog.h>

diff --git a/ui/qt/uat_dialog.h b/ui/qt/uat_dialog.h
index 42e64c19dfa4e9908e4e7deadf314e9f788b3f0c..ce5d4601c642aa569ddd5ba029e3562054b5944d 100644 (file)
--- a/ui/qt/uat_dialog.h
+++ b/ui/qt/uat_dialog.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 UAT_DIALOG_H
 #define UAT_DIALOG_H

diff --git a/ui/qt/uat_frame.cpp b/ui/qt/uat_frame.cpp
index a12a8a53ad5b50c50b498a76440c785deb207db3..ed3d28620784959274ac8a4125a456219ae76e64 100644 (file)
--- a/ui/qt/uat_frame.cpp
+++ b/ui/qt/uat_frame.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/uat_frame.h b/ui/qt/uat_frame.h
index 0056c93f5034bbfdb6f98c04e4c0d964a1cc382d..1c1124e194409fbd61ef96685ba71d9d8f34d14e 100644 (file)
--- a/ui/qt/uat_frame.h
+++ b/ui/qt/uat_frame.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 UAT_FRAME_H
 #define UAT_FRAME_H

diff --git a/ui/qt/utils/color_utils.cpp b/ui/qt/utils/color_utils.cpp
index 14b11e34d2d4306212b8a9365d8e8a4b0621ce49..e5e44afd6f81f1fb1ee6f8230b0cdeb25855bae6 100644 (file)
--- a/ui/qt/utils/color_utils.cpp
+++ b/ui/qt/utils/color_utils.cpp
@@ -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*/
 
 #include <ui/qt/utils/color_utils.h>
 #include <ui/qt/utils/tango_colors.h>

diff --git a/ui/qt/utils/color_utils.h b/ui/qt/utils/color_utils.h
index 2d60cdc6887af93a79ec6b0a8b5e9eedcd178f77..0afff4f6c297c2aecab6fd6abe0f8ab8179cc926 100644 (file)
--- a/ui/qt/utils/color_utils.h
+++ b/ui/qt/utils/color_utils.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 COLOR_UTILS_H
 #define COLOR_UTILS_H

diff --git a/ui/qt/utils/data_printer.cpp b/ui/qt/utils/data_printer.cpp
index 2eceb9e22c5cccfdd54420aaeedb53e2ce5a822d..7ff5e3dd78b82ec553d342b73b7d80631a4a6a4f 100644 (file)
--- a/ui/qt/utils/data_printer.cpp
+++ b/ui/qt/utils/data_printer.cpp
@@ -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
  */
 
 #include <ui/qt/utils/data_printer.h>

diff --git a/ui/qt/utils/data_printer.h b/ui/qt/utils/data_printer.h
index 31fc69027946100b52f63ee5f30634f11fb5e35d..ce4347748662daaa239e116b5dc7706a95420797 100644 (file)
--- a/ui/qt/utils/data_printer.h
+++ b/ui/qt/utils/data_printer.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 DATA_PRINTER_H

diff --git a/ui/qt/utils/field_information.cpp b/ui/qt/utils/field_information.cpp
index 5a919627b06ac1113321d64a0d84f29f42252167..d671106cf7a5da45473dcc4a90fb34e5246ca767 100644 (file)
--- a/ui/qt/utils/field_information.cpp
+++ b/ui/qt/utils/field_information.cpp
@@ -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
  */
 
 #include <stdint.h>

diff --git a/ui/qt/utils/field_information.h b/ui/qt/utils/field_information.h
index a9284966b991a2ab8829a6716029710ec2c8c558..e021b4ad1be38cd65c0bdaaa06aac4d8762efb69 100644 (file)
--- a/ui/qt/utils/field_information.h
+++ b/ui/qt/utils/field_information.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 FIELD_INFORMATION_H_

diff --git a/ui/qt/utils/frame_information.cpp b/ui/qt/utils/frame_information.cpp
index a9f6786ca35f244643e0b15d8195f960a9e96126..b3e6b12dfe6edd4d81c1820d8b726eaf78704e88 100644 (file)
--- a/ui/qt/utils/frame_information.cpp
+++ b/ui/qt/utils/frame_information.cpp
@@ -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*/
 
 #include <epan/epan_dissect.h>
 #include "epan/epan.h"

diff --git a/ui/qt/utils/frame_information.h b/ui/qt/utils/frame_information.h
index 36b05aa55efd8634ed8acb61428b77d5a60b19e6..58ebebe2215ae5b6888cbf40d890faf9b7f0a361 100644 (file)
--- a/ui/qt/utils/frame_information.h
+++ b/ui/qt/utils/frame_information.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 FRAME_INFORMATION_H_
 #define FRAME_INFORMATION_H_

diff --git a/ui/qt/utils/idata_printable.h b/ui/qt/utils/idata_printable.h
index 369847f7c1db0d72ca32efab82a0f933fd84d82c..0e2e6181f2bf07a1304fdb965fd0d2901b9b7034 100644 (file)
--- a/ui/qt/utils/idata_printable.h
+++ b/ui/qt/utils/idata_printable.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 IDATA_PRINTABLE_H

diff --git a/ui/qt/utils/proto_node.cpp b/ui/qt/utils/proto_node.cpp
index 03a9b91162f11419299cbd9eea248aac9809bf2f..dd15a41846c7d5b05f4617188f3ef244094c6ad6 100644 (file)
--- a/ui/qt/utils/proto_node.cpp
+++ b/ui/qt/utils/proto_node.cpp
@@ -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
  */
 
 #include <ui/qt/utils/proto_node.h>

diff --git a/ui/qt/utils/proto_node.h b/ui/qt/utils/proto_node.h
index 044dbf7e07a787cf772fc228dc57cbb3fcf2b32b..b76d9ee3d9d28ed3f03dc12dc53e702a03667625 100644 (file)
--- a/ui/qt/utils/proto_node.h
+++ b/ui/qt/utils/proto_node.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 PROTO_NODE_H_

diff --git a/ui/qt/utils/qt_ui_utils.cpp b/ui/qt/utils/qt_ui_utils.cpp
index 84a33eaf74e3d49c4b131b911025ab0fc1bd6519..13553e96c5b4e7fedd15cf6c0c4b214d5e8a463a 100644 (file)
--- a/ui/qt/utils/qt_ui_utils.cpp
+++ b/ui/qt/utils/qt_ui_utils.cpp
@@ -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*/
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/ui/qt/utils/qt_ui_utils.h b/ui/qt/utils/qt_ui_utils.h
index e0cbd22342926f2a3af62577138212c4351c5ff8..650e08558f1349b0a8db88b5bf6962b8eaef12ff 100644 (file)
--- a/ui/qt/utils/qt_ui_utils.h
+++ b/ui/qt/utils/qt_ui_utils.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 __QT_UI_UTILS_H__
 #define __QT_UI_UTILS_H__

diff --git a/ui/qt/utils/stock_icon.cpp b/ui/qt/utils/stock_icon.cpp
index 82545f9f9bd4fb3dd981a416064cb943ca771500..ced54b23cd442b7fb1cfac86e6175b2efa21666b 100644 (file)
--- a/ui/qt/utils/stock_icon.cpp
+++ b/ui/qt/utils/stock_icon.cpp
@@ -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*/
 
 #include <ui/qt/utils/stock_icon.h>
 

diff --git a/ui/qt/utils/stock_icon.h b/ui/qt/utils/stock_icon.h
index 7b8b827ed16ac22509a7004c2035e377bb52ba32..df8b936675c24b8bb3767160bbf8aa3ad0cd9ec5 100644 (file)
--- a/ui/qt/utils/stock_icon.h
+++ b/ui/qt/utils/stock_icon.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 STOCK_ICON_H
 #define STOCK_ICON_H

diff --git a/ui/qt/utils/tango_colors.h b/ui/qt/utils/tango_colors.h
index 954acd93d54517ab4353bd1780f3421f6115e0a7..c73861d2f68695a682c721c90b0e7038a71433a8 100644 (file)
--- a/ui/qt/utils/tango_colors.h
+++ b/ui/qt/utils/tango_colors.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 __TANGO_COLORS_H__
 #define __TANGO_COLORS_H__

diff --git a/ui/qt/utils/variant_pointer.h b/ui/qt/utils/variant_pointer.h
index 9458398c93261722dab0efb47cfa1a5b92ced9a5..4edd65beba93427f8250e6701ee0d7fb5c69f7ec 100644 (file)
--- a/ui/qt/utils/variant_pointer.h
+++ b/ui/qt/utils/variant_pointer.h
@@ -8,7 +8,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 UI_QT_VARIANT_POINTER_H_
 #define UI_QT_VARIANT_POINTER_H_

diff --git a/ui/qt/utils/wireshark_mime_data.cpp b/ui/qt/utils/wireshark_mime_data.cpp
index 6d53ab402b58f927ea34fb079472e160b7ddc98d..bde1f323185e1f3996cedb28709f60129d95b1e9 100644 (file)
--- a/ui/qt/utils/wireshark_mime_data.cpp
+++ b/ui/qt/utils/wireshark_mime_data.cpp
@@ -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*/
 
 #include <utils/wireshark_mime_data.h>
 

diff --git a/ui/qt/utils/wireshark_mime_data.h b/ui/qt/utils/wireshark_mime_data.h
index 6ee6c56b841f348a3c8d430912f6620c25ede838..3f798c2c5b70e402fcb78afe6b20468a30b0f185 100644 (file)
--- a/ui/qt/utils/wireshark_mime_data.h
+++ b/ui/qt/utils/wireshark_mime_data.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 UI_QT_UTILS_WIRESHARK_MIME_DATA_H_
 #define UI_QT_UTILS_WIRESHARK_MIME_DATA_H_

diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp
index d96bad45ae2e477b750539462a739ce5d0883c0c..e3d7f427e86420ec7f89068fc125534b3ce77c4e 100644 (file)
--- a/ui/qt/voip_calls_dialog.cpp
+++ b/ui/qt/voip_calls_dialog.cpp
@@ -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*/
 
 #include "voip_calls_dialog.h"
 #include <ui_voip_calls_dialog.h>

diff --git a/ui/qt/voip_calls_dialog.h b/ui/qt/voip_calls_dialog.h
index 03e515940eacf7b5c0a6e5e06eb3229a9eefa56c..9a2c8a96f924827685bab4b03ccdb32e7566d949 100644 (file)
--- a/ui/qt/voip_calls_dialog.h
+++ b/ui/qt/voip_calls_dialog.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 VOIP_CALLS_DIALOG_H
 #define VOIP_CALLS_DIALOG_H

diff --git a/ui/qt/widgets/additional_toolbar.cpp b/ui/qt/widgets/additional_toolbar.cpp
index c77edeb71a9c3170701db8204c30f2d037b91259..20f3891059a326dc3d6fbb8fbf392e157d8a00ce 100644 (file)
--- a/ui/qt/widgets/additional_toolbar.cpp
+++ b/ui/qt/widgets/additional_toolbar.cpp
@@ -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*/
 
 #include <config.h>
 

diff --git a/ui/qt/widgets/additional_toolbar.h b/ui/qt/widgets/additional_toolbar.h
index ab1fed8dc2359cad59212ce8733729b093d2de15..48ed51870b1e1b50dff8bd01c86c01144c32f061 100644 (file)
--- a/ui/qt/widgets/additional_toolbar.h
+++ b/ui/qt/widgets/additional_toolbar.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 UI_QT_ADDITIONAL_TOOLBAR_H_
 #define UI_QT_ADDITIONAL_TOOLBAR_H_

diff --git a/ui/qt/widgets/apply_line_edit.cpp b/ui/qt/widgets/apply_line_edit.cpp
index 847eac77a37cb48d030dac15343a480dc91d7a4b..d28bf85e4623ef9ec258a81d2f3444ebfb9bf630 100644 (file)
--- a/ui/qt/widgets/apply_line_edit.cpp
+++ b/ui/qt/widgets/apply_line_edit.cpp
@@ -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*/
 
 #include <ui/qt/widgets/apply_line_edit.h>
 

diff --git a/ui/qt/widgets/apply_line_edit.h b/ui/qt/widgets/apply_line_edit.h
index 44ed90368aed3d75e9dac311ef464486354f5bce..17275d098ac6275a0363989bea56993e7f461a06 100644 (file)
--- a/ui/qt/widgets/apply_line_edit.h
+++ b/ui/qt/widgets/apply_line_edit.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 UI_QT_APPLY_LINE_EDIT_H_
 #define UI_QT_APPLY_LINE_EDIT_H_

diff --git a/ui/qt/widgets/byte_view_text.cpp b/ui/qt/widgets/byte_view_text.cpp
index cd6eada7f2cd5c93016b63bff5d7c4e092db9468..2a758d14e2e55d86b98505524d093dfe69fd553a 100644 (file)
--- a/ui/qt/widgets/byte_view_text.cpp
+++ b/ui/qt/widgets/byte_view_text.cpp
@@ -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
  */
 
 #include "byte_view_text.h"

diff --git a/ui/qt/widgets/byte_view_text.h b/ui/qt/widgets/byte_view_text.h
index 7b9d5e2a4249982e7f68510193c0a508f41d8cff..071601996e50fe3394490ca30be016146e2a57b7 100644 (file)
--- a/ui/qt/widgets/byte_view_text.h
+++ b/ui/qt/widgets/byte_view_text.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 BYTE_VIEW_TEXT_H

diff --git a/ui/qt/widgets/capture_filter_combo.cpp b/ui/qt/widgets/capture_filter_combo.cpp
index 39610fb205936f9e599dc28dda1cd28637932442..f62652604cabd4262a1903932525e2f2734a8dc3 100644 (file)
--- a/ui/qt/widgets/capture_filter_combo.cpp
+++ b/ui/qt/widgets/capture_filter_combo.cpp
@@ -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*/
 
 #include <stdio.h>
 

diff --git a/ui/qt/widgets/capture_filter_combo.h b/ui/qt/widgets/capture_filter_combo.h
index 7d0a585d79fb4b5e8a6ee4e8904b3ffd8e1fc2fd..930c8e8de94a6878bfdd5cbf540c9d4c4b4c02ef 100644 (file)
--- a/ui/qt/widgets/capture_filter_combo.h
+++ b/ui/qt/widgets/capture_filter_combo.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 CAPTURE_FILTER_COMBO_H
 #define CAPTURE_FILTER_COMBO_H

diff --git a/ui/qt/widgets/capture_filter_edit.cpp b/ui/qt/widgets/capture_filter_edit.cpp
index 279bb66d42e0d4ff126bd7c68144d8a571ee628e..7ad7d5d3009a939d0db3946667b94d9a88166760 100644 (file)
--- a/ui/qt/widgets/capture_filter_edit.cpp
+++ b/ui/qt/widgets/capture_filter_edit.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/widgets/capture_filter_edit.h b/ui/qt/widgets/capture_filter_edit.h
index 3849002247b451b44145cdeb7a567c2b551b64b7..8b142e11015885d2f240dd057213d92fd496e737 100644 (file)
--- a/ui/qt/widgets/capture_filter_edit.h
+++ b/ui/qt/widgets/capture_filter_edit.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 CAPTURE_FILTER_EDIT_H
 #define CAPTURE_FILTER_EDIT_H

diff --git a/ui/qt/widgets/clickable_label.cpp b/ui/qt/widgets/clickable_label.cpp
index 4ddaf498b0d03f9555d30084b9c6f39e080b1909..1b7ca025378b3d81006061eb440c710ccba2b81a 100644 (file)
--- a/ui/qt/widgets/clickable_label.cpp
+++ b/ui/qt/widgets/clickable_label.cpp
@@ -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
  */
 
 #include <ui/qt/widgets/clickable_label.h>

diff --git a/ui/qt/widgets/clickable_label.h b/ui/qt/widgets/clickable_label.h
index dec5ebfec1f1969f41f1c8bdb8232e1814e14bb7..1e2445ba068fade4537ee06b87e8252ef9f768ad 100644 (file)
--- a/ui/qt/widgets/clickable_label.h
+++ b/ui/qt/widgets/clickable_label.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 CLICKABLE_LABEL_H_

diff --git a/ui/qt/widgets/display_filter_combo.cpp b/ui/qt/widgets/display_filter_combo.cpp
index bc07bb11d9f6c0929aaf65b2d5ff1892af4f1fec..f973b586f45c9066b45cc618b4a4de02495edfc7 100644 (file)
--- a/ui/qt/widgets/display_filter_combo.cpp
+++ b/ui/qt/widgets/display_filter_combo.cpp
@@ -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*/
 
 #include <stdio.h>
 

diff --git a/ui/qt/widgets/display_filter_combo.h b/ui/qt/widgets/display_filter_combo.h
index 691fb6f5699d6ba7153a8958c93ee7905b84fe17..3c3fad2fa9f3cd1135a65e4cd91008fd2ba55024 100644 (file)
--- a/ui/qt/widgets/display_filter_combo.h
+++ b/ui/qt/widgets/display_filter_combo.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 DISPLAY_FILTER_COMBO_H
 #define DISPLAY_FILTER_COMBO_H

diff --git a/ui/qt/widgets/display_filter_edit.cpp b/ui/qt/widgets/display_filter_edit.cpp
index 46f832d8dc050f68ac6605453955606d47e37188..e1cd6237f33e6d8828c4e41ee4b224d60e19f621 100644 (file)
--- a/ui/qt/widgets/display_filter_edit.cpp
+++ b/ui/qt/widgets/display_filter_edit.cpp
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/qt/widgets/display_filter_edit.h b/ui/qt/widgets/display_filter_edit.h
index 447d9696718fa1b79128a156d9add1aa5122ee15..72eb8cfecad94e8482072be7aef8713bdc106110 100644 (file)
--- a/ui/qt/widgets/display_filter_edit.h
+++ b/ui/qt/widgets/display_filter_edit.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 DISPLAYFILTEREDIT_H

diff --git a/ui/qt/widgets/dissector_tables_view.cpp b/ui/qt/widgets/dissector_tables_view.cpp
index c3b383b0f01e5cac1d4f423d8ccb21ba4818a3d6..1586efe60b17805d4bbe315abd9ef6b0d0355a77 100644 (file)
--- a/ui/qt/widgets/dissector_tables_view.cpp
+++ b/ui/qt/widgets/dissector_tables_view.cpp
@@ -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
  */
 
 #include "dissector_tables_view.h"

diff --git a/ui/qt/widgets/dissector_tables_view.h b/ui/qt/widgets/dissector_tables_view.h
index 446268a0c2070144f30f79282f86d9c8b2291bee..46d4dd2e1d5b7fa0f90c1b295d00f55b250abf28 100644 (file)
--- a/ui/qt/widgets/dissector_tables_view.h
+++ b/ui/qt/widgets/dissector_tables_view.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 DISSECTOR_TABLES_VIEW_H

diff --git a/ui/qt/widgets/drag_drop_toolbar.cpp b/ui/qt/widgets/drag_drop_toolbar.cpp
index 726c38a931b061be4ff97d53f44581ec79828366..5916be4a9e6481726e1865fe3176a48fe4c91c10 100644 (file)
--- a/ui/qt/widgets/drag_drop_toolbar.cpp
+++ b/ui/qt/widgets/drag_drop_toolbar.cpp
@@ -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*/
 
 #include <ui/qt/widgets/drag_drop_toolbar.h>
 #include <ui/qt/widgets/drag_label.h>

diff --git a/ui/qt/widgets/drag_drop_toolbar.h b/ui/qt/widgets/drag_drop_toolbar.h
index fca6c7276593d50cc132345d01620eb32e972f3d..bddf8c4bdc11db79f0fc99663ed694c360292aee 100644 (file)
--- a/ui/qt/widgets/drag_drop_toolbar.h
+++ b/ui/qt/widgets/drag_drop_toolbar.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 DRAG_DROP_TOOLBAR_H
 #define DRAG_DROP_TOOLBAR_H

diff --git a/ui/qt/widgets/drag_label.cpp b/ui/qt/widgets/drag_label.cpp
index 2469462ae2f273d00f344ebb8f4b7494544ab1fa..40a3d2d5cc5bba63aa3646591576f39431ed75df 100644 (file)
--- a/ui/qt/widgets/drag_label.cpp
+++ b/ui/qt/widgets/drag_label.cpp
@@ -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*/
 
 #include <ui/qt/widgets/drag_label.h>
 

diff --git a/ui/qt/widgets/drag_label.h b/ui/qt/widgets/drag_label.h
index 18ec0e66540032ae8bce18302f1afee3494a5002..6c7f8f0d5d8dc8f3f0a604c76934230dd1b83a5e 100644 (file)
--- a/ui/qt/widgets/drag_label.h
+++ b/ui/qt/widgets/drag_label.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 UI_QT_WIDGETS_DRAG_LABEL_H_
 #define UI_QT_WIDGETS_DRAG_LABEL_H_

diff --git a/ui/qt/widgets/editor_color_dialog.cpp b/ui/qt/widgets/editor_color_dialog.cpp
index e324d56faa2c17959dea7536231d860e1c586882..a85fb9c5fc1578a43440dc1fadd9b3679d0f0b67 100644 (file)
--- a/ui/qt/widgets/editor_color_dialog.cpp
+++ b/ui/qt/widgets/editor_color_dialog.cpp
@@ -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*/
 
 #include <ui/qt/widgets/editor_color_dialog.h>
 

diff --git a/ui/qt/widgets/editor_color_dialog.h b/ui/qt/widgets/editor_color_dialog.h
index 29c143aca695970eafe4991ceb302e3bd15a47dd..5bc42955cadf215ebbb4f0b28c0ccdf4e526338c 100644 (file)
--- a/ui/qt/widgets/editor_color_dialog.h
+++ b/ui/qt/widgets/editor_color_dialog.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 EDITOR_COLOR_DIALOG_H_
 #define EDITOR_COLOR_DIALOG_H_

diff --git a/ui/qt/widgets/editor_file_dialog.cpp b/ui/qt/widgets/editor_file_dialog.cpp
index 89bb040c3534d82335eed0dd048b15595d5fb375..486dcc419c8b57e7cd90e83095fdfeec1c49f258 100644 (file)
--- a/ui/qt/widgets/editor_file_dialog.cpp
+++ b/ui/qt/widgets/editor_file_dialog.cpp
@@ -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*/
 
 #include <ui/qt/widgets/editor_file_dialog.h>
 

diff --git a/ui/qt/widgets/editor_file_dialog.h b/ui/qt/widgets/editor_file_dialog.h
index 15356b236e83cef59fc662ac341645690c8ddc7b..20ad4bba2357854e7ba201b964cede6800522a12 100644 (file)
--- a/ui/qt/widgets/editor_file_dialog.h
+++ b/ui/qt/widgets/editor_file_dialog.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 EDITOR_FILE_DIALOG_H_
 #define EDITOR_FILE_DIALOG_H_

diff --git a/ui/qt/widgets/elided_label.cpp b/ui/qt/widgets/elided_label.cpp
index 2319b24e4774927ef05671313eab07403b802390..286d5a5e45496ae73fb089e2dbde08f2fb6ad438 100644 (file)
--- a/ui/qt/widgets/elided_label.cpp
+++ b/ui/qt/widgets/elided_label.cpp
@@ -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*/
 
 #include <ui/qt/widgets/elided_label.h>
 

diff --git a/ui/qt/widgets/elided_label.h b/ui/qt/widgets/elided_label.h
index 1ff8ad7a67a15b0a93ead790a613e63fc30e1611..c076cd978567b4237abedfbec9ec16a967d1469a 100644 (file)
--- a/ui/qt/widgets/elided_label.h
+++ b/ui/qt/widgets/elided_label.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 ELIDED_LABEL_H
 #define ELIDED_LABEL_H

diff --git a/ui/qt/widgets/expert_info_view.cpp b/ui/qt/widgets/expert_info_view.cpp
index 1436ee23a4dc728b74bd8f95937b211649dee42a..fc0ab7587f3882b1d3a17ca67ef2ae7315800454 100644 (file)
--- a/ui/qt/widgets/expert_info_view.cpp
+++ b/ui/qt/widgets/expert_info_view.cpp
@@ -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
  */
 
 #include "expert_info_view.h"

diff --git a/ui/qt/widgets/expert_info_view.h b/ui/qt/widgets/expert_info_view.h
index 7662cf330d9a62f12a2c2a1531be7c3138b60561..5f796ab438e176b6dd91ef07796450bbe6a9a47a 100644 (file)
--- a/ui/qt/widgets/expert_info_view.h
+++ b/ui/qt/widgets/expert_info_view.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 EXPERT_INFO_VIEW_H

diff --git a/ui/qt/widgets/export_objects_view.cpp b/ui/qt/widgets/export_objects_view.cpp
index 4fa350f3188c2b36df4666bede61ae70b3406508..d426755228f48c66f46a3c172dcac481d4a01a57 100644 (file)
--- a/ui/qt/widgets/export_objects_view.cpp
+++ b/ui/qt/widgets/export_objects_view.cpp
@@ -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
  */
 
 #include "export_objects_view.h"

diff --git a/ui/qt/widgets/export_objects_view.h b/ui/qt/widgets/export_objects_view.h
index 6caa1bf4f2b09b66491fad0f34abed01f3185638..711321bfde90917bf00906cb52b1dde224be8996 100644 (file)
--- a/ui/qt/widgets/export_objects_view.h
+++ b/ui/qt/widgets/export_objects_view.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 EXPORT_OBJECTS_VIEW_H

diff --git a/ui/qt/widgets/field_filter_edit.cpp b/ui/qt/widgets/field_filter_edit.cpp
index 797b2f4745a0db2c71ad11ca79e3c49bbe3cd008..d378289f43acb2972b3cdf723e916e5a85e523ac 100644 (file)
--- a/ui/qt/widgets/field_filter_edit.cpp
+++ b/ui/qt/widgets/field_filter_edit.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/widgets/field_filter_edit.h b/ui/qt/widgets/field_filter_edit.h
index e669c3043c05ca39e35711be843d5642b7081123..b5787a909eef39c034bf920291f63f197fb90e2b 100644 (file)
--- a/ui/qt/widgets/field_filter_edit.h
+++ b/ui/qt/widgets/field_filter_edit.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 FIELDFILTEREDIT_H
 #define FIELDFILTEREDIT_H

diff --git a/ui/qt/widgets/find_line_edit.cpp b/ui/qt/widgets/find_line_edit.cpp
index 8788fa5bd52f8365b1c42911060ab8d770f1057d..74acb930c82d0edc0e5420e095b6f3ffc673871f 100644 (file)
--- a/ui/qt/widgets/find_line_edit.cpp
+++ b/ui/qt/widgets/find_line_edit.cpp
@@ -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*/
 
 #include <ui/qt/widgets/find_line_edit.h>
 #include <ui/qt/utils/color_utils.h>

diff --git a/ui/qt/widgets/find_line_edit.h b/ui/qt/widgets/find_line_edit.h
index c9edc7e367775eb8a640556558d0e4328b774baa..269a1dbb23c8cb308ede182ca6da5eedd439fd1a 100644 (file)
--- a/ui/qt/widgets/find_line_edit.h
+++ b/ui/qt/widgets/find_line_edit.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 FIND_LINE_EDIT_H
 #define FIND_LINE_EDIT_H

diff --git a/ui/qt/widgets/follow_stream_text.cpp b/ui/qt/widgets/follow_stream_text.cpp
index 2fd782d91cd4efea9f144403a3eb26589f20685c..515a535c920255c06e6c1f14c59576a178d177cb 100644 (file)
--- a/ui/qt/widgets/follow_stream_text.cpp
+++ b/ui/qt/widgets/follow_stream_text.cpp
@@ -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*/
 
 #include <ui/qt/widgets/follow_stream_text.h>
 

diff --git a/ui/qt/widgets/follow_stream_text.h b/ui/qt/widgets/follow_stream_text.h
index eee211f703e4ee98c263fa2872270daf0faa2e18..9cfaae7de7b30d512ab65b8f8484402b207aa197 100644 (file)
--- a/ui/qt/widgets/follow_stream_text.h
+++ b/ui/qt/widgets/follow_stream_text.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 FOLLOW_STREAM_TEXT_H
 #define FOLLOW_STREAM_TEXT_H

diff --git a/ui/qt/widgets/interface_toolbar_lineedit.cpp b/ui/qt/widgets/interface_toolbar_lineedit.cpp
index 02f541ea11fb334c2e848e2013b91d5c25d9eb22..26be826ae85961f4c12f3d8e487cfc5868978350 100644 (file)
--- a/ui/qt/widgets/interface_toolbar_lineedit.cpp
+++ b/ui/qt/widgets/interface_toolbar_lineedit.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/widgets/interface_toolbar_lineedit.h b/ui/qt/widgets/interface_toolbar_lineedit.h
index 462dcd5620c2276c350283817af59dc8de43c07f..2d5f75cdb53f348cd89c30d3cdf903548a4e9b15 100644 (file)
--- a/ui/qt/widgets/interface_toolbar_lineedit.h
+++ b/ui/qt/widgets/interface_toolbar_lineedit.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 INTERFACE_TOOLBAR_LINEEDIT_H
 #define INTERFACE_TOOLBAR_LINEEDIT_H

diff --git a/ui/qt/widgets/label_stack.cpp b/ui/qt/widgets/label_stack.cpp
index 19d4a73725d6816ce872889ff1d3acf0887cb57a..212bed4825bb790a00e6ca2a31486588701e7c1f 100644 (file)
--- a/ui/qt/widgets/label_stack.cpp
+++ b/ui/qt/widgets/label_stack.cpp
@@ -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*/
 
 #include <ui/qt/widgets/label_stack.h>
 

diff --git a/ui/qt/widgets/label_stack.h b/ui/qt/widgets/label_stack.h
index c6d57d83e1619e9c650d628dda4f4e1292f9a71a..3b16d9ba57adbfbbc01b3554943e89f9fa5d750d 100644 (file)
--- a/ui/qt/widgets/label_stack.h
+++ b/ui/qt/widgets/label_stack.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 LABEL_STACK_H
 #define LABEL_STACK_H

diff --git a/ui/qt/widgets/overlay_scroll_bar.cpp b/ui/qt/widgets/overlay_scroll_bar.cpp
index e7b880be3bea2e8a78b16049831ad4d9a908a482..95b9e2de6937d05e844c2152d1221a74051f9fee 100644 (file)
--- a/ui/qt/widgets/overlay_scroll_bar.cpp
+++ b/ui/qt/widgets/overlay_scroll_bar.cpp
@@ -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*/
 
 #include <ui/qt/widgets/overlay_scroll_bar.h>
 

diff --git a/ui/qt/widgets/overlay_scroll_bar.h b/ui/qt/widgets/overlay_scroll_bar.h
index d31fe3b45e79ea5e5322b1248aa2d9e6542cafb3..a358d9f9589dccc7890460f1391eecc4eba2408a 100644 (file)
--- a/ui/qt/widgets/overlay_scroll_bar.h
+++ b/ui/qt/widgets/overlay_scroll_bar.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 __OVERLAY_SCROLL_BAR_H__
 #define __OVERLAY_SCROLL_BAR_H__

diff --git a/ui/qt/widgets/pref_module_view.cpp b/ui/qt/widgets/pref_module_view.cpp
index dd0b04bbd455af00a1a025e7cbf5d4e5d87a6b8c..bd86590f88aef5410d953a9a05d3a0538b712d42 100644 (file)
--- a/ui/qt/widgets/pref_module_view.cpp
+++ b/ui/qt/widgets/pref_module_view.cpp
@@ -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
  */
 
 #include "pref_module_view.h"

diff --git a/ui/qt/widgets/pref_module_view.h b/ui/qt/widgets/pref_module_view.h
index f88581117d1fcf0477a5edd39321710b9e11f05f..a769dc3f5a9bedd66537903fe4364b87f552af5a 100644 (file)
--- a/ui/qt/widgets/pref_module_view.h
+++ b/ui/qt/widgets/pref_module_view.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 PREFERENCE_MODULE_VIEW_H

diff --git a/ui/qt/widgets/range_syntax_lineedit.cpp b/ui/qt/widgets/range_syntax_lineedit.cpp
index 1175f592d1dd98bbd5678b1dc97105486de4d924..22f5106239de86466a76e7140159f5b9ecebc0b7 100644 (file)
--- a/ui/qt/widgets/range_syntax_lineedit.cpp
+++ b/ui/qt/widgets/range_syntax_lineedit.cpp
@@ -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
  */
 
 #include <ui/qt/widgets/range_syntax_lineedit.h>

diff --git a/ui/qt/widgets/range_syntax_lineedit.h b/ui/qt/widgets/range_syntax_lineedit.h
index 5b069d55d83bf17251410e7ac70abe1258dac485..a2bd49927e240c3a8d1fd1e9197d4b86f148576e 100644 (file)
--- a/ui/qt/widgets/range_syntax_lineedit.h
+++ b/ui/qt/widgets/range_syntax_lineedit.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 RANGE_SYNTAX_LINEEDIT_H

diff --git a/ui/qt/widgets/stock_icon_tool_button.cpp b/ui/qt/widgets/stock_icon_tool_button.cpp
index 0ecf990269192111b4caee0436c49f760642faff..1c06bd3593ecc6029227d3fdf4ccb9822ea9693a 100644 (file)
--- a/ui/qt/widgets/stock_icon_tool_button.cpp
+++ b/ui/qt/widgets/stock_icon_tool_button.cpp
@@ -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*/
 
 #include <ui/qt/widgets/stock_icon_tool_button.h>
 

diff --git a/ui/qt/widgets/stock_icon_tool_button.h b/ui/qt/widgets/stock_icon_tool_button.h
index 1b8eef0fe28a070bcfad12ba2318949c27112d71..15cbe51b28670c5345cdac0f93fcef6d4ee6b58f 100644 (file)
--- a/ui/qt/widgets/stock_icon_tool_button.h
+++ b/ui/qt/widgets/stock_icon_tool_button.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 STOCKICONTOOLBUTTON_H
 #define STOCKICONTOOLBUTTON_H

diff --git a/ui/qt/widgets/syntax_line_edit.cpp b/ui/qt/widgets/syntax_line_edit.cpp
index a86a3035e3fc140dde86f98f21248a5f45d1f2ce..c233d58c059a2531f879a518a8bfb75dfcbb4e76 100644 (file)
--- a/ui/qt/widgets/syntax_line_edit.cpp
+++ b/ui/qt/widgets/syntax_line_edit.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/widgets/syntax_line_edit.h b/ui/qt/widgets/syntax_line_edit.h
index 8b27e06d1744c2c5e50cc8fc68cd8058564cc321..9bce7508a928fde065a982fd19323f50713ecedd 100644 (file)
--- a/ui/qt/widgets/syntax_line_edit.h
+++ b/ui/qt/widgets/syntax_line_edit.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 SYNTAX_LINE_EDIT_H
 #define SYNTAX_LINE_EDIT_H

diff --git a/ui/qt/widgets/tabnav_tree_view.cpp b/ui/qt/widgets/tabnav_tree_view.cpp
index f8e6cf3a68e1fb1ccc8bf2c7708f5205ee6c1d3b..3b54426ab7afd05cd45a94dc22577b646e1951a8 100644 (file)
--- a/ui/qt/widgets/tabnav_tree_view.cpp
+++ b/ui/qt/widgets/tabnav_tree_view.cpp
@@ -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*/
 
 #include "tabnav_tree_view.h"
 

diff --git a/ui/qt/widgets/tabnav_tree_view.h b/ui/qt/widgets/tabnav_tree_view.h
index 6ba75a524538c2ced8d77fd3706e73da76e71087..ca92778be354a3fefa86b97f6047d00919441d65 100644 (file)
--- a/ui/qt/widgets/tabnav_tree_view.h
+++ b/ui/qt/widgets/tabnav_tree_view.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 TABNAV_TREE_VIEW_H
 #define TABNAV_TREE_VIEW_H

diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
index 75f3cc6e81146fc8f5322307ad3725593f111cfb..bd9076abcf4a5d7b6fd73d2bc0b63b4fff8c256a 100644 (file)
--- a/ui/qt/wireless_frame.cpp
+++ b/ui/qt/wireless_frame.cpp
@@ -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*/
 
 #include "wireless_frame.h"
 #include <ui_wireless_frame.h>

diff --git a/ui/qt/wireless_frame.h b/ui/qt/wireless_frame.h
index 243f45acf959203c4dde9d8d0f904a959564c98e..67057a335e3a722c28cbe3c74b25fd6e21d2c456 100644 (file)
--- a/ui/qt/wireless_frame.h
+++ b/ui/qt/wireless_frame.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 WIRELESS_FRAME_H
 #define WIRELESS_FRAME_H

diff --git a/ui/qt/wireless_timeline.cpp b/ui/qt/wireless_timeline.cpp
index 61843338f31b8b4cf5b9134cf5bf9dc24f230dcb..6ab1691db931f85c80ab868738be9a915eda3a38 100644 (file)
--- a/ui/qt/wireless_timeline.cpp
+++ b/ui/qt/wireless_timeline.cpp
@@ -8,7 +8,7 @@
  * Copyright 2012 Parc Inc and Samsung Electronics
  * Copyright 2015, 2016 & 2017 Cisco Inc
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "wireless_timeline.h"
 

diff --git a/ui/qt/wireless_timeline.h b/ui/qt/wireless_timeline.h
index 0003fd05372d3e7c1ff1d409afc03bffc18ed4eb..d5499d15018e7e59e15fbc332763e05ae2dde246 100644 (file)
--- a/ui/qt/wireless_timeline.h
+++ b/ui/qt/wireless_timeline.h
@@ -8,7 +8,7 @@
  * Copyright 2012 Parc Inc and Samsung Electronics
  * Copyright 2015, 2016 & 2017 Cisco Inc
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include <QScrollArea>
 

diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index e6ad3f473293d3c6d8da9d502ffcd4a06761d291..be905ea19b14541cca2b42498cd436a14d87ecc2 100644 (file)
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -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
  */
 
 // warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data

diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h
index c043edc00cdc504ef2a6fc883ae59aadbe2922f7..fa359b441e018515e3910689f47907d7bf2a33f9 100644 (file)
--- a/ui/qt/wireshark_application.h
+++ b/ui/qt/wireshark_application.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 WIRESHARK_APPLICATION_H

diff --git a/ui/qt/wireshark_dialog.cpp b/ui/qt/wireshark_dialog.cpp
index a0e82c8ffc84dc56ffe0b3d4d17a14d4a7d1d3ac..5ea9246824b6ae8a537e42f73637311d022da904 100644 (file)
--- a/ui/qt/wireshark_dialog.cpp
+++ b/ui/qt/wireshark_dialog.cpp
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/qt/wireshark_dialog.h b/ui/qt/wireshark_dialog.h
index be5a784281365656d25ff25f9248fe4cc19b0762..2e4a750a74898e871133232263c44d0eea4c5111 100644 (file)
--- a/ui/qt/wireshark_dialog.h
+++ b/ui/qt/wireshark_dialog.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 WIRESHARK_DIALOG_H
 #define WIRESHARK_DIALOG_H

diff --git a/ui/qt/wlan_statistics_dialog.cpp b/ui/qt/wlan_statistics_dialog.cpp
index df0e38b7c4a071c3cb0919333398a958863d6d5d..327d631974aff88ffeda29151f73cd8a798ee664 100644 (file)
--- a/ui/qt/wlan_statistics_dialog.cpp
+++ b/ui/qt/wlan_statistics_dialog.cpp
@@ -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*/
 
 #include "wlan_statistics_dialog.h"
 

diff --git a/ui/qt/wlan_statistics_dialog.h b/ui/qt/wlan_statistics_dialog.h
index f1d8079bed6c4a590f3b132f9e018983b06dc373..80f968ea11945a67168ae8259fd8f521eab13357 100644 (file)
--- a/ui/qt/wlan_statistics_dialog.h
+++ b/ui/qt/wlan_statistics_dialog.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 WLANSTATISTICSDIALOG_H
 #define WLANSTATISTICSDIALOG_H

diff --git a/ui/recent.c b/ui/recent.c
index 11a6f96008984d6daa429630b5674a6e69a9ff7e..9417d4e9223489c2279a49ba23eec87485b3c0ea 100644 (file)
--- a/ui/recent.c
+++ b/ui/recent.c
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/recent.h b/ui/recent.h
index 05cfd9077b45a43b8d92107931ab6cb0eafe147a..cfafcc63502efd9a9064e70b2b94d3b816f0ef42 100644 (file)
--- a/ui/recent.h
+++ b/ui/recent.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 __RECENT_H__

diff --git a/ui/recent_utils.h b/ui/recent_utils.h
index 01c939b16df4cfd69efae3084243915d7182d99e..8a943be14c778719a9c80122845768f913207502 100644 (file)
--- a/ui/recent_utils.h
+++ b/ui/recent_utils.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 __UI_RECENT_UTILS_H__
 #define __UI_RECENT_UTILS_H__

diff --git a/ui/rtp_media.c b/ui/rtp_media.c
index d16d50bca347d49147570174acb88943056d8ded..3a8c3a02be375bec89049ee706c4e80965c2c241 100644 (file)
--- a/ui/rtp_media.c
+++ b/ui/rtp_media.c
@@ -9,7 +9,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1999 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 

diff --git a/ui/rtp_media.h b/ui/rtp_media.h
index dc186325053fc1f0c60f5f345cf2329eed316e57..3842582336555032802865fff7c68d51d7e93ee1 100644 (file)
--- a/ui/rtp_media.h
+++ b/ui/rtp_media.h
@@ -9,7 +9,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1999 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __RTP_MEDIA_H__
 #define __RTP_MEDIA_H__

diff --git a/ui/rtp_stream.c b/ui/rtp_stream.c
index f17a77474fd443489d101d95f8664c2da41a00f6..8da569229bf18326520a0614ba00f41e45401c11 100644 (file)
--- a/ui/rtp_stream.c
+++ b/ui/rtp_stream.c
@@ -8,7 +8,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/ui/rtp_stream.h b/ui/rtp_stream.h
index bad4fbd0db6a60bb932910aefa9132578f72e441..28342a510fe6ad76e3fc0f30082929575aad78aa 100644 (file)
--- a/ui/rtp_stream.h
+++ b/ui/rtp_stream.h
@@ -8,7 +8,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 __RTP_STREAM_H__
 #define __RTP_STREAM_H__

diff --git a/ui/service_response_time.c b/ui/service_response_time.c
index 100fc34674e0f95d18f9096ac11ee1e1960488bb..80329e9de70d6181d49badd7b33a9c560245a00d 100644 (file)
--- a/ui/service_response_time.c
+++ b/ui/service_response_time.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*/
 
 #include "service_response_time.h"
 

diff --git a/ui/service_response_time.h b/ui/service_response_time.h
index 230c5a02b51cdaede88ececffdab1b669cc89070..c041e501a3df43ea5b0eb464473539696bdb92ed 100644 (file)
--- a/ui/service_response_time.h
+++ b/ui/service_response_time.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*/
 
 /** @file
  *  Helper routines common to all service response time statistics taps.

diff --git a/ui/simple_dialog.h b/ui/simple_dialog.h
index 218c2c34a6da73c96efac9d9ad5057277783a783..53c1c52975f0620102041e86bb0071588e578142 100644 (file)
--- a/ui/simple_dialog.h
+++ b/ui/simple_dialog.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 __SIMPLE_DIALOG_UI_H__
 #define __SIMPLE_DIALOG_UI_H__

diff --git a/ui/software_update.c b/ui/software_update.c
index 2cc90c3ee10c633a4c657760ff41d67b04832872..9253a0d6b49cad23aac823bb917eac4c2e6ee98f 100644 (file)
--- a/ui/software_update.c
+++ b/ui/software_update.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/software_update.h b/ui/software_update.h
index cb817f62825b80e42b0b3eae9b06952842e4269f..0902e6cae080dd9c6c8244e63be5b5c73c54a188 100644 (file)
--- a/ui/software_update.h
+++ b/ui/software_update.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 __SOFTWARE_UPDATE_H__
 #define __SOFTWARE_UPDATE_H__

diff --git a/ui/ssl_key_export.c b/ui/ssl_key_export.c
index 54883ba47e8cd638c7eebc14f18d75057bf17cc0..d253eee128bae938f44eb2faf1406a4bd2809580 100644 (file)
--- a/ui/ssl_key_export.c
+++ b/ui/ssl_key_export.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*/
 
 #include "config.h"
 

diff --git a/ui/ssl_key_export.h b/ui/ssl_key_export.h
index 54a17a51efd68b3b744205036d83be1f4a43b965..3d7369e47b9e423b3738d4f77ec0697806f026a7 100644 (file)
--- a/ui/ssl_key_export.h
+++ b/ui/ssl_key_export.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 __SSL_KEY_EXPORT_H__
 #define __SSL_KEY_EXPORT_H__

diff --git a/ui/summary.c b/ui/summary.c
index 039f4ff870225d927facb35ce801713f81afa053..6725a2d6082e499473efae6ebd16aa75563c16fc 100644 (file)
--- a/ui/summary.c
+++ b/ui/summary.c
@@ -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
  */
 
 #include <config.h>

diff --git a/ui/summary.h b/ui/summary.h
index e4cbbcdc8271cf8ff12d2a8faaaf2d8a9c72c95c..c2af42b1821cffe8813c4d287530a9a5eff94c56 100644 (file)
--- a/ui/summary.h
+++ b/ui/summary.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 __SUMMARY_H__

diff --git a/ui/tap-iax2-analysis.c b/ui/tap-iax2-analysis.c
index ec1e93695ba643021757b8e41232a83db493891f..1eab3790a1e45df093c98ca8f1ffabc9f9373711 100644 (file)
--- a/ui/tap-iax2-analysis.c
+++ b/ui/tap-iax2-analysis.c
@@ -13,7 +13,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/ui/tap-iax2-analysis.h b/ui/tap-iax2-analysis.h
index 2246a47aefdc308733c9001b564d7fcf0a524656..04ab172afad9905323738c0b7c6cf48413dce0bc 100644 (file)
--- a/ui/tap-iax2-analysis.h
+++ b/ui/tap-iax2-analysis.h
@@ -13,7 +13,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 __TAP_IAX2_ANALYSIS_H__
 #define __TAP_IAX2_ANALYSIS_H__

diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c
index 93a494a8977fc7c34b86e882b21f34b24433b9ae..5be215d318aab1281e8fbdcd9a29aac378f6256b 100644 (file)
--- a/ui/tap-rlc-graph.c
+++ b/ui/tap-rlc-graph.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*/
 
 #include "config.h"
 

diff --git a/ui/tap-rlc-graph.h b/ui/tap-rlc-graph.h
index 1dcf49274d423da54d375daa3a4f3af94b8b4761..8dfdc247dbd4526d6c037e1211b1c14d5e11dd66 100644 (file)
--- a/ui/tap-rlc-graph.h
+++ b/ui/tap-rlc-graph.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 __TAP_RLC_GRAPH_H__
 #define __TAP_RLC_GRAPH_H__

diff --git a/ui/tap-rtp-analysis.h b/ui/tap-rtp-analysis.h
index 937ab9e1dbc596cc74de1a63569097bb681cf9f0..23f68e824a700da923abecd61894488865158d93 100644 (file)
--- a/ui/tap-rtp-analysis.h
+++ b/ui/tap-rtp-analysis.h
@@ -12,7 +12,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 __TAP_RTP_ANALYSIS_H__
 #define __TAP_RTP_ANALYSIS_H__

diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c
index 2fd78d70b977bf897208fbc92f3b533ec48882f3..b8d7c4e3352f030afcb394e2de6b6b8b7b486753 100644 (file)
--- a/ui/tap-rtp-common.c
+++ b/ui/tap-rtp-common.c
@@ -12,7 +12,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/ui/tap-rtp-common.h b/ui/tap-rtp-common.h
index 5fbcbd9dce801ec40e7bd772ed366b235058c0d1..1f559bf73979bc5e8a761fad33713db1a96cc73a 100644 (file)
--- a/ui/tap-rtp-common.h
+++ b/ui/tap-rtp-common.h
@@ -12,7 +12,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 __TAP_RTP_COMMON_H__

diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c
index 41f78139dfc398493743398bdeeadf1763b10fdd..4b799ecfba1930fb5d4bcc029b6355339d23cef3 100644 (file)
--- a/ui/tap-sctp-analysis.c
+++ b/ui/tap-sctp-analysis.c
@@ -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
  */
 
 #include "config.h"

diff --git a/ui/tap-sctp-analysis.h b/ui/tap-sctp-analysis.h
index d9f04a3982043e5939e5a46e84d51dc35ba97c82..5d2f37a2969222bc1a7665daf4b6c889cf1e824c 100644 (file)
--- a/ui/tap-sctp-analysis.h
+++ b/ui/tap-sctp-analysis.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 __TAP_SCTP_ANALYSIS_H__

diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c
index e87f64872b9ac0c5a03cada648f7c0d9ff7e8a4b..a91ad14836819b7747806d329578be611ad70fd8 100644 (file)
--- a/ui/tap-tcp-stream.c
+++ b/ui/tap-tcp-stream.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*/
 
 #include "config.h"
 

diff --git a/ui/tap-tcp-stream.h b/ui/tap-tcp-stream.h
index 69e584fca53c783bbd024af957bf099f503075b8..a0320175c079dbb82f4f6a7dd3fe099f0e4c4bfe 100644 (file)
--- a/ui/tap-tcp-stream.h
+++ b/ui/tap-tcp-stream.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 __TAP_TCP_STREAM_H__
 #define __TAP_TCP_STREAM_H__

diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c
index 53b1e7de65112b151b3c10c37875c27a1e34ecee..b58747c24fba45fced63398915a8da40617197b8 100644 (file)
--- a/ui/tap_export_pdu.c
+++ b/ui/tap_export_pdu.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/tap_export_pdu.h b/ui/tap_export_pdu.h
index d5adb2588776ecff019bfb6d2e275e030c2a6da9..883ed479cac075220fdf90bf65e013a3d5eeae91 100644 (file)
--- a/ui/tap_export_pdu.h
+++ b/ui/tap_export_pdu.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 __TAP_EXPORT_PDU_H__
 #define __TAP_EXPORT_PDU_H__

diff --git a/ui/taps.h b/ui/taps.h
index 9faf44c61ebd495bf91356b5d1702d91ae0dfa52..771835443c8d07433c3180a1fce79fe81e2eed11 100644 (file)
--- a/ui/taps.h
+++ b/ui/taps.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 __TAP_REGISTER_H__

diff --git a/ui/text_import.c b/ui/text_import.c
index 4b5b7b002dc4360b729a4194ffc55103d357e6af..6a4c2e998dbca30b7f4b9012c170a3584fa4b81e 100644 (file)
--- a/ui/text_import.c
+++ b/ui/text_import.c
@@ -8,7 +8,7 @@
  *
  * Based on text2pcap.c by Ashok Narayanan <ashokn@cisco.com>
  *
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 /*******************************************************************************
  *

diff --git a/ui/text_import.h b/ui/text_import.h
index f516f9c38299e24ccacbe666a7033f3a735f63b5..a0a77fea7fa8d956dd5e44dbf3b5531ac7cea79f 100644 (file)
--- a/ui/text_import.h
+++ b/ui/text_import.h
@@ -9,7 +9,7 @@
  *
  * Based on text2pcap.h by Ashok Narayanan <ashokn@cisco.com>
  *
- * SPDX-License-Identifier: GPL-2.0+*
+ * SPDX-License-Identifier: GPL-2.0-or-later*
  *******************************************************************************/
 
 

diff --git a/ui/text_import_scanner.h b/ui/text_import_scanner.h
index 6d1d48c73dfc57e8753cb2ba017b613291ba8c58..f762ef304044c02e489b3595e3e78a6a76b31079 100644 (file)
--- a/ui/text_import_scanner.h
+++ b/ui/text_import_scanner.h
@@ -9,7 +9,7 @@
  *
  * Based on text2pcap.h by Ashok Narayanan <ashokn@cisco.com>
  *
- * SPDX-License-Identifier: GPL-2.0+*
+ * SPDX-License-Identifier: GPL-2.0-or-later*
  *******************************************************************************/
 
 

diff --git a/ui/time_shift.c b/ui/time_shift.c
index 446e7b6dcc347ddf6dd09da176d98bb392731967..e8edc978aadf7ea4938902e00c84ea4d225d9fdd 100644 (file)
--- a/ui/time_shift.c
+++ b/ui/time_shift.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/time_shift.h b/ui/time_shift.h
index ac8ff267967dadd66a1d417451e412a6090b89c2..b335d261c16f557fded5470de56c1b13c8454e1c 100644 (file)
--- a/ui/time_shift.h
+++ b/ui/time_shift.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 __TIME_SHIFT_H__
 #define __TIME_SHIFT_H__

diff --git a/ui/traffic_table_ui.c b/ui/traffic_table_ui.c
index 8baba471271aeb65b7900e8a1fa4ba789278f43f..106f30dd8592d3775bc40e60abc57a47a9748195 100644 (file)
--- a/ui/traffic_table_ui.c
+++ b/ui/traffic_table_ui.c
@@ -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*/
 #include "config.h"
 
 #include <glib.h>

diff --git a/ui/traffic_table_ui.h b/ui/traffic_table_ui.h
index eefa29fee41e51f81a67459869c70f176c1b95e1..4baab403bbbf9128744350de8782ded68e36b279 100644 (file)
--- a/ui/traffic_table_ui.h
+++ b/ui/traffic_table_ui.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 __CONVERSATION_UI_H__
 #define __CONVERSATION_UI_H__

diff --git a/ui/util.c b/ui/util.c
index 2008bfa9bb2f819277548c18dfd68eb02aa2d27d..9fe353a6b02fb783cf0fa74eb2c354ee49e467c4 100644 (file)
--- a/ui/util.c
+++ b/ui/util.c
@@ -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*/
 
 #include "config.h"
 

diff --git a/ui/util.h b/ui/util.h
index f73344edcc625352a68308a85fa5ead3c5c1a046..0940cacff0c02794f96566718cc64f3d0c094791 100644 (file)
--- a/ui/util.h
+++ b/ui/util.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 __UTIL_H__
 #define __UTIL_H__

diff --git a/ui/voip_calls.c b/ui/voip_calls.c
index f95f62bd1bfc4fd3888f08dab51b1f2d4e60a6ac..1eed2034b8e265e546f0db3ed1aba2b9b8e96b7f 100644 (file)
--- a/ui/voip_calls.c
+++ b/ui/voip_calls.c
@@ -16,7 +16,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/ui/voip_calls.h b/ui/voip_calls.h
index f0ab9ac7bd4e5e0b632f57e0ad7c864499c89161..15d7284f76c08057c7c3c5dd1e7349f8d68f6c13 100644 (file)
--- a/ui/voip_calls.h
+++ b/ui/voip_calls.h
@@ -16,7 +16,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 __VOIP_CALLS_H__
 #define __VOIP_CALLS_H__

diff --git a/ui/win32/console_win32.c b/ui/win32/console_win32.c
index 9392989d7ea20cab7b5d6462e128ed9d579ebd6f..609b5abfe377442444bda548b5feca0db5df1e81 100644 (file)
--- a/ui/win32/console_win32.c
+++ b/ui/win32/console_win32.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2002, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifdef _WIN32

diff --git a/ui/win32/console_win32.h b/ui/win32/console_win32.h
index de2a6fcd6c2df718813a7ad0d622a01787e2199e..7add4095c7db203d3e19e452a12bd643a4cc809e 100644 (file)
--- a/ui/win32/console_win32.h
+++ b/ui/win32/console_win32.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2002, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __CONSOLE_WIN32_H__

diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c
index 36dc90f249f9f317699a60aa31f4ba929d3ccd59..0e9803936b347314fd22ad760082791fe48725f1 100644 (file)
--- a/ui/win32/file_dlg_win32.c
+++ b/ui/win32/file_dlg_win32.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2004 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"

diff --git a/ui/win32/file_dlg_win32.h b/ui/win32/file_dlg_win32.h
index 57381e667702d87257910d6f780b135c8b965e05..10ced0e4be72c56fbea8eb5c46fd0559522ba65e 100644 (file)
--- a/ui/win32/file_dlg_win32.h
+++ b/ui/win32/file_dlg_win32.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2006 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __FILE_DLG_WIN32_H__

diff --git a/ui/win32/print_win32.c b/ui/win32/print_win32.c
index 7a495eaa523029f80c5513014162c6634174057a..3f889455f1bf2b070b4d4183922a3b5376e3bc1a 100644 (file)
--- a/ui/win32/print_win32.c
+++ b/ui/win32/print_win32.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2002, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * This original code was from the Technet Article Q139652 :
  * HOWTO: Print a Document

diff --git a/ui/win32/print_win32.h b/ui/win32/print_win32.h
index 4005ce47e18f54571f97612b2ca43fa8a513bb8c..cb14ca03f695c936ff37585762ed6e5b7e470ae0 100644 (file)
--- a/ui/win32/print_win32.h
+++ b/ui/win32/print_win32.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2002, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __PRINT_MSWIN_H__

diff --git a/ui/ws_ui_util.h b/ui/ws_ui_util.h
index b0bc8852343db9ff9b53caa1f365cb87bcf7998f..571c53c265e82a0f0f321e00ff488214331d28fa 100644 (file)
--- a/ui/ws_ui_util.h
+++ b/ui/ws_ui_util.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 __UI_UTIL_H__
 #define __UI_UTIL_H__

diff --git a/version_info.c b/version_info.c
index bf6122f6c4d49fd2731fa64028ee973840135f5b..37601cf7e7dd2d16504ed567b15586b8bd5c5a8c 100644 (file)
--- a/version_info.c
+++ b/version_info.c
@@ -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
  */
 
 #include <config.h>

diff --git a/version_info.h b/version_info.h
index 9305256cda83583f0b88355ea8f41ef6b219846f..e581b67c19254c326bdbab1dd6845420e8c8c243 100644 (file)
--- a/version_info.h
+++ b/version_info.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 __WS_VERSION_INFO_H__

diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index b78f7de5a05b860fc00e600cfe0e761c104425a8..c7c6e389bd57c645a56c5b6c687b41ab4291392b 100644 (file)
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -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
  */
 
 #include <config.h>

diff --git a/wiretap/5views.c b/wiretap/5views.c
index f47105977d21897fd7aaa06ba5a1b057ff8ca9bf..61e7bd78d349e94c6640e9565803a0b4165f7507 100644 (file)
--- 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 6fe3fe28fe7ce99ebc41826cbadcec3eb283fbef..395680f4ce3cdaec9d8b9f9dbb07ff4891c855e4 100644 (file)
--- 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 1d08ab4ff738f447d85346ec11e31ee0316f34d8..bfe02042a2b027ce70f92abd7fa9b075d857157c 100644 (file)
--- 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 73e82119990ad6aef0e13762029b94262d690f4d..26e880960096df472244c982fce57339901472dd 100644 (file)
--- 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 ea7d47cc9fbd13bcb3f03a13b1aad03d3a84fc8d..0b7af0e679f97058ec1e23369f9da5466e17e2a6 100644 (file)
--- 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 56f88b58de7da8e41b2da522820711bb12245f2b..0b527157b3e8caf1f7bd5444ae1eb143b5212365 100644 (file)
--- 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 cba58e779efde98137984624f0fa809998f9ada4..0fb90184da46a52742f696893f7f86886b29cf28 100644 (file)
--- 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 6792f87b0c762d03e8c1a4f0f8a3a9ef30a84098..94d905e57c181d28ad06e46a5bd678b266225d99 100644 (file)
--- 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 ad4b0866eebe26a28e2cebceedcbbdee91a6fb4a..607e87c6784434827147a5a033e1feed0162dfe6 100644 (file)
--- 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 c6fc13ee229773c188435d2a9e1be74ed6c5ad78..cd7d2955e8583af53d613f8217b7da150232651f 100644 (file)
--- 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 e84b08f3415afaa41a34df2ab978db8ab5107615..287fb2fbf1ddb3df23f1c7583e4f929507882eac 100644 (file)
--- 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 75525a1b7e96bd5d77e94458d9133a77234e4a2d..1d0e87abf5bcbb4429f41886bbb477b71756c497 100644 (file)
--- 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 9945a8fdbbd33d2e2dd740fcc9cfdb3dbc25f30b..2c9ca05f19c977a78e6668a2f4ece6bdc340535c 100644 (file)
--- 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 2c7fd89da7a9231d886addef0888036332b059ad..8bfb750e6c7e5f3f905764f60d3600c2c3aba2c2 100644 (file)
--- 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 cd1c2e2cd1479479e376ebd23df95fd4696dd229..e255d9b8239fe557dacc433dd55376926f8cbd42 100644 (file)
--- 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 0d1ce001f72a3ccd7c78b46ed2e93947ff33a5aa..1b3df7b48b4a268b32af9e80a126bd3b66e61774 100644 (file)
--- 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 f4423c658c689e009476793f67d83120ead8ed6d..d8b53b23e816141881668d2ad6f09db8602df76d 100644 (file)
--- 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 e69303229f30529cfb52b342bb0c7c0354bb0522..0ba9dc233f3866fe788d95aa159083dcd96ad77e 100644 (file)
--- 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 fcb64c63c2a6a27dcd79c426af61b29d810f7a23..30906868ac7b44e3f26dcf910e611857e6103ef1 100644 (file)
--- 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 3e609daf253594eaa7056de18846b3a20931b90a..81fdd908b343ac89a7ca04ea92139030e87d1d7c 100644 (file)
--- 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 9b3748311da2beb2308ba96cbf4df500d63e7fba..b30002224faf3b169c32e4cd43aae53e280d0535 100644 (file)
--- 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 e0b360e31099325322a463deacd5199a9fcb2af8..595b88979379abb7fe84fe6b9ba596e8e8fa3622 100644 (file)
--- 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 a7e4e1ecebdedd287e04db4d108dd3e80d8e0e78..c38df649717d724c32dab68c48645d2a8098503f 100644 (file)
--- 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 4ff91f06b3355f8444705d9208ab71a609bfcfaa..49bcb3a6db3266b2082a9b382a4c1d1e2c4c07e7 100644 (file)
--- 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 6e50e7b659211465411ae0477634e824c0dc7ab7..80fca644026f682b45ef6544128c178b481e81b2 100644 (file)
--- 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 80702cf74d7faad6b96e8538debbe7f063fdcdcd..e864161572133c2d39d0a17cdb219bf24033994d 100644 (file)
--- 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 6d06d2c40130ea6e7ad716fbc4572aa6be72fdef..365884ab63c69cf0a0a64abbe979423ae170e274 100644 (file)
--- 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 26cf289bd96f2ae9d82a1f7d040eaf5eb96e6b1c..853e3e4134a76a9e71f7375ee08e18a9d2f9effc 100644 (file)
--- 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 278e4acbd2738d3a681c496d8dca17680563a1c7..1e2621b1b1f41e652745815c6236368ba54b64e6 100644 (file)
--- 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 37ed2d797900b144fed466e9f97db5a2971c7398..8e33b7cf439788df18682d07473d5222f14717c4 100644 (file)
--- 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 7497d74f8f45e0364166bb670da290004cbaa19f..fcfd419a35fbcea67a1a0ed8553cddd8a612245b 100644 (file)
--- 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 478bb9a92d47625d92f594f3136e00a8b7e9d9bf..4996d15327cd778f329daf029008857a6c54c240 100644 (file)
--- 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 c0a26636e7dbdd011fcde85e7b78b308d70ed390..1c2b0c67efd29b8bf0c59869415f1e46d2def066 100644 (file)
--- 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 94570610479a396d31937f35d678e33864afe937..e2e92b596c35c77e1f77b7784366797aa4e262ee 100644 (file)
--- 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 ef89d72071255a316a953b300a1b3d4c7c3a3748..98c6b32a0f67d199065714622f60a4829a2e5b90 100644 (file)
--- 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 d96e0d4ba2a10b9c6d9ecff9041558d26e0beaaa..c45270b97150c5fa091c283de63be8c359812ec2 100644 (file)
--- 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 2aff050826592a9f8037186146843e2e1e21bb68..4f426a20ec265e0a60d2cb663e1734864dddc6a6 100644 (file)
--- 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 869b174386163ab61c9254bdbdfdae52fc969329..64e0b6b16645ddae41fdd40e90a9ca42fbbfa915 100644 (file)
--- 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 5813a89b9a780fe09e903d73c0cbceae0788920e..d0aad8f9f1c2f6f8939ac27348f257bbb6068ae1 100644 (file)
--- 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 f24cb8c78c545c80b1c5f83883e9dd578ed8316a..6d497303bbff74f9e31a498df6e747ab7de66359 100644 (file)
--- 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 893991351c6b089100c068a2ab7959542566b980..52d4faa8c39ab3dc9701fdf44962e006a3fe44ad 100644 (file)
--- 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 fdd728dd096aa6445bf498eb2232bd8b8004f920..450e227941bbf86811664465b35c68490ee1bb79 100644 (file)
--- 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 ff61cd2cf5686f86b460c212749f599cac2c804d..ffb7e866134237446a2d82007a35c49a18df3f80 100644 (file)
--- 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 c9fb9326c8054ca6bf431824984bec874b657264..55ecff76ba489b53e494e893aef7434be7597d10 100644 (file)
--- 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 efbb014013db00668bbf06cae21f44c072767c70..b8d9105b98ede0284015e06888f49a590e6add7d 100644 (file)
--- 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 0abcd8a0bfb7a9f229e99385cbf70bb9fd36119c..32d012060a24c9a589cc6abe4602dfe1d7bf8731 100644 (file)
--- 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 c07d4ed8e1bacfa59417ff88af5eddbf9ddad3e4..1e26400b92c59ad2e85fe8614c9e1c0bcef94a15 100644 (file)
--- 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 b69b298118165b8e609aa3cceb5da79d730c3987..4812e406fe16c3cc9067c412e57131576d3bbeb1 100644 (file)
--- 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 a84fdea9c64578ad5660da60f62e8060c1cbb94f..a61ef121a3671c2af871e453194d8e8cc64d1533 100644 (file)
--- 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 b757ab454f9549369b4d34efd9e80954072a1cae..0803ef0b737606cbeb6278dcf39fe7ea38b1b0f0 100644 (file)
--- 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 07d4d458a52a6d1589551aae11e39a7caa6b402f..784bb6734cc7a2475b58ca8f18ca70ab11b37066 100644 (file)
--- 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 8f3c1f2bc2dc2f160620ea06083ccb05e71e7a29..7b4f06ff64a8510b2c070c8ac804fcc880e9cd8a 100644 (file)
--- 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 2b41ac7f0205822131f147c123c8cba0a838faa4..4ffc849ba95f926c7e53d204526aef22ac8b173b 100644 (file)
--- 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 042dfd5dd7d2240c4c0a86606a5f0c398bef5b8f..12fd85f4bcc889672bbe6fcf66d2c4bc42f76acf 100644 (file)
--- 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 013139ee571fcb877fc438aba7b5f0a51e17a904..8be6e2b2b56b1377631c21b653f526c485ce6839 100644 (file)
--- 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 5ddd37ff4f7c5027595b8f5ccf04400ac6b4169e..77af997c1938068711170be3865acc81480d2fb6 100644 (file)
--- 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 48a647ea6d09dafb5894cf6f721cdf5a5eefff88..643e611f7369217a74c1c79b29ec1914a04417c4 100644 (file)
--- 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 7af15942ba134058fdf034162b9cc12278fd0f8e..9e7e88a9596e512b4980a85b8dec79b4ff0bfe8d 100644 (file)
--- 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 5ad283c332dc95153816152ebe95ef08a24ec5e1..cf79e18f4f7fa7a004c36008dee4450486a83e10 100644 (file)
--- 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 12925ef554afecc444eadea57641f09afae36988..c4a5022987b464b1ef25a2c79aa74b9238625899 100644 (file)
--- 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 bd85b7965af0cb9e75e6e13ed331a790373bde80..b7d9e53cdd4147b8ac15c6a6c429b798b57790a0 100644 (file)
--- 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 d6cf7be6159e70357963dfd9d5f42681b37c1482..7d12ff4bbf314f1f06e7e1e724dbfb7e2eba829a 100644 (file)
--- 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 20595006196d8d3538e76b059113c9e0f4f2358d..aafbd81104f9ae02a82735756e44014489c8c167 100644 (file)
--- 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 502bd1a91ae0b612d7fb6399a5cffb398dbdc917..d5133d92147f7648c8abb881a8b73a56f4dcdf97 100644 (file)
--- 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 6641fce073003cd5cc933ba3ab6848f6fb0acc76..ddc36f8dc922a8848c7fc1943fb285c75b087907 100644 (file)
--- 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 c6bf4e9a098ccc6bda5f96ee5b44fbec3e18e0cd..840fe34283ded0edb9b46dc9846234a59da51c76 100644 (file)
--- 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 a7d6869249f8987c28e198b2430b68ddf65fda77..39f625282a2b015d40a793cbbd13528d4eb2e4a2 100644 (file)
--- 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 da7ccc509cec6594aeb40549fc5df404166e69d7..a00e0fbab289d0ad07089c7f6a6d5572575ef998 100644 (file)
--- 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 fe107e7687bb7fac5e5e3749078615f7f2cd4ddc..76b7f1d000289e7c2e30c76cdb1b188294f5ef54 100644 (file)
--- 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 8ca5e3fc9caebb883dc8759731221c6fa8917fd7..0f63963332e55c28531b1321767c803dacbf2d99 100644 (file)
--- 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 e4c7743b81b1e847ae6f007475728030594736b3..13a57da37b1f83b8c6e24f1f03e67b2ff437539a 100644 (file)
--- 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 d9b258bd582cd50fd6e17cff0ff48f237a62b1a3..0359fcd12f9b2b9f6994fc81f332e564f05fcc6d 100644 (file)
--- 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 d179dcb41b5758c504f0c9723c6316a5190e8ea3..0f92909866adc28d3f8d42696bf40a74767ac8e5 100644 (file)
--- 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 7f9a4970181563188f00d403b1c431613a4ef65d..bf10ab6ce8fc18cd9f5903c5d79f1866d3ab543b 100644 (file)
--- 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 fb1d71db628cbe427b04fa8c31c566a63f3ffeaa..112457f19c002bbc1955a26218c6bb25c9746205 100644 (file)
--- 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 2bbd1258a799066eaf41a48c0e24fcf7e6c75dc8..e66297d2e91156ae44f4a46c3a8770c306814c65 100644 (file)
--- 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 1d815f6e193ffca05b1f23284347b6729b4f4aae..51c02ee0ce69c7ccb824bbe09c7f7c50cfad3648 100644 (file)
--- 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 e46c4c019817774987422238ecfcba7dd159f036..d8ba4be23bb0e032d0aa5f66d9b5ee42a1202dc0 100644 (file)
--- 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 0142e98de87c161677c2000294d7153c9f39a670..a48a5bc0e11eba773fc6dde0c93a08b30a249d31 100644 (file)
--- 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 2775ad97715bbb80259455b1c4452664884a832c..e9234758006b891e0e85b118b25b00e710c1635d 100644 (file)
--- 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 8e86ad8554f75d2c6e325d95a13c482b0707f601..bd07fbf38a6d6be9654bd857e755ee04b86c8ab6 100644 (file)
--- 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 0bc0994c1ed0089b14368b55f938342fd98ea479..baaf7533ea694a5e57948ae0bf8fa08410c96f1f 100644 (file)
--- 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 0d48a34910e0e36b0a996faec0568a27f504c84f..7163a88f0f3f16d86a0ea4caebeebb915bd32a31 100644 (file)
--- 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 d732f54eb0597b6320ec0faf5164ea29c1e33011..fa28d13dce2ac092e2c9263ebb063079a82d9cef 100644 (file)
--- 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 d70030b430b1e5a694c63215c3fc125282e355c4..9b5ad7dd1fc49f4e024549d4edebe02867791002 100644 (file)
--- 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 c8d8b80e3c94d1cde3c18e0d6e9b1a039489e495..e262f3ae0c535ab8b737cbfcd0babe136a38d035 100644 (file)
--- 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 19cf0b84765f46c8a1911e0279cc43bb7c59d18b..5d11fb0564948af7933090fc7e9680013c07aa9e 100644 (file)
--- 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 d99bdaf51433a48bc3296a58c7112388eaab8826..894c33fb4e83f97e7beebaa7a1e07572e7fddf91 100644 (file)
--- 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 ca4e3027ac8a8724aecf4b1d566c674fbf5169ae..c376d435bb6a4191cddf2c661ee8e7074ee5dc2a 100644 (file)
--- 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 03ecc3054fa32ad1db3dad62aaec0af16e82394d..d72ede29282303c58acc6c8d7a7d7ef3bda8c12e 100644 (file)
--- 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 8933e96fe3c6740009a105b9a29a5849777baf98..72398e8db336773537b936a569fce86c7433562e 100644 (file)
--- 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 3c0ca7d4be273a380b3e75579f9483081f08de85..d0651319813be4c77942ec621c29cb29c4521edf 100644 (file)
--- 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 918f2189e8c2e88600dca12125e395b66dfc903a..9a869b8b676d053d55164ffb51c55bac6bc79612 100644 (file)
--- 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 e929089fcadc7368119b1fcfedcd562ed37f551b..ba6836fe0f3119f2f61af1a057e713d5df784b29 100644 (file)
--- 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 49eab0a6755619376a3e7babb8c85c608b886cdd..d7e9290da50b2842e719a29303183c082ace99d1 100644 (file)
--- 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 798bf8e0b6ab0132f8f13de327f3b06ff8151b9c..4368a9098836a015a5b3ffe852875e445103a569 100644 (file)
--- 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 8dd12cff167f8afc909668f3e9a4619703c49b96..628a8bf5018124d7069eb1498ba0367046db61dd 100644 (file)
--- 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 3b1bc7a5dc07f3f005b22aa4b1ce10e05b00044e..b6ad43f1fa4678dc8e801506ed44aca544e3df70 100644 (file)
--- 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 782fdc7b80f1468003e01828ad58b4d541556283..d9c37fa41db7c9e1a11129ac8a4577366675f565 100644 (file)
--- 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 71ee72210d17fec24a34dc5e6fc213252d96e870..8583ef55a695ac2c54ea0da7d887d116e424cf81 100644 (file)
--- 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 b56612779216496985b0970623b8b9198bb1d589..5d2194fd782407fc935fd10d19694bd414f194e0 100644 (file)
--- 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 825d2399d54355348685f0a482477183786aea3f..dee9cc8b88cbcb376f1be663a583bb8df8db7f34 100644 (file)
--- 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 4bf949fc1b61d428a26daffbd1cf0e3be3536737..249257b9958fbd51ce27c22a91b26efa2c6ac2b6 100644 (file)
--- 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 743665032b54aff3fcbac7584a5e139efa5aea11..a89cd7daedfdb9ccf0933c33660ca28604598c65 100644 (file)
--- 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 9092c25ac3535d89bad13552987b1911e48ef89d..4b185aa190ddfc457b6f951705c03f57f9bd61ff 100644 (file)
--- 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 95cf6928d847f2041f9647dfaeb274a2d7572c9d..03720773b8e7fc321eb7336d322c8de3a98f478c 100644 (file)
--- 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 3c324af226d08ed8ac2508ed1b2466a40f5e46f4..3126727c11fd6b59c54ea5a341c3f890801f57b2 100644 (file)
--- 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 2472577009d7cae1f7ad92ecbdd41ab77f6262df..8f824ec51c4ccd87cebc0a0fa1c56d0e405b1780 100644 (file)
--- 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 0fbadc35c36be2fa6f855cc01be725c4daaee2f5..5bf95a8f9aefe4d6dd4d13ed474e76983791cd1a 100644 (file)
--- 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 fb4a502829b52828c17549195cede70b61a6953a..58f714240f9eae7ef146cbc0777df04557427d63 100644 (file)
--- 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 befe8e9b7fdec1abf0662587925869d10d9ae816..1af4c37738c46ce8b875c22520b2ba3f6d676c80 100644 (file)
--- 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 a9c90112025241be4a9ba7b4523acc26db668772..6242d0cfbd16512fd4e89c94c1008f8979c003bc 100644 (file)
--- 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 e8a126925d274205125542598ef0c155aa6575ee..c061b43594369132bdaf3f158ddde2917e346acb 100644 (file)
--- 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 209c3e798badab2459cbc09dbe0163ede0f1e7bf..180a01418f428dcb0c903619f959f793895514b7 100644 (file)
--- 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 4df3c33d174604fc07c268a12fb12ce09cc465bd..63c652f969eb387f8bd0cbbbe238843d67d86b5e 100644 (file)
--- 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 ed277ee58fbd95b51fcfbdc3bfb6b2ad1533be50..0bf6279f0d93895bdaddb3083d721f9b24ff3c2a 100644 (file)
--- 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 422c8c56e7fb791d506aa0cf63a8fd3b397be075..addc800095522fae29e2444835b3b6cb26495dc4 100644 (file)
--- 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 9dbe6fc4f04991f557fa321b3b17c36129cf3abd..ea33b1d42b47a61eb47f086e31c915c01fb30fd5 100644 (file)
--- 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 11fbdadec9155aa32d3b152186b6520fe25704a4..34b779a470ad1a66b05415363029e1c4a052e3e4 100644 (file)
--- 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 addcda3fc50b8748cd9dd6e858154f10749d3f1f..ade7079ad23172eef25bed0528845ed42041f2b4 100644 (file)
--- 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

diff --git a/ws_attributes.h b/ws_attributes.h
index 1efcaafe6aea08d437361bb258deacabb4606972..7e2245b9c3fc32ac4664f9131c2717f75e7d88d4 100644 (file)
--- a/ws_attributes.h
+++ b/ws_attributes.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 __WS_ATTRIBUTES_H__

diff --git a/ws_compiler_tests.h b/ws_compiler_tests.h
index d4e35a68f1cd6d194e01fcc25f4fe3b5e3de0a8a..46a4ab6099d2d9a2826f42f2884eae962efedff1 100644 (file)
--- a/ws_compiler_tests.h
+++ b/ws_compiler_tests.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 __WS_COMPILER_TESTS_H__

diff --git a/ws_diag_control.h b/ws_diag_control.h
index f65340abb306f73b4fb6b7f31c11f7fe1a767d1b..459a18a9af01603da93dae7fd70d79caa55e7a43 100644 (file)
--- a/ws_diag_control.h
+++ b/ws_diag_control.h
@@ -7,7 +7,7 @@
  *
  * That project is covered by the GPLv2, so:
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __WS_DIAG_CONTROL_H__

diff --git a/ws_symbol_export.h b/ws_symbol_export.h
index 01f230e345c95cfa92e7844b230f21a5f723b5e6..4c7a2f710af741a948163a0efb7892af7be5a662 100644 (file)
--- a/ws_symbol_export.h
+++ b/ws_symbol_export.h
@@ -5,7 +5,7 @@
  * By Balint Reczey <balint@balintreczey.hu>
  * Copyright 2013 Balint Reczey
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "ws_compiler_tests.h"

diff --git a/wsutil/adler32.c b/wsutil/adler32.c
index eb68c0280e2f3a21f49dbbb4f5240777083de4d3..21e6ee3d41c483a213781a91b40b466fea234341 100644 (file)
--- a/wsutil/adler32.c
+++ b/wsutil/adler32.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
  */
 
 #include <string.h>

diff --git a/wsutil/adler32.h b/wsutil/adler32.h
index 70cb6cf51206edc417b70ea65cbcda2202cc1999..e5b72b81105712b5f447be695c83ea6b610fca83 100644 (file)
--- a/wsutil/adler32.h
+++ b/wsutil/adler32.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 ADLER32_H

diff --git a/wsutil/base32.c b/wsutil/base32.c
index 2c320a616d256ec22048ff191ea65b6885848a3d..525dba93ef1580a0296e8d68e51d3812ceccbeb2 100644 (file)
--- a/wsutil/base32.c
+++ b/wsutil/base32.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/base32.h b/wsutil/base32.h
index b3a5d3d54f21535a2664d89066328638da4506fd..75251e66b9a3553f48688e7db0867d1498474341 100644 (file)
--- a/wsutil/base32.h
+++ b/wsutil/base32.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 __BASE32_H__
 #define __BASE32_H__

diff --git a/wsutil/base64.c b/wsutil/base64.c
index bbf3e40cc526488e49ae89e34b47665910a14f7a..951d20b5b06351e41e48f206187a70e565d36c26 100644 (file)
--- a/wsutil/base64.c
+++ b/wsutil/base64.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/base64.h b/wsutil/base64.h
index a58951ad0dc444d33fdb671062ffa76f17a37b58..07b5d118d30b3740e57d3c15018b1403218de1af 100644 (file)
--- a/wsutil/base64.h
+++ b/wsutil/base64.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 __BASE64_H__
 #define __BASE64_H__

diff --git a/wsutil/bits_count_ones.h b/wsutil/bits_count_ones.h
index d2d7c22b04a56168439b3cf6796d18f492e3dd9b..2e532e93b0867a119c27f3f6e57ad6b1a6ea3d8f 100644 (file)
--- a/wsutil/bits_count_ones.h
+++ b/wsutil/bits_count_ones.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 __WSUTIL_BITS_COUNT_ONES_H__

diff --git a/wsutil/bits_ctz.h b/wsutil/bits_ctz.h
index 47d90c2dec7893464d187f99ec5da571049164b9..54071b08fb62e9da46b1b8e181401d8d945000a2 100644 (file)
--- a/wsutil/bits_ctz.h
+++ b/wsutil/bits_ctz.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 __WSUTIL_BITS_CTZ_H__

diff --git a/wsutil/bitswap.c b/wsutil/bitswap.c
index 1d868e30719d268b27fba40cadba0f255494e09b..2eb00768ba2dde04bb863aaacf8ee130cf62046d 100644 (file)
--- a/wsutil/bitswap.c
+++ b/wsutil/bitswap.c
@@ -6,7 +6,7 @@
  * Copyright 1998 Gerald Combs
  *
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"

diff --git a/wsutil/bitswap.h b/wsutil/bitswap.h
index aa76c66d6fd0fc55efff9f9a4890de52f41a2fa1..8f4a05d9a015edba5f484620f40d81b792fc5f29 100644 (file)
--- a/wsutil/bitswap.h
+++ b/wsutil/bitswap.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 __BITSWAP_H__

diff --git a/wsutil/buffer.c b/wsutil/buffer.c
index 40ef5a348dbfc440f59ad6e4168e0727ad2aff47..86b6ef1e78fa99823a1f65c3f511f789c1c664bd 100644 (file)
--- a/wsutil/buffer.c
+++ b/wsutil/buffer.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/wsutil/buffer.h b/wsutil/buffer.h
index 13fe585aff96692d9ac5cf2107840c5b410dea48..1dfccd9fe0247b88ac6a6167e86cc8209887c541 100644 (file)
--- a/wsutil/buffer.h
+++ b/wsutil/buffer.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_BUFFER_H__

diff --git a/wsutil/cfutils.c b/wsutil/cfutils.c
index 95d21b4f34ca6f0d9a901b757f5f0d696c8b3669..9707fe09a19fd16c1a76da81ef5feeacce00c740 100644 (file)
--- a/wsutil/cfutils.c
+++ b/wsutil/cfutils.c
@@ -7,7 +7,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/wsutil/cfutils.h b/wsutil/cfutils.h
index 2723227c85ce67e6c3960ef67f62c9c17f7627ad..c6ed5a24863ce50f56bdea4e9025c8c008d0337f 100644 (file)
--- a/wsutil/cfutils.h
+++ b/wsutil/cfutils.h
@@ -7,7 +7,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 __WSUTIL_CFUTILS_H__

diff --git a/wsutil/clopts_common.c b/wsutil/clopts_common.c
index 657dd526268ee54d27f213b55d0ed6d5a9db76ff..ab21be9980305d0a1cf04b37d327f53f54fb9307 100644 (file)
--- a/wsutil/clopts_common.c
+++ b/wsutil/clopts_common.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/clopts_common.h b/wsutil/clopts_common.h
index c3d62593e0a74e37ec6647fbf3ff227674b95319..57e70c8955254c7d7eb3d15cd521533c331700b6 100644 (file)
--- a/wsutil/clopts_common.h
+++ b/wsutil/clopts_common.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 __WSUTIL_CLOPTS_COMMON_H__

diff --git a/wsutil/cmdarg_err.c b/wsutil/cmdarg_err.c
index 360c4a34c74c1504530815cd7d1e9778c9ad9751..e7368dd5dbc0b8ce69002238365d0d8f839e3e6a 100644 (file)
--- a/wsutil/cmdarg_err.c
+++ b/wsutil/cmdarg_err.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/cmdarg_err.h b/wsutil/cmdarg_err.h
index 5bc5d01707065da7278389385a574ec9c171a884..4e8816ad07cbdb490969915034803b809ba816a0 100644 (file)
--- a/wsutil/cmdarg_err.h
+++ b/wsutil/cmdarg_err.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 __WSUTIL_CMDARG_ERR_H__

diff --git a/wsutil/color.h b/wsutil/color.h
index 4c2be7ead1d745b31d12f4f372933d06dab85757..355d08fdf4f5e62d9dd7bbde84296463f2f99f62 100644 (file)
--- a/wsutil/color.h
+++ b/wsutil/color.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  __COLOR_H__
 #define  __COLOR_H__

diff --git a/wsutil/copyright_info.c b/wsutil/copyright_info.c
index b7f49454001c451d4b6b5edad406348b278f78a2..6b80f9b2f20b615a73559eb49d03464deed24dd0 100644 (file)
--- a/wsutil/copyright_info.c
+++ b/wsutil/copyright_info.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/copyright_info.h b/wsutil/copyright_info.h
index e055ee7e2f79a6cbc264bbbe405875e31ff3f335..83abcd6273a0d6c1c5b7256665577910ce941e08 100644 (file)
--- a/wsutil/copyright_info.h
+++ b/wsutil/copyright_info.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 __WSUTIL_COPYRIGHT_INFO_H__

diff --git a/wsutil/cpu_info.c b/wsutil/cpu_info.c
index 8d7371b550da386c9c1771bfc43c56f4b8a7147c..ce62a0e9d34b9dbed6fcc2fc147b876d76913410 100644 (file)
--- a/wsutil/cpu_info.c
+++ b/wsutil/cpu_info.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/cpu_info.h b/wsutil/cpu_info.h
index 16a7e9bd7fa360f83979e8ab79d7605eb41a7c7d..3579576ba7fc648b94cc1a2995a5c41cef74f5d7 100644 (file)
--- a/wsutil/cpu_info.h
+++ b/wsutil/cpu_info.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 __WSUTIL_CPU_INFO_H__

diff --git a/wsutil/crash_info.c b/wsutil/crash_info.c
index ab192393f5a70023681e2aa0d883917ed0b8e734..7f135132671ddc88b7380f040054fb08cc878386 100644 (file)
--- a/wsutil/crash_info.c
+++ b/wsutil/crash_info.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2006 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"

diff --git a/wsutil/crash_info.h b/wsutil/crash_info.h
index a8c6ef414c5c558718dd06b5c0c2fc4ca86fe54d..8cb9cd3a21bc58df0464626d3ffe2eeb7385e03e 100644 (file)
--- a/wsutil/crash_info.h
+++ b/wsutil/crash_info.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2006 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __CRASH_INFO_H__

diff --git a/wsutil/crc10.c b/wsutil/crc10.c
index 81117f3f2d23fde845d1bc5cb8b03954bdf0e8c5..007c46eb8f698f995903b49f1c282de69c4b03a2 100644 (file)
--- a/wsutil/crc10.c
+++ b/wsutil/crc10.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/crc10.h b/wsutil/crc10.h
index 42308ec3ab80f9fcab681f168ca1f822744d2f5e..2834cd3bbf3e9b2a4549ff109bca89c286321d97 100644 (file)
--- a/wsutil/crc10.h
+++ b/wsutil/crc10.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 __CRC10_H__

diff --git a/wsutil/crc11.c b/wsutil/crc11.c
index 7d6f84dafe71452a223f97ffeb17cf27f7c59df6..4144750c773e34c8ee9c99352a034d961904909a 100644 (file)
--- a/wsutil/crc11.c
+++ b/wsutil/crc11.c
@@ -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
  */
 
 

diff --git a/wsutil/crc11.h b/wsutil/crc11.h
index 92407f8bffc3c296e0f29b49f2ca307cdc59aab4..c9ac52ba1859f9bc6b185bf6768b97bbcc7eb9d3 100644 (file)
--- a/wsutil/crc11.h
+++ b/wsutil/crc11.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 __CRC11_____H__

diff --git a/wsutil/crc16-plain.c b/wsutil/crc16-plain.c
index 49a621114b90fd76a57fe73efc19770be57a5eca..8aa22850f55277e7408e61518da8cdbd9b356f1a 100644 (file)
--- a/wsutil/crc16-plain.c
+++ b/wsutil/crc16-plain.c
@@ -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
  */
 
 /**

diff --git a/wsutil/crc16-plain.h b/wsutil/crc16-plain.h
index 3828ea8553018e71362007bbe73fc983f76601eb..f2efe1a0d3a1e0fc00c5a0e6b2f566fd596f9205 100644 (file)
--- a/wsutil/crc16-plain.h
+++ b/wsutil/crc16-plain.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
  */
 
 /**

diff --git a/wsutil/crc16.c b/wsutil/crc16.c
index 10d4c01786ab129fd15e6b93f467e476dee69f17..05ca10b3cd136a0b42918fb4e02e9962987177f9 100644 (file)
--- a/wsutil/crc16.c
+++ b/wsutil/crc16.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
  *
  * References:
  *  "A Painless Guide to CRC Error Detection Algorithms", Ross Williams

diff --git a/wsutil/crc16.h b/wsutil/crc16.h
index 6cc116a8506432660e4936823ae76d309b035d00..922599bf7ca0a9c9569ce014258c1584b6088152 100644 (file)
--- a/wsutil/crc16.h
+++ b/wsutil/crc16.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 __CRC16_H__

diff --git a/wsutil/crc32.c b/wsutil/crc32.c
index a36257a7f194b6e58c20d51e5366d52ab3e03df2..62b6a54e6db1115ee5cf02cfe995d6c2bffbc0be 100644 (file)
--- a/wsutil/crc32.c
+++ b/wsutil/crc32.c
@@ -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
  *
  * Credits:
  *

diff --git a/wsutil/crc32.h b/wsutil/crc32.h
index 48ced584c63c152ecba2c3ef21dfb7431822b47b..511d11d8d1f03634caed5adf5da979b531aa977e 100644 (file)
--- a/wsutil/crc32.h
+++ b/wsutil/crc32.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 __CRC32_H__

diff --git a/wsutil/crc6.c b/wsutil/crc6.c
index f5e7fa50d5f198c2dbcc619e01fe7466761e0d8b..ef1372412e4455ad98942e932b41b1fa57e30a5f 100644 (file)
--- a/wsutil/crc6.c
+++ b/wsutil/crc6.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/crc6.h b/wsutil/crc6.h
index 6d9a397095338bda12eb95a5fbecf3e6689685f0..a91f09fec1fd77bca7a26a61d23ebf9194345f4d 100644 (file)
--- a/wsutil/crc6.h
+++ b/wsutil/crc6.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 __CRC6_H__

diff --git a/wsutil/crc7.c b/wsutil/crc7.c
index 80a7c038ad2ed2bf2b3137e98f021c55e446b4d8..d88091dba8581e602e489a2d55aa1b260908c4c5 100644 (file)
--- a/wsutil/crc7.c
+++ b/wsutil/crc7.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
  *
  *
  * Generated on Wed Jul 11 17:24:30 2012,

diff --git a/wsutil/crc7.h b/wsutil/crc7.h
index a26eb503c214d22c50842071d1aaff3c511d5d14..adb35aac0f46022907b44f190b62130180f6a130 100644 (file)
--- a/wsutil/crc7.h
+++ b/wsutil/crc7.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
  *
  * Generated on Wed Jul 11 17:24:57 2012,
  * by pycrc v0.7.10, http://www.tty1.net/pycrc/

diff --git a/wsutil/crc8.c b/wsutil/crc8.c
index f22f51a808ab4b6e8e5c036ba36cbc5ff20f7b42..a2714330cce7afa32cae1f89ac9fdc5a493fff28 100644 (file)
--- a/wsutil/crc8.c
+++ b/wsutil/crc8.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/wsutil/crc8.h b/wsutil/crc8.h
index 940e918ffcf28cb48ad18cd05f5a0ec5db7b9f57..b8ca2f6fb1a08fb49cca16b0459f98b22f626569 100644 (file)
--- a/wsutil/crc8.h
+++ b/wsutil/crc8.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 __CRC8_H__

diff --git a/wsutil/eax.c b/wsutil/eax.c
index b21bf23423f3bc452d3cda1b9ff1d10da08e269f..10f2fa242011b11a21e7b597928cbc9c606d591b 100644 (file)
--- a/wsutil/eax.c
+++ b/wsutil/eax.c
@@ -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
  */
 #include "config.h"
 #include <stdlib.h>

diff --git a/wsutil/eax.h b/wsutil/eax.h
index 1b85ba7bdd3b2819f23214e000f63644d385fbf6..bc7118c2904a9251fb0943a3631744ab3fba011c 100644 (file)
--- a/wsutil/eax.h
+++ b/wsutil/eax.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        _EAX_H

diff --git a/wsutil/file_util.c b/wsutil/file_util.c
index eda43617fd4a91b6719d6c68441423396cceac22..1149e8e8cb196f90ad9b10ed81d964029de39c24 100644 (file)
--- a/wsutil/file_util.c
+++ b/wsutil/file_util.c
@@ -4,7 +4,7 @@
  *  utility 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/wsutil/file_util.h b/wsutil/file_util.h
index ba74dd111e08993f17a52b598b219307d20a8266..fe2f7ba11852845467442a73fce592fd7951011a 100644 (file)
--- a/wsutil/file_util.h
+++ b/wsutil/file_util.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 __FILE_UTIL_H__

diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
index 7a2832af361106e8734b297626d4852084d39bbe..4d4abc6977603ffc26475f27e6aa90148a7c9023 100644 (file)
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -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
  */
 
 #include <config.h>

diff --git a/wsutil/filesystem.h b/wsutil/filesystem.h
index 4e67683f3bc46d5a3f3e6a38cb45d4a9e670083f..da45aeb0bf2787975f575dda3ffe21d6bbcac210 100644 (file)
--- a/wsutil/filesystem.h
+++ b/wsutil/filesystem.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 FILESYSTEM_H

diff --git a/wsutil/frequency-utils.c b/wsutil/frequency-utils.c
index f6f2ab599bc5b57dd01451ee4dbd5f51d66d06ed..3c6d1574231d67b6371db1a9087a449d49317aab 100644 (file)
--- a/wsutil/frequency-utils.c
+++ b/wsutil/frequency-utils.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2007 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"

diff --git a/wsutil/frequency-utils.h b/wsutil/frequency-utils.h
index b0a659d45fb2e2232142e90cfd7a654e1cc7f3f0..e7367ee3cf61996085a6ca6ec66d6503705bdcaa 100644 (file)
--- a/wsutil/frequency-utils.h
+++ b/wsutil/frequency-utils.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2007 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __FREQUENCY_UTILS_H__

diff --git a/wsutil/g711.h b/wsutil/g711.h
index 8feb017cf84c920e763c3984ca5a41e06b608175..81e66bede1b04d61bdbc4a00886e653b124fa742 100644 (file)
--- a/wsutil/g711.h
+++ b/wsutil/g711.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 __G711_H__

diff --git a/wsutil/glib-compat.c b/wsutil/glib-compat.c
index e741581c932adef5c5833f33921a16ba67588368..b1181d380910ad8cbd2c33592192edfbb659cb4d 100644 (file)
--- a/wsutil/glib-compat.c
+++ b/wsutil/glib-compat.c
@@ -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
 */
 #include "config.h"
 

diff --git a/wsutil/glib-compat.h b/wsutil/glib-compat.h
index 8393e91232532557617015aa5642ad1dc6f92db9..cf00cadaf6364ad1dbaaab8f33b9cd6705c96712 100644 (file)
--- a/wsutil/glib-compat.h
+++ b/wsutil/glib-compat.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 GLIB_COMPAT_H
 #define GLIB_COMPAT_H

diff --git a/wsutil/inet_addr.c b/wsutil/inet_addr.c
index 417c1c60408067acf7cbeba318b35b2e82bdbf66..8f047721a7b1500c525071850f939785f1215ce4 100644 (file)
--- a/wsutil/inet_addr.c
+++ b/wsutil/inet_addr.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/inet_addr.h b/wsutil/inet_addr.h
index 4de59fab170bd6dea670077a9bdec3bb51a8864f..267952f47bd3efa740b191809ea5177a0bbe9069 100644 (file)
--- a/wsutil/inet_addr.h
+++ b/wsutil/inet_addr.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 __WS_INET_ADDR_H__

diff --git a/wsutil/inet_ipv4.h b/wsutil/inet_ipv4.h
index eab3441bc19b18aa0d303a20acc42a35ff3a1814..9be3ca6a379e2fd70df3093b17d46513978cbcf5 100644 (file)
--- a/wsutil/inet_ipv4.h
+++ b/wsutil/inet_ipv4.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 __INET_IPV4_H__

diff --git a/wsutil/inet_ipv6.h b/wsutil/inet_ipv6.h
index 7209e4e15c224c04c21298de7e234cd3e5f45501..cf4453e53f32b92974c48a5be18de279202ff844 100644 (file)
--- a/wsutil/inet_ipv6.h
+++ b/wsutil/inet_ipv6.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 __INET_IPV6_H__

diff --git a/wsutil/interface.c b/wsutil/interface.c
index c753cae20700223fc2501f07a7bc74ff20b7f02c..0d9b282d00e37e3e499badb5f2dfc4f500b8fcea 100644 (file)
--- a/wsutil/interface.c
+++ b/wsutil/interface.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
  */
 
 #include "config.h"

diff --git a/wsutil/interface.h b/wsutil/interface.h
index 0962f039cf3770da91c1d75e7327cf00bd1f311d..ee9ab1c0a044577c66051b1141b6d08b6b15d6b6 100644 (file)
--- a/wsutil/interface.h
+++ b/wsutil/interface.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 _INTERFACE_H

diff --git a/wsutil/mpeg-audio.c b/wsutil/mpeg-audio.c
index 843727dde24787ea0bbf9d0341f138e52f2359f5..b5168a66fc3bab8091174d1f505159403ffd2d90 100644 (file)
--- a/wsutil/mpeg-audio.c
+++ b/wsutil/mpeg-audio.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 "mpeg-audio.h"

diff --git a/wsutil/mpeg-audio.h b/wsutil/mpeg-audio.h
index f366815b71ad74ed3322400d0bfba79d4976eb81..ce102117e4df22a939c66c5d6f770b177d0b9736 100644 (file)
--- a/wsutil/mpeg-audio.h
+++ b/wsutil/mpeg-audio.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 MPA_H

diff --git a/wsutil/nstime.c b/wsutil/nstime.c
index b2169c065455312ba8b46971c01cf649f3cdab96..456530a5e3e125a00f0d59fb393e589ea41b0a7f 100644 (file)
--- a/wsutil/nstime.c
+++ b/wsutil/nstime.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
  */
 
 #include <glib.h>

diff --git a/wsutil/nstime.h b/wsutil/nstime.h
index f1b9ff8f697ae83a3e3c3fa13c22d942e1849d44..0d976200b8bb6060fe41a42d0226c1aec9ea3402 100644 (file)
--- a/wsutil/nstime.h
+++ b/wsutil/nstime.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 __NSTIME_H__

diff --git a/wsutil/os_version_info.c b/wsutil/os_version_info.c
index e29583b88c51263f3ecd160ea45ac13201948454..2bfb264d62bfc6024b7a95518457aa193cf20ebf 100644 (file)
--- a/wsutil/os_version_info.c
+++ b/wsutil/os_version_info.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/os_version_info.h b/wsutil/os_version_info.h
index 5f9bb6391b8bb5d22af84756010497a7b3e306b8..c9e14c337e02548941b756291213d000d881446a 100644 (file)
--- a/wsutil/os_version_info.h
+++ b/wsutil/os_version_info.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 __WSUTIL_OS_VERSION_INFO_H__

diff --git a/wsutil/pint.h b/wsutil/pint.h
index 86109023e57885b18073c6f9ba2fafadd7530435..72c67e4a481d33fbb86c554aa064b31aa8e468df 100644 (file)
--- a/wsutil/pint.h
+++ b/wsutil/pint.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 __PINT_H__

diff --git a/wsutil/plugins.c b/wsutil/plugins.c
index 517065c2d760ffe73723f230a648b2e2e48351cd..0b9b526afbf08b7ec29c3bbb21d766046014ec16 100644 (file)
--- a/wsutil/plugins.c
+++ b/wsutil/plugins.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/plugins.h b/wsutil/plugins.h
index 7987a42e16f2a72c0bd981fed91c4b2e73aa0aa8..49c221ef5e14288e17dba490f35e841ff12ca19f 100644 (file)
--- a/wsutil/plugins.h
+++ b/wsutil/plugins.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 __PLUGINS_H__

diff --git a/wsutil/popcount.c b/wsutil/popcount.c
index 3418e61de01a53decc8fe2b4eefddad9d24de2d3..7c0105e41ec8e78c3d3fc10a451e15d12fa42757 100644 (file)
--- a/wsutil/popcount.c
+++ b/wsutil/popcount.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/popcount.h b/wsutil/popcount.h
index a7c779150cf9a897b712aeb5dba0f0f50071a127..561dd253381a120a2253651c3ea0663f9ff43e92 100644 (file)
--- a/wsutil/popcount.h
+++ b/wsutil/popcount.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 __POPCOUNT_H__

diff --git a/wsutil/privileges.c b/wsutil/privileges.c
index e1b4cd04b4286dd80769e984d3227471779e9279..5ce48850c6fecae64100c187e169d0095a22cfa6 100644 (file)
--- a/wsutil/privileges.c
+++ b/wsutil/privileges.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2006 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"

diff --git a/wsutil/privileges.h b/wsutil/privileges.h
index 4ac72111a38f0e9d80b4c6689027b68120ea7f2b..3a6169e43426ceaee5f0e109f94ffc27b0cecff0 100644 (file)
--- a/wsutil/privileges.h
+++ b/wsutil/privileges.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2006 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __PRIVILEGES_H__

diff --git a/wsutil/processes.h b/wsutil/processes.h
index 219af0d971a918a000a2481e0e8dc08da76c8194..03c76e829d9808f6290aa8c316450f6b789f5a45 100644 (file)
--- a/wsutil/processes.h
+++ b/wsutil/processes.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 _WSUTIL_PROCESSES_H_

diff --git a/wsutil/report_message.c b/wsutil/report_message.c
index 3923817fba2553f84d90abc5e69e6f7117248f3f..98d48b9612ac80861bba0145fafad94ce541ebe4 100644 (file)
--- a/wsutil/report_message.c
+++ b/wsutil/report_message.c
@@ -14,7 +14,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/wsutil/report_message.h b/wsutil/report_message.h
index fbf254a87d40f3ca21cd9366e0d364b14aafd8e8..d0d6b2fc28bbfdb69c817425be07bb0c801590b8 100644 (file)
--- a/wsutil/report_message.h
+++ b/wsutil/report_message.h
@@ -14,7 +14,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 __REPORT_MESSAGE_H__

diff --git a/wsutil/rsa.c b/wsutil/rsa.c
index 504d8a5ef99c58b5ef959ac24dc227d3209a74be..c71cdfd203941edbf82e37830e4944542ac98d9e 100644 (file)
--- a/wsutil/rsa.c
+++ b/wsutil/rsa.c
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2007 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"

diff --git a/wsutil/rsa.h b/wsutil/rsa.h
index 7e8169a65013f1c69c130c6bf787bc0f0adaa6bf..07ddf8547aae247a354f4ce554eaf7ea1dd063fb 100644 (file)
--- a/wsutil/rsa.h
+++ b/wsutil/rsa.h
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2007 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __RSA_H__

diff --git a/wsutil/sign_ext.h b/wsutil/sign_ext.h
index 3042b281c7d59bafc79260ca1c3b090078819201..21104c5061c514e8cf9b0abd028550c25ff4e306 100644 (file)
--- a/wsutil/sign_ext.h
+++ b/wsutil/sign_ext.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 __WSUTIL_SIGN_EXT_H__

diff --git a/wsutil/socket.h b/wsutil/socket.h
index 5234a72749c15a1ebe81d02de347cf77228f5f5f..5e79ac54f9a10561c1683c8e06ac0c9fff640e70 100644 (file)
--- a/wsutil/socket.h
+++ b/wsutil/socket.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 __SOCKET_H__
 #define __SOCKET_H__

diff --git a/wsutil/str_util.c b/wsutil/str_util.c
index 8789594fd944e864687b62005cba37f0ff0cfb06..65c36d6b154b54b3ab3fc5fb0592012a9605b8da 100644 (file)
--- a/wsutil/str_util.c
+++ b/wsutil/str_util.c
@@ -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
  */
 
 #include <config.h>

diff --git a/wsutil/str_util.h b/wsutil/str_util.h
index 9ca1158faa8ba8d392de24cbbdd0983b462bb2e8..e37b887024581b5c727c2f5d438772fbafcfee10 100644 (file)
--- a/wsutil/str_util.h
+++ b/wsutil/str_util.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 __STR_UTIL_H__

diff --git a/wsutil/strptime.h b/wsutil/strptime.h
index 4c2582c7e75394ca62bd382209df103a6929a177..af5baabbc6dcb728bfa9094b8bb2fd8029dc16e2 100644 (file)
--- a/wsutil/strptime.h
+++ b/wsutil/strptime.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 __STRPTIME_H__

diff --git a/wsutil/strtoi.c b/wsutil/strtoi.c
index 7d07ad046517a7bc17ee5d5d17a6a5cd284ca298..ac97efe163a8049b3ba8030fe818805fc7cfef0c 100644 (file)
--- a/wsutil/strtoi.c
+++ b/wsutil/strtoi.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
  */
 
 #include "config.h"

diff --git a/wsutil/strtoi.h b/wsutil/strtoi.h
index b4ab13fbee61e9e204e275c51d6d87055f307ac8..1e3fa6acd8f35c222941d7a256199a0123c71640 100644 (file)
--- a/wsutil/strtoi.h
+++ b/wsutil/strtoi.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 _WS_STRTOI_H

diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c
index 09b63e503d3623f5140712fa60a4bd56d1b62ad5..3d6c6edc7b7ee39990eaa4d25d82112784243547 100644 (file)
--- a/wsutil/tempfile.c
+++ b/wsutil/tempfile.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/tempfile.h b/wsutil/tempfile.h
index a0dcb6d4d7044eb6838d5129bf9f9677028dc045..c528aedaad4492fa3968c76e962754d1cc7ce867 100644 (file)
--- a/wsutil/tempfile.h
+++ b/wsutil/tempfile.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 __TEMPFILE_H__

diff --git a/wsutil/time_util.c b/wsutil/time_util.c
index 03aa37dc760125fb8e2aa39fc808fe584e770602..36ab7ef8abf02423ff34918a9a6f25810e7ee2c0 100644 (file)
--- a/wsutil/time_util.c
+++ b/wsutil/time_util.c
@@ -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
  */
 
 

diff --git a/wsutil/time_util.h b/wsutil/time_util.h
index 1775bb62a301bcd677934cf02757956fc61fb067..1cd430dedf4cdbf5e51886ab386ae8e21ef47bcb 100644 (file)
--- a/wsutil/time_util.h
+++ b/wsutil/time_util.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 __TIME_UTIL_H__

diff --git a/wsutil/type_util.c b/wsutil/type_util.c
index ace7775dbfedd150b4d5c2a380f3766e8bb54a51..744cab028f6dc7db0aeb4ce9e932cba98cad9ac0 100644 (file)
--- a/wsutil/type_util.c
+++ b/wsutil/type_util.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/type_util.h b/wsutil/type_util.h
index 1144369db79a71648a2c05567b34580b1939f901..0944a494e1a66fc32cbde42fb490690e51aacb86 100644 (file)
--- a/wsutil/type_util.h
+++ b/wsutil/type_util.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 __TYPE_UTIL_H__

diff --git a/wsutil/unicode-utils.c b/wsutil/unicode-utils.c
index 42a410ad220e2c5f70fc696b19d067dbc4fc6ab4..639bfcc06b05e0bc42c696f71cf44203ee947dca 100644 (file)
--- a/wsutil/unicode-utils.c
+++ b/wsutil/unicode-utils.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2006 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "unicode-utils.h"

diff --git a/wsutil/unicode-utils.h b/wsutil/unicode-utils.h
index 995ad34c8905ed043629395c497b101007130d3d..8bb06eeaa74b957edaee19f4984940b66360d45c 100644 (file)
--- a/wsutil/unicode-utils.h
+++ b/wsutil/unicode-utils.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2006 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __UNICODEUTIL_H__

diff --git a/wsutil/utf8_entities.h b/wsutil/utf8_entities.h
index d1e69cac2455af7bfcccf811acdb8a3e2bb12941..de587f8856efc46ab44a131b6b2d828e7b84eb80 100644 (file)
--- a/wsutil/utf8_entities.h
+++ b/wsutil/utf8_entities.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
  */
 
 

diff --git a/wsutil/win32-utils.c b/wsutil/win32-utils.c
index 4521b9051fe5c45885c5158e66723c587daf0480..9de0723652b70e9be94072cb76cddcb0ba5187d1 100644 (file)
--- a/wsutil/win32-utils.c
+++ b/wsutil/win32-utils.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2006 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "win32-utils.h"

diff --git a/wsutil/win32-utils.h b/wsutil/win32-utils.h
index f83656a921190dfe0d9f3ff47e18c5d88c5f4252..9a7658d2b6e117481015e44ffc1ac858fc1a342d 100644 (file)
--- a/wsutil/win32-utils.h
+++ b/wsutil/win32-utils.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2006 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __WIN32UTIL_H__

diff --git a/wsutil/ws_cpuid.h b/wsutil/ws_cpuid.h
index e7d6af93075b1fa76a06b1ad989628aaa014a4d7..2ba696778d4dacc7d98755722685772eae1b74ca 100644 (file)
--- a/wsutil/ws_cpuid.h
+++ b/wsutil/ws_cpuid.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
  */
 
 /*

diff --git a/wsutil/ws_mempbrk.c b/wsutil/ws_mempbrk.c
index 589cf4550f8f1dfc18216f84aaf2b4e0ebf0eb86..bea1e4880ce8870ecaba18d3d718ba966fab362d 100644 (file)
--- a/wsutil/ws_mempbrk.c
+++ b/wsutil/ws_mempbrk.c
@@ -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
  */
 
 #include "config.h"

diff --git a/wsutil/ws_mempbrk.h b/wsutil/ws_mempbrk.h
index cc464790750a465d6d44689d75358208aee269fd..80bceb4523abe97db0e72d39b345f052af180b04 100644 (file)
--- a/wsutil/ws_mempbrk.h
+++ b/wsutil/ws_mempbrk.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 __WS_MEMPBRK_H__

diff --git a/wsutil/ws_mempbrk_int.h b/wsutil/ws_mempbrk_int.h
index c0e75c234f9b741ae5a25d27658b3d601035342e..8f51d8729d4ceab8ce8163bea7d184ff9b124ac6 100644 (file)
--- a/wsutil/ws_mempbrk_int.h
+++ b/wsutil/ws_mempbrk_int.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 __WS_MEMPBRK_INT_H__

diff --git a/wsutil/ws_pipe.c b/wsutil/ws_pipe.c
index eddec9f4dc002e2be39803dcd50ec95519cf18e2..8f21014503690aaed4a97fb588701b7120dd24a3 100644 (file)
--- a/wsutil/ws_pipe.c
+++ b/wsutil/ws_pipe.c
@@ -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
  */
 
 #include <config.h>

diff --git a/wsutil/ws_pipe.h b/wsutil/ws_pipe.h
index 8787eb7880af5323e9b6ffa3eae625d961b65230..8a4870f2cc474cd9d5d299fcf5f55a156a3008ea 100644 (file)
--- a/wsutil/ws_pipe.h
+++ b/wsutil/ws_pipe.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 __WS_PIPE_H__

diff --git a/wsutil/ws_printf.h b/wsutil/ws_printf.h
index 46d0aca9b81fe3f09917d14e32a3c622e535c7dc..d603f815df5f4c846062e6fbbb4b29ca85a8067e 100644 (file)
--- a/wsutil/ws_printf.h
+++ b/wsutil/ws_printf.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2007 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __WS_PRINTF_H__

diff --git a/wsutil/wsgcrypt.c b/wsutil/wsgcrypt.c
index b390059e7b91a2c7f2e72d076ddf1e1daa7cae43..9e3a86055cda832627f2f6ca1ff398c1ba1c59d4 100644 (file)
--- a/wsutil/wsgcrypt.c
+++ b/wsutil/wsgcrypt.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
  */
 
 #include "wsgcrypt.h"

diff --git a/wsutil/wsgcrypt.h b/wsutil/wsgcrypt.h
index 8c4600c5deec4075a9fd025ad02d60d5ac431e62..2e764f6c9ec4fd4fbaabf27de014b1e689a88336 100644 (file)
--- a/wsutil/wsgcrypt.h
+++ b/wsutil/wsgcrypt.h
@@ -9,7 +9,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2007 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __WSGCRYPT_H__

diff --git a/wsutil/wsjsmn.c b/wsutil/wsjsmn.c
index e93224eecba50042effd56680aba4362b725e983..991bf667c29b644707739e3380b8049b0716ab37 100644 (file)
--- a/wsutil/wsjsmn.c
+++ b/wsutil/wsjsmn.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
  */
 
 #include "wsjsmn.h"

diff --git a/wsutil/wsjsmn.h b/wsutil/wsjsmn.h
index 14baa90811d655863b4d7cdbb0b17d77346705f6..0ef21ca41e33aa32d412fb4d870dd04c3ca4b5cf 100644 (file)
--- a/wsutil/wsjsmn.h
+++ b/wsutil/wsjsmn.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 __WSJSMN_H__

diff --git a/wsutil/wspcap.h b/wsutil/wspcap.h
index 53fd175c72c9e6b108c2d601cf6623c57ade0fcc..14788030444e9fd2b583baca7026d74c9685ccee 100644 (file)
--- a/wsutil/wspcap.h
+++ b/wsutil/wspcap.h
@@ -20,7 +20,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2007 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __WSPCAP_H__

diff --git a/wsutil/xtea.c b/wsutil/xtea.c
index 407b43366ff9959c6e516e91c18bbd79be0b8b2c..6b454f81d242808fad85690097e939856c12d4bf 100644 (file)
--- a/wsutil/xtea.c
+++ b/wsutil/xtea.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
  */
 
 #include <glib.h>

diff --git a/wsutil/xtea.h b/wsutil/xtea.h
index 22bd1a4d879c43794862c047830566186e5a2245..2cfeeefb4b6a46c899692dbbef9e0b628501f49b 100644 (file)
--- a/wsutil/xtea.h
+++ b/wsutil/xtea.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 __XTEA_H__