From 765015131124bd54492bbda11aadb75a1fa3b60f Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Mon, 12 Feb 2018 14:07:48 +0100 Subject: [PATCH] more SPDX convertions. Change-Id: I6b8404c28b31a81767a3b64ffe9ba96156c4c217 Reviewed-on: https://code.wireshark.org/review/25757 Petri-Dish: Dario Lombardo Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/capture_dissectors.c | 14 +------------- epan/capture_dissectors.h | 14 +------------- tools/rdps.py | 14 +------------- wiretap/file_wrappers.c | 15 +-------------- 4 files changed, 4 insertions(+), 53 deletions(-) diff --git a/epan/capture_dissectors.c b/epan/capture_dissectors.c index c837461082..7ffc3d2def 100644 --- a/epan/capture_dissectors.c +++ b/epan/capture_dissectors.c @@ -5,19 +5,7 @@ * By Gerald Combs * Copyright 1998 Gerald Combs * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/epan/capture_dissectors.h b/epan/capture_dissectors.h index d413ebc93e..599de2dd04 100644 --- a/epan/capture_dissectors.h +++ b/epan/capture_dissectors.h @@ -5,19 +5,7 @@ * By Gerald Combs * Copyright 1998 Gerald Combs * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CAPTURE_DISSECTORS_H__ diff --git a/tools/rdps.py b/tools/rdps.py index a5aad46d42..38127c57b3 100755 --- a/tools/rdps.py +++ b/tools/rdps.py @@ -6,19 +6,7 @@ # By Gerald Combs # Copyright 1998 Gerald Combs # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# SPDX-License-Identifier: GPL-2.0-or-later # '''\ diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c index 4f426a20ec..9855717a21 100644 --- a/wiretap/file_wrappers.c +++ b/wiretap/file_wrappers.c @@ -10,21 +10,8 @@ * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler * under licence: * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. + * SPDX-License-Identifier: Zlib * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. */ #include