From e08da9757099af3d275c122c9379d46a037eb309 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 13 Nov 2017 01:00:26 +0900 Subject: Fix/Update copyright notices; Add SPDX annotation Let's fix some erroneous/accidential references to wrong license, update copyright information where applicable and introduce a SPDX-License-Identifier to all files. Change-Id: I39af26c6aaaf5c926966391f6565fc5936be21af --- src/vty/buffer.c | 2 ++ src/vty/command.c | 6 ++++++ src/vty/fsm_vty.c | 2 ++ src/vty/logging_vty.c | 2 ++ src/vty/stats_vty.c | 4 +++- src/vty/talloc_ctx_vty.c | 2 ++ src/vty/telnet_interface.c | 5 ++++- src/vty/utils.c | 3 +++ src/vty/vector.c | 2 ++ src/vty/vty.c | 3 ++- 10 files changed, 28 insertions(+), 3 deletions(-) (limited to 'src/vty') diff --git a/src/vty/buffer.c b/src/vty/buffer.c index 1935aa11..e68e3a20 100644 --- a/src/vty/buffer.c +++ b/src/vty/buffer.c @@ -3,6 +3,8 @@ /* * Copyright (C) 1998 Kunihiro Ishiguro * + * SPDX-License-Identifier: GPL-2.0+ + * * This file is part of GNU Zebra. * * GNU Zebra is free software; you can redistribute it and/or modify diff --git a/src/vty/command.c b/src/vty/command.c index 98d86d24..5f7a42c3 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -3,6 +3,12 @@ Command interpreter routine for virtual terminal [aka TeletYpe] Copyright (C) 1997, 98, 99 Kunihiro Ishiguro + Copyright (C) 2010-2011 Holger Hans Peter Freyther + Copyright (C) 2012 Sylvain Munaut + Copyright (C) 2013,2015 Harald Welte + Copyright (C) 2013,2017 sysmocom - s.f.m.c. GmbH + + SPDX-License-Identifier: GPL-2.0+ This file is part of GNU Zebra. diff --git a/src/vty/fsm_vty.c b/src/vty/fsm_vty.c index 50c7fd52..8abb9c92 100644 --- a/src/vty/fsm_vty.c +++ b/src/vty/fsm_vty.c @@ -2,6 +2,8 @@ * (C) 2016 by Harald Welte * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * 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 diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 9b7d10af..215394f0 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -3,6 +3,8 @@ * (C) 2009-2014 by Holger Hans Peter Freyther * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * 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 diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index 2ccbf668..6c09c38e 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -1,9 +1,11 @@ /* * (C) 2009-2010 by Harald Welte * (C) 2009-2014 by Holger Hans Peter Freyther - * (C) 2015 by Sysmocom s.f.m.c. GmbH + * (C) 2015 by sysmocom - s.f.m.c. GmbH * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * 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 diff --git a/src/vty/talloc_ctx_vty.c b/src/vty/talloc_ctx_vty.c index 136a1b40..601b6965 100644 --- a/src/vty/talloc_ctx_vty.c +++ b/src/vty/talloc_ctx_vty.c @@ -5,6 +5,8 @@ * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * 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 diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c index 40154fef..0ccf8dc6 100644 --- a/src/vty/telnet_interface.c +++ b/src/vty/telnet_interface.c @@ -1,6 +1,9 @@ -/* (C) 2009 by Holger Hans Peter Freyther +/* (C) 2009-2010 by Holger Hans Peter Freyther + * (C) 2010 by Sylvain Munaut * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * 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 diff --git a/src/vty/utils.c b/src/vty/utils.c index e7aeb889..8cd0b35a 100644 --- a/src/vty/utils.c +++ b/src/vty/utils.c @@ -2,9 +2,12 @@ * Utility routines for printing common objects in the Osmocom world. */ /* * (C) 2009-2010 by Harald Welte + * (C) 2013,2015 by sysmocom - s.f.m.c. GmbH * * All Rights Reserved * + * SPDX-License-Identifier: GPL-2.0+ + * * 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 diff --git a/src/vty/vector.c b/src/vty/vector.c index ee07cbd2..f9e5ec3e 100644 --- a/src/vty/vector.c +++ b/src/vty/vector.c @@ -3,6 +3,8 @@ /* * Copyright (C) 1997 Kunihiro Ishiguro * + * SPDX-License-Identifier: GPL-2.0+ + * * This file is part of GNU Zebra. * * GNU Zebra is free software; you can redistribute it and/or modify it diff --git a/src/vty/vty.c b/src/vty/vty.c index aef73b3a..e741a66a 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -22,7 +22,7 @@ * * \section sec_copyright Copyright and License * Copyright © 1997-2007 - Kuninhiro Ishiguro\n - * Copyright © 2008-2011 - Harald Welte, Holger Freyther and contributors\n + * Copyright © 2008-2012 - Harald Welte, Holger Freyther and contributors\n * All rights reserved. \n\n * The source code of libosmovty is licensed under the terms of the GNU * General Public License as published by the Free Software Foundation; @@ -46,6 +46,7 @@ * */ +/* SPDX-License-Identifier: GPL-2.0+ */ #include #include -- cgit v1.2.3