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>

15 files changed, 15 insertions, 15 deletions

diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c
index 916ef60863..e29996a222 100644
--- 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 f47965c32f..23199366fa 100644
--- 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 2993843c13..7d892c5c53 100644
--- 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 a84670746c..f2e494af71 100644
--- 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 393a8c3e6e..faed73d0fe 100644
--- 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 2583f9890a..5e5c6568d8 100644
--- 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 321d645744..2dc75f6ba2 100644
--- 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 ccb6bad820..e0bbc44623 100644
--- 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 0318e59074..8e42b64761 100644
--- 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 79d6f29153..8814258e0a 100644
--- 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 d1d4411e9b..9db48e6b0c 100644
--- 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 1079d362bc..e486413243 100644
--- 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 830007b199..672967e08c 100644
--- 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 c303a623e8..11e80a9205 100644
--- 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 a1e394fc91..a8b28ccf36 100644
--- 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__