diff options
author | Dario Lombardo <lomato@gmail.com> | 2018-02-07 12:26:45 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-02-08 14:57:36 +0000 |
commit | 8cd389e16166fa4c075fbddfe69f26653a0169b3 (patch) | |
tree | 1bea70a898b41c700cfe8f192dae3ba7e08b3626 /extcap | |
parent | bfd2dbcf25749d9f1481c479af4aab098069c303 (diff) |
replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.
The first is deprecated, as per https://spdx.org/licenses/.
Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed
Reviewed-on: https://code.wireshark.org/review/25661
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'extcap')
-rw-r--r-- | extcap/Makefile.am | 2 | ||||
-rw-r--r-- | extcap/androiddump.c | 2 | ||||
-rw-r--r-- | extcap/ciscodump.c | 2 | ||||
-rw-r--r-- | extcap/extcap-base.c | 2 | ||||
-rw-r--r-- | extcap/extcap-base.h | 2 | ||||
-rw-r--r-- | extcap/randpktdump.c | 2 | ||||
-rw-r--r-- | extcap/ssh-base.c | 2 | ||||
-rw-r--r-- | extcap/ssh-base.h | 2 | ||||
-rw-r--r-- | extcap/sshdump.c | 2 | ||||
-rw-r--r-- | extcap/udpdump.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/extcap/Makefile.am b/extcap/Makefile.am index 7784e414cb..6a4d7f39c7 100644 --- 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 2969a33cf7..ff163b1f83 100644 --- 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 1c8f40f33b..83e54a9b4f 100644 --- 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 e2ba0015a1..6ec654c790 100644 --- 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 5bb4f26217..264281577c 100644 --- 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 b45ea75645..754ffc4bb9 100644 --- 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 1799887d90..ac39134b20 100644 --- 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 76790e8791..8c81ac5c50 100644 --- 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 1872cce392..2217d6f3c7 100644 --- 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 44cc24e1db..5ea0addcc3 100644 --- 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" |