From 4826710bfc41e54a88b8c796735b311e5174d427 Mon Sep 17 00:00:00 2001 From: Andreas Dzialocha Date: Wed, 8 Sep 2021 16:13:00 +0200 Subject: [PATCH] Add SPDX license headers to all files, correct license to `AGPL-3.0-or-later` (#36) * Use published bamboo-rs-core crate, update dependencies * Add SPDX license headers to all files * Update LICENSE * Update license in README.md * Correct license in Cargo.toml --- LICENSE | 8 ++++---- README.md | 4 +--- aquadoggo/Cargo.toml | 2 +- aquadoggo/README.md | 2 +- aquadoggo/src/config.rs | 2 ++ aquadoggo/src/db/mod.rs | 2 ++ aquadoggo/src/db/models/entry.rs | 2 ++ aquadoggo/src/db/models/log.rs | 2 ++ aquadoggo/src/db/models/mod.rs | 2 ++ aquadoggo/src/errors.rs | 2 ++ aquadoggo/src/lib.rs | 2 ++ aquadoggo/src/rpc/api.rs | 2 ++ aquadoggo/src/rpc/methods/entry_args.rs | 2 ++ aquadoggo/src/rpc/methods/mod.rs | 2 ++ aquadoggo/src/rpc/methods/publish_entry.rs | 2 ++ aquadoggo/src/rpc/methods/query_entries.rs | 2 ++ aquadoggo/src/rpc/mod.rs | 2 ++ aquadoggo/src/rpc/request.rs | 2 ++ aquadoggo/src/rpc/response.rs | 2 ++ aquadoggo/src/rpc/server.rs | 2 ++ aquadoggo/src/runtime.rs | 2 ++ aquadoggo/src/task.rs | 2 ++ aquadoggo/src/test_helpers.rs | 2 ++ aquadoggo_cli/Cargo.toml | 10 +++++----- aquadoggo_cli/README.md | 2 +- aquadoggo_cli/src/main.rs | 2 ++ 26 files changed, 53 insertions(+), 15 deletions(-) diff --git a/LICENSE b/LICENSE index 0ad25db4b..d39a6949b 100644 --- a/LICENSE +++ b/LICENSE @@ -629,12 +629,12 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + aquadoggo, a p2panda reference node implementation. + Copyright (C) 2021 p2panda contributors This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, diff --git a/README.md b/README.md index 85b090986..2bc13ee7a 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,4 @@ $ cargo add aquadoggo ## License -GNU Affero General Public License v3.0 [`AGPL-3.0`] - -[`AGPL-3.0`]: LICENSE +GNU Affero General Public License v3.0 [`AGPL-3.0-or-later`](LICENSE) diff --git a/aquadoggo/Cargo.toml b/aquadoggo/Cargo.toml index 1cbee23e6..cb681bf46 100644 --- a/aquadoggo/Cargo.toml +++ b/aquadoggo/Cargo.toml @@ -7,7 +7,7 @@ authors = [ "sandreae ", "cafca " ] -license = "AGPL-3.0-only" +license = "AGPL-3.0-or-later" repository = "https://github.com/p2panda/aquadoggo" readme = "README.md" edition = "2018" diff --git a/aquadoggo/README.md b/aquadoggo/README.md index b50a036ef..16038603b 100644 --- a/aquadoggo/README.md +++ b/aquadoggo/README.md @@ -10,4 +10,4 @@ cargo test ## License -GNU Affero General Public License v3.0 `AGPL-3.0` +GNU Affero General Public License v3.0 [`AGPL-3.0-or-later`](LICENSE) diff --git a/aquadoggo/src/config.rs b/aquadoggo/src/config.rs index bc2274fb9..ed8e26447 100644 --- a/aquadoggo/src/config.rs +++ b/aquadoggo/src/config.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use std::fs; use std::path::PathBuf; diff --git a/aquadoggo/src/db/mod.rs b/aquadoggo/src/db/mod.rs index 603c53800..aab10789d 100644 --- a/aquadoggo/src/db/mod.rs +++ b/aquadoggo/src/db/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use anyhow::{Error, Result}; use sqlx::any::{Any, AnyPool, AnyPoolOptions}; use sqlx::migrate; diff --git a/aquadoggo/src/db/models/entry.rs b/aquadoggo/src/db/models/entry.rs index 97b039636..eff8af12a 100644 --- a/aquadoggo/src/db/models/entry.rs +++ b/aquadoggo/src/db/models/entry.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use p2panda_rs::entry::{EntrySigned, LogId, SeqNum}; use p2panda_rs::message::MessageEncoded; use p2panda_rs::hash::Hash; diff --git a/aquadoggo/src/db/models/log.rs b/aquadoggo/src/db/models/log.rs index 7d5610cc6..50826d787 100644 --- a/aquadoggo/src/db/models/log.rs +++ b/aquadoggo/src/db/models/log.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use p2panda_rs::entry::LogId; use p2panda_rs::identity::Author; use p2panda_rs::hash::Hash; diff --git a/aquadoggo/src/db/models/mod.rs b/aquadoggo/src/db/models/mod.rs index 7afe861eb..10c1b041a 100644 --- a/aquadoggo/src/db/models/mod.rs +++ b/aquadoggo/src/db/models/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + mod entry; mod log; diff --git a/aquadoggo/src/errors.rs b/aquadoggo/src/errors.rs index fbb8bc7a8..d88cb508b 100644 --- a/aquadoggo/src/errors.rs +++ b/aquadoggo/src/errors.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use p2panda_rs::entry::{EntryError, EntrySignedError}; use p2panda_rs::hash::HashError; use p2panda_rs::message::{MessageEncodedError, MessageError}; diff --git a/aquadoggo/src/lib.rs b/aquadoggo/src/lib.rs index c926c9d47..6451436cb 100644 --- a/aquadoggo/src/lib.rs +++ b/aquadoggo/src/lib.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + //! # aquadoggo #![warn( missing_copy_implementations, diff --git a/aquadoggo/src/rpc/api.rs b/aquadoggo/src/rpc/api.rs index e40b230ca..57d6ded45 100644 --- a/aquadoggo/src/rpc/api.rs +++ b/aquadoggo/src/rpc/api.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use std::sync::Arc; use jsonrpc_v2::{Data, MapRouter, Server as Service}; diff --git a/aquadoggo/src/rpc/methods/entry_args.rs b/aquadoggo/src/rpc/methods/entry_args.rs index 2bda0d4f5..3052b229e 100644 --- a/aquadoggo/src/rpc/methods/entry_args.rs +++ b/aquadoggo/src/rpc/methods/entry_args.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use bamboo_rs_core::entry::is_lipmaa_required; use jsonrpc_v2::{Data, Params}; use p2panda_rs::entry::SeqNum; diff --git a/aquadoggo/src/rpc/methods/mod.rs b/aquadoggo/src/rpc/methods/mod.rs index 4ecc8acd7..574e76b28 100644 --- a/aquadoggo/src/rpc/methods/mod.rs +++ b/aquadoggo/src/rpc/methods/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + mod entry_args; mod publish_entry; mod query_entries; diff --git a/aquadoggo/src/rpc/methods/publish_entry.rs b/aquadoggo/src/rpc/methods/publish_entry.rs index 18bc5ad8a..2b4ad6d13 100644 --- a/aquadoggo/src/rpc/methods/publish_entry.rs +++ b/aquadoggo/src/rpc/methods/publish_entry.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use jsonrpc_v2::{Data, Params}; use p2panda_rs::entry::decode_entry; use p2panda_rs::message::Message; diff --git a/aquadoggo/src/rpc/methods/query_entries.rs b/aquadoggo/src/rpc/methods/query_entries.rs index 28e3c0921..6cfa7f7bf 100644 --- a/aquadoggo/src/rpc/methods/query_entries.rs +++ b/aquadoggo/src/rpc/methods/query_entries.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use jsonrpc_v2::{Data, Params}; use p2panda_rs::Validate; diff --git a/aquadoggo/src/rpc/mod.rs b/aquadoggo/src/rpc/mod.rs index 32d022987..a10a37569 100644 --- a/aquadoggo/src/rpc/mod.rs +++ b/aquadoggo/src/rpc/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + mod api; mod methods; mod request; diff --git a/aquadoggo/src/rpc/request.rs b/aquadoggo/src/rpc/request.rs index 230dbdbb8..ee360a3bb 100644 --- a/aquadoggo/src/rpc/request.rs +++ b/aquadoggo/src/rpc/request.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use serde::Deserialize; use p2panda_rs::entry::EntrySigned; diff --git a/aquadoggo/src/rpc/response.rs b/aquadoggo/src/rpc/response.rs index 5af206062..ca509fe52 100644 --- a/aquadoggo/src/rpc/response.rs +++ b/aquadoggo/src/rpc/response.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use serde::Serialize; use crate::db::models::Entry; diff --git a/aquadoggo/src/rpc/server.rs b/aquadoggo/src/rpc/server.rs index a9dece904..fcd072045 100644 --- a/aquadoggo/src/rpc/server.rs +++ b/aquadoggo/src/rpc/server.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use async_std::stream::StreamExt; diff --git a/aquadoggo/src/runtime.rs b/aquadoggo/src/runtime.rs index 195371a7d..a255c61d7 100644 --- a/aquadoggo/src/runtime.rs +++ b/aquadoggo/src/runtime.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use anyhow::Result; use crate::config::Configuration; diff --git a/aquadoggo/src/task.rs b/aquadoggo/src/task.rs index 7b315d969..4c951e519 100644 --- a/aquadoggo/src/task.rs +++ b/aquadoggo/src/task.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use std::error::Error; use async_std::{future::Future, task}; diff --git a/aquadoggo/src/test_helpers.rs b/aquadoggo/src/test_helpers.rs index a0ff5b2f4..bc1244676 100644 --- a/aquadoggo/src/test_helpers.rs +++ b/aquadoggo/src/test_helpers.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use p2panda_rs::hash::Hash; use rand::Rng; use sqlx::any::Any; diff --git a/aquadoggo_cli/Cargo.toml b/aquadoggo_cli/Cargo.toml index 9ea671d99..ce3f5e1a0 100644 --- a/aquadoggo_cli/Cargo.toml +++ b/aquadoggo_cli/Cargo.toml @@ -2,12 +2,12 @@ name = "aquadoggo_cli" version = "0.1.0" authors = [ - "sophiiistika ", - "adz ", - "sandreae ", - "cafca " + "sophiiistika ", + "adz ", + "sandreae ", + "cafca " ] -license = "AGPL-3.0-only" +license = "AGPL-3.0-or-later" repository = "https://github.com/p2panda/aquadoggo" readme = "README.md" edition = "2018" diff --git a/aquadoggo_cli/README.md b/aquadoggo_cli/README.md index 736f07e41..b99156767 100644 --- a/aquadoggo_cli/README.md +++ b/aquadoggo_cli/README.md @@ -36,4 +36,4 @@ cargo build ## License -GNU Affero General Public License v3.0 `AGPL-3.0` +GNU Affero General Public License v3.0 [`AGPL-3.0-or-later`](LICENSE) diff --git a/aquadoggo_cli/src/main.rs b/aquadoggo_cli/src/main.rs index d9a47dc13..154608fb8 100644 --- a/aquadoggo_cli/src/main.rs +++ b/aquadoggo_cli/src/main.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + use async_ctrlc::CtrlC; use async_std::task; use structopt::StructOpt;