diff options
author | David Lamparter <equinox@opensourcerouting.org> | 2023-02-08 13:21:36 +0100 |
---|---|---|
committer | David Lamparter <equinox@opensourcerouting.org> | 2023-02-09 14:09:07 +0100 |
commit | 47a3a8277038ccb042ef8f36eb59ce26bb7e9cdf (patch) | |
tree | c9c2a9503efa359cf70dcb2afe6b51b45712658d /tools | |
parent | *: sort out & explain licenses used in FRR (diff) | |
download | frr-47a3a8277038ccb042ef8f36eb59ce26bb7e9cdf.tar.xz frr-47a3a8277038ccb042ef8f36eb59ce26bb7e9cdf.zip |
*: manual SPDX License ID conversions
The files converted in this commit either had some random misspelling or
formatting weirdness that made them escape automated replacement, or
have a particularly "weird" licensing setup (e.g. dual-licensed.)
This also marks a bunch of "public domain" files as SPDX License "NONE".
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/build-debian-package.sh | 1 | ||||
-rwxr-xr-x | tools/checkpatch.pl | 2 | ||||
-rwxr-xr-x | tools/fixup-deprecated.py | 1 | ||||
-rw-r--r-- | tools/frr-llvm-cg.c | 26 | ||||
-rw-r--r-- | tools/frr-llvm-debuginfo.cpp | 25 | ||||
-rw-r--r-- | tools/frr-llvm-debuginfo.h | 25 | ||||
-rw-r--r-- | tools/frr.vim | 1 | ||||
-rwxr-xr-x | tools/frr_babeltrace.py | 15 | ||||
-rw-r--r-- | tools/gcc-plugins/frr-format.c | 18 | ||||
-rw-r--r-- | tools/gcc-plugins/frr-format.h | 18 | ||||
-rwxr-xr-x | tools/indent.py | 1 | ||||
-rwxr-xr-x | tools/nhrpd-event-handler.sh | 15 | ||||
-rw-r--r-- | tools/render_md.py | 1 | ||||
-rw-r--r-- | tools/start-stop-daemon.c | 1 | ||||
-rw-r--r-- | tools/stringmangle.py | 1 | ||||
-rw-r--r-- | tools/symalyzer.html | 1 | ||||
-rwxr-xr-x | tools/symalyzer.py | 1 | ||||
-rwxr-xr-x | tools/zc.pl | 18 |
18 files changed, 20 insertions, 151 deletions
diff --git a/tools/build-debian-package.sh b/tools/build-debian-package.sh index 3c922c355..d614ba01d 100755 --- a/tools/build-debian-package.sh +++ b/tools/build-debian-package.sh @@ -1,4 +1,5 @@ #!/bin/sh +# SPDX-License-Identifier: NONE # # Written by Daniil Baturin, 2018 # Rewritten by Ondřej Surý, 2020 diff --git a/tools/checkpatch.pl b/tools/checkpatch.pl index db6460f34..69eb0ef95 100755 --- a/tools/checkpatch.pl +++ b/tools/checkpatch.pl @@ -1,9 +1,9 @@ #!/usr/bin/env perl +# SPDX-License-Identifier: GPL-2.0-or-later # (c) 2001, Dave Jones. (the file handling bit) # (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit) # (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite) # (c) 2008-2010 Andy Whitcroft <apw@canonical.com> -# Licensed under the terms of the GNU GPL License version 2 use strict; use warnings; diff --git a/tools/fixup-deprecated.py b/tools/fixup-deprecated.py index 57f9df906..ad3ae54ab 100755 --- a/tools/fixup-deprecated.py +++ b/tools/fixup-deprecated.py @@ -1,5 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# SPDX-License-Identifier: NONE # # Script used to replace deprecated quagga/frr mactors/types/etc. # diff --git a/tools/frr-llvm-cg.c b/tools/frr-llvm-cg.c index 8ce754fec..51e8fb7b7 100644 --- a/tools/frr-llvm-cg.c +++ b/tools/frr-llvm-cg.c @@ -1,28 +1,4 @@ -// This is free and unencumbered software released into the public domain. -// -// Anyone is free to copy, modify, publish, use, compile, sell, or -// distribute this software, either in source code form or as a compiled -// binary, for any purpose, commercial or non-commercial, and by any -// means. -// -// In jurisdictions that recognize copyright laws, the author or authors -// of this software dedicate any and all copyright interest in the -// software to the public domain. We make this dedication for the benefit -// of the public at large and to the detriment of our heirs and -// successors. We intend this dedication to be an overt act of -// relinquishment in perpetuity of all present and future rights to this -// software under copyright law. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// -// For more information, please refer to <http://unlicense.org/> - +// SPDX-License-Identifier: Unlicense /* based on example code: https://github.com/sheredom/llvm_bc_parsing_example * which came under the above (un-)license. does not depend on any FRR * pieces, so no reason to change the license. diff --git a/tools/frr-llvm-debuginfo.cpp b/tools/frr-llvm-debuginfo.cpp index ed3ad956b..16ad18bed 100644 --- a/tools/frr-llvm-debuginfo.cpp +++ b/tools/frr-llvm-debuginfo.cpp @@ -1,27 +1,4 @@ -// This is free and unencumbered software released into the public domain. -// -// Anyone is free to copy, modify, publish, use, compile, sell, or -// distribute this software, either in source code form or as a compiled -// binary, for any purpose, commercial or non-commercial, and by any -// means. -// -// In jurisdictions that recognize copyright laws, the author or authors -// of this software dedicate any and all copyright interest in the -// software to the public domain. We make this dedication for the benefit -// of the public at large and to the detriment of our heirs and -// successors. We intend this dedication to be an overt act of -// relinquishment in perpetuity of all present and future rights to this -// software under copyright law. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// -// For more information, please refer to <http://unlicense.org/> +// SPDX-License-Identifier: Unlicense #include <llvm-c/BitReader.h> #include <llvm-c/BitWriter.h> diff --git a/tools/frr-llvm-debuginfo.h b/tools/frr-llvm-debuginfo.h index fca4bc1f9..4d2985cf7 100644 --- a/tools/frr-llvm-debuginfo.h +++ b/tools/frr-llvm-debuginfo.h @@ -1,27 +1,4 @@ -// This is free and unencumbered software released into the public domain. -// -// Anyone is free to copy, modify, publish, use, compile, sell, or -// distribute this software, either in source code form or as a compiled -// binary, for any purpose, commercial or non-commercial, and by any -// means. -// -// In jurisdictions that recognize copyright laws, the author or authors -// of this software dedicate any and all copyright interest in the -// software to the public domain. We make this dedication for the benefit -// of the public at large and to the detriment of our heirs and -// successors. We intend this dedication to be an overt act of -// relinquishment in perpetuity of all present and future rights to this -// software under copyright law. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// -// For more information, please refer to <http://unlicense.org/> +// SPDX-License-Identifier: Unlicense #ifndef _FRR_LLVM_DEBUGINFO_H #define _FRR_LLVM_DEBUGINFO_H diff --git a/tools/frr.vim b/tools/frr.vim index 7cc248f4c..19ac3fc99 100644 --- a/tools/frr.vim +++ b/tools/frr.vim @@ -1,3 +1,4 @@ +" SPDX-License-Identifier: NONE " settings & syntax hilighting for FRR codebase " 2019 by David Lamparter, placed in public domain diff --git a/tools/frr_babeltrace.py b/tools/frr_babeltrace.py index 27d830a11..4d974ad35 100755 --- a/tools/frr_babeltrace.py +++ b/tools/frr_babeltrace.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later """ Usage: frr_babeltrace.py trace_path @@ -9,20 +10,6 @@ that pretty printing. Copyright (C) 2021 NVIDIA Corporation Anuradha Karuppiah - -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; see the file COPYING; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA """ import ipaddress diff --git a/tools/gcc-plugins/frr-format.c b/tools/gcc-plugins/frr-format.c index 0a24b091a..2240a171b 100644 --- a/tools/gcc-plugins/frr-format.c +++ b/tools/gcc-plugins/frr-format.c @@ -1,24 +1,10 @@ +// SPDX-License-Identifier: GPL-3.0-or-later /* Check calls to formatted I/O functions (-Wformat). Copyright (C) 1992-2019 Free Software Foundation, Inc. Extended for FRR's printfrr() with Linux kernel style extensions Copyright (C) 2019-2020 David Lamparter, for NetDEF, Inc. - -This file is part of GCC. - -GCC 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 3, or (at your option) any later -version. - -GCC 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 GCC; see the file COPYING.GPLv3. If not see -<http://www.gnu.org/licenses/>. */ + */ #include "gcc-common.h" diff --git a/tools/gcc-plugins/frr-format.h b/tools/gcc-plugins/frr-format.h index 599dbc56f..373ef0724 100644 --- a/tools/gcc-plugins/frr-format.h +++ b/tools/gcc-plugins/frr-format.h @@ -1,21 +1,7 @@ +// SPDX-License-Identifier: GPL-3.0-or-later /* Check calls to formatted I/O functions (-Wformat). Copyright (C) 1992-2018 Free Software Foundation, Inc. - -This file is part of GCC. - -GCC 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 3, or (at your option) any later -version. - -GCC 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 GCC; see the file COPYING3. If not see -<http://www.gnu.org/licenses/>. */ + */ #ifndef GCC_C_FORMAT_H #define GCC_C_FORMAT_H diff --git a/tools/indent.py b/tools/indent.py index 61a0fd445..fe9eb7c25 100755 --- a/tools/indent.py +++ b/tools/indent.py @@ -1,5 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# SPDX-License-Identifier: NONE # 2017 by David Lamparter, placed in public domain import sys, re, subprocess, os diff --git a/tools/nhrpd-event-handler.sh b/tools/nhrpd-event-handler.sh index 5dce43fe8..e7eaf46f6 100755 --- a/tools/nhrpd-event-handler.sh +++ b/tools/nhrpd-event-handler.sh @@ -1,22 +1,9 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later # Author: Joe Maimon # Released to public domain # -# 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; see the file COPYING; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# PROGNAME=`basename $0` VERSION="0.0.6" diff --git a/tools/render_md.py b/tools/render_md.py index 7636496b6..80e26f341 100644 --- a/tools/render_md.py +++ b/tools/render_md.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# SPDX-License-Identifier: NONE # written 2016 by David Lamparter, placed in Public Domain. import sys, markdown diff --git a/tools/start-stop-daemon.c b/tools/start-stop-daemon.c index e196a372e..9f566bd1e 100644 --- a/tools/start-stop-daemon.c +++ b/tools/start-stop-daemon.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: NONE /* * A rewrite of the original Debian's start-stop-daemon Perl script * in C (faster - it is executed many times during system startup). diff --git a/tools/stringmangle.py b/tools/stringmangle.py index 1c75c86a0..29fcb86ea 100644 --- a/tools/stringmangle.py +++ b/tools/stringmangle.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: NONE # 2020 by David Lamparter, placed in the public domain. import sys diff --git a/tools/symalyzer.html b/tools/symalyzer.html index eefeee3b0..b136ce590 100644 --- a/tools/symalyzer.html +++ b/tools/symalyzer.html @@ -1,5 +1,6 @@ <html> <!-- + - SPDX-License-Identifier: NONE - 2019 by David Lamparter, placed in public domain --> <head> diff --git a/tools/symalyzer.py b/tools/symalyzer.py index ce0bfde0a..7d37a1a31 100755 --- a/tools/symalyzer.py +++ b/tools/symalyzer.py @@ -1,4 +1,5 @@ #!/usr/bin/python3 +# SPDX-License-Identifier: NONE # # 2019 by David Lamparter, placed in public domain # diff --git a/tools/zc.pl b/tools/zc.pl index 5307fa387..77af50085 100755 --- a/tools/zc.pl +++ b/tools/zc.pl @@ -1,24 +1,8 @@ #!/usr/bin/env perl +# SPDX-License-Identifier: GPL-2.0-or-later ## ## Zebra interactive console ## Copyright (C) 2000 Vladimir B. Grebenschikov <vova@express.ru> -## -## This file is part of GNU Zebra. -## -## GNU Zebra 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, or (at your option) any -## later version. -## -## GNU Zebra 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 GNU Zebra; see the file COPYING. If not, write to the -## Free Software Foundation, Inc., 59 Temple Place - Suite 330, -## Boston, MA 02111-1307, USA. use Net::Telnet (); use Getopt::Std; |