From 8aead91532b116f40649ae7e9c1b7d15fbd67a4f Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Mon, 30 Sep 2019 15:21:19 +0300 Subject: Add SPDX-License-Identifier. --- COPYING | 14 ----- Cargo.toml | 2 +- LICENSE | 165 +++++++++++++++++++++++++++++++++++++++++++++++++ LICENSE.LGPL3 | 165 ------------------------------------------------- dist/procd/wgconfd | 3 + src/config.rs | 4 +- src/fileutil.rs | 4 ++ src/main.rs | 4 +- src/manager/builder.rs | 4 +- src/manager/mod.rs | 4 +- src/manager/updater.rs | 4 +- src/model.rs | 4 +- src/model/ip.rs | 4 +- src/proto.rs | 4 +- src/wg.rs | 4 +- 15 files changed, 191 insertions(+), 198 deletions(-) delete mode 100644 COPYING create mode 100644 LICENSE delete mode 100644 LICENSE.LGPL3 diff --git a/COPYING b/COPYING deleted file mode 100644 index aca2a6a..0000000 --- a/COPYING +++ /dev/null @@ -1,14 +0,0 @@ -wgconfd is free software: you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. - -wgconfd 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 Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License (a file named "LICENSE.LGPL3") and a copy of the GNU General -Public License (a file named "LICESNSE.GPL3") along with wgconfd. -If not, see . diff --git a/Cargo.toml b/Cargo.toml index c604eeb..65a9de8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "wgconfd" version = "0.2.0" edition = "2018" authors = [ "Hristo Venev " ] -license = "LGPL-3.0" +license = "LGPL-3.0-or-later" description = "A configuration manager for WireGuard" repository = "https://git.venev.name/hristo/wgconfd" readme = "README.md" diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0a04128 --- /dev/null +++ b/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/LICENSE.LGPL3 b/LICENSE.LGPL3 deleted file mode 100644 index 0a04128..0000000 --- a/LICENSE.LGPL3 +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/dist/procd/wgconfd b/dist/procd/wgconfd index 9cfd438..41718c5 100755 --- a/dist/procd/wgconfd +++ b/dist/procd/wgconfd @@ -1,4 +1,7 @@ #!/bin/sh /etc/rc.common +# SPDX-License-Identifier: LGPL-3.0-or-later +# +# Copyright 2019 Hristo Venev START=50 STOP=50 diff --git a/src/config.rs b/src/config.rs index 95e80a8..b755739 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use crate::model::{Ipv4Set, Ipv6Set, Key}; use serde_derive; diff --git a/src/fileutil.rs b/src/fileutil.rs index 0bbafc0..0d76dfe 100644 --- a/src/fileutil.rs +++ b/src/fileutil.rs @@ -1,3 +1,7 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +// +// Copyright 2019 Hristo Venev + use std::ffi::OsString; #[cfg(unix)] use std::os::unix::fs::OpenOptionsExt; diff --git a/src/main.rs b/src/main.rs index 731357f..0a6e356 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev #![deny(rust_2018_idioms)] diff --git a/src/manager/builder.rs b/src/manager/builder.rs index a5f04f2..037d2a9 100644 --- a/src/manager/builder.rs +++ b/src/manager/builder.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use super::Source; use crate::{config, model, proto}; diff --git a/src/manager/mod.rs b/src/manager/mod.rs index 9afce72..0d180a6 100644 --- a/src/manager/mod.rs +++ b/src/manager/mod.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use crate::{config, fileutil, model, proto, wg}; use std::ffi::OsString; diff --git a/src/manager/updater.rs b/src/manager/updater.rs index 67ed953..0245e95 100644 --- a/src/manager/updater.rs +++ b/src/manager/updater.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use super::Source; use crate::{config, fileutil, proto}; diff --git a/src/model.rs b/src/model.rs index 90f9b44..8ae4f6a 100644 --- a/src/model.rs +++ b/src/model.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev // FIXME: arrayref needs to silence this per-expression #![allow(clippy::eval_order_dependence)] diff --git a/src/model/ip.rs b/src/model/ip.rs index 490dada..602c1aa 100644 --- a/src/model/ip.rs +++ b/src/model/ip.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use serde; use std::iter::{FromIterator, IntoIterator}; diff --git a/src/proto.rs b/src/proto.rs index 07717b7..9421e53 100644 --- a/src/proto.rs +++ b/src/proto.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use crate::model::{Endpoint, Ipv4Net, Ipv6Net, Key}; use serde_derive; diff --git a/src/wg.rs b/src/wg.rs index 004e6d8..c210974 100644 --- a/src/wg.rs +++ b/src/wg.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use crate::{fileutil, model}; use std::ffi::{OsStr, OsString}; -- cgit