From 581c62dd493350cf9ed7c33ddad57cba1f2f471f Mon Sep 17 00:00:00 2001 From: Andrea Ciliberti Date: Wed, 5 Apr 2023 13:45:59 +0200 Subject: [PATCH 1/4] Fix licensing issues --- AUTHORS.md | 4 ---- README.md | 33 +++++---------------------------- ctru-rs/Cargo.toml | 2 +- ctru-sys/Cargo.toml | 2 +- 4 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 AUTHORS.md diff --git a/AUTHORS.md b/AUTHORS.md deleted file mode 100644 index ba0e0f0..0000000 --- a/AUTHORS.md +++ /dev/null @@ -1,4 +0,0 @@ -# Authors - - * [Eidolon](https://github.com/HybridEidolon) - * [FenrirWolf](https://github.com/FenrirWolf) diff --git a/README.md b/README.md index f719b4b..abd23dd 100644 --- a/README.md +++ b/README.md @@ -24,33 +24,10 @@ This repository is organized as follows: (displayed when built with `-vv`) will be issued if the build script detects a mismatch or is unable to check the installed `libctru` version. -## License +## Original version -Copyright (C) Rust 3DS Project authors, 2015-2016 - -See AUTHORS.md. - -As with the original ctrulib, this library is licensed under zlib. This -applies to every file in the tree, unless otherwise noted. - - 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. - - 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. - -Rust is primarily distributed under the terms of both the MIT license and the Apache License (Version 2.0), with portions covered by various BSD-like licenses. - -See [LICENSE-APACHE](https://github.com/rust-lang/rust/blob/master/LICENSE-APACHE), [LICENSE-MIT](https://github.com/rust-lang/rust/blob/master/LICENSE-MIT), and [COPYRIGHT](https://github.com/rust-lang/rust/blob/master/COPYRIGHT) for details. +This project is based on the efforts the original authors: + * [Eidolon](https://github.com/HybridEidolon) + * [FenrirWolf](https://github.com/FenrirWolf) +The old version is archived [here](https://github.com/rust3ds/ctru-rs-old). diff --git a/ctru-rs/Cargo.toml b/ctru-rs/Cargo.toml index d5bdff6..c06e4a5 100644 --- a/ctru-rs/Cargo.toml +++ b/ctru-rs/Cargo.toml @@ -1,5 +1,5 @@ [package] -authors = ["Ronald Kinard "] +authors = [ "Rust3DS Team", "Ronald Kinard " ] description = "A safe wrapper around smealum's ctrulib." license = "Zlib" name = "ctru-rs" diff --git a/ctru-sys/Cargo.toml b/ctru-sys/Cargo.toml index f7bf67b..6cbc641 100644 --- a/ctru-sys/Cargo.toml +++ b/ctru-sys/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ctru-sys" version = "21.2.0+2.1.2-1" -authors = ["Ronald Kinard "] +authors = [ "Rust3DS Team", "Ronald Kinard " ] license = "Zlib" links = "ctru" edition = "2021" From a71e1318490b1421ad0c0206162ee0ebe0764eeb Mon Sep 17 00:00:00 2001 From: Andrea Ciliberti Date: Wed, 5 Apr 2023 13:47:00 +0200 Subject: [PATCH 2/4] Add license file --- LICENSE | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c59f0a0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +As with the original ctrulib, this library is licensed under zlib. This +applies to every file in the tree, unless otherwise noted. + + 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. + + 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. \ No newline at end of file From 27d85582741d05c85b0964a635b9442dd2519560 Mon Sep 17 00:00:00 2001 From: Andrea Ciliberti Date: Wed, 5 Apr 2023 13:49:26 +0200 Subject: [PATCH 3/4] Rename org --- ctru-rs/Cargo.toml | 2 +- ctru-sys/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ctru-rs/Cargo.toml b/ctru-rs/Cargo.toml index c06e4a5..d8b095a 100644 --- a/ctru-rs/Cargo.toml +++ b/ctru-rs/Cargo.toml @@ -1,5 +1,5 @@ [package] -authors = [ "Rust3DS Team", "Ronald Kinard " ] +authors = [ "Rust3DS Org", "Ronald Kinard " ] description = "A safe wrapper around smealum's ctrulib." license = "Zlib" name = "ctru-rs" diff --git a/ctru-sys/Cargo.toml b/ctru-sys/Cargo.toml index 6cbc641..4e062bd 100644 --- a/ctru-sys/Cargo.toml +++ b/ctru-sys/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ctru-sys" version = "21.2.0+2.1.2-1" -authors = [ "Rust3DS Team", "Ronald Kinard " ] +authors = [ "Rust3DS Org", "Ronald Kinard " ] license = "Zlib" links = "ctru" edition = "2021" From d82ba961520215403d2d465d6cddc005eaf7a2ad Mon Sep 17 00:00:00 2001 From: Meziu <55318903+Meziu@users.noreply.github.com> Date: Wed, 5 Apr 2023 20:28:11 +0200 Subject: [PATCH 4/4] Restore copyright label --- LICENSE | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index c59f0a0..a53f9d0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,5 @@ +Copyright (C) Rust 3DS Project authors, 2015-2016 + As with the original ctrulib, this library is licensed under zlib. This applies to every file in the tree, unless otherwise noted. @@ -16,4 +18,4 @@ applies to every file in the tree, unless otherwise noted. 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. \ No newline at end of file + distribution.