Przeglądaj źródła

Update licenses and Cargo files for troll-patrol

onyinyang 1 rok temu
rodzic
commit
4c2c19d7e9
5 zmienionych plików z 528 dodań i 63 usunięć
  1. 517 40
      Cargo.lock
  2. 1 0
      Cargo.toml
  3. 2 1
      LICENSE
  4. 8 1
      crates/troll-patrol/Cargo.toml
  5. 0 21
      crates/troll-patrol/LICENSE

Plik diff jest za duży
+ 517 - 40
Cargo.lock


+ 1 - 0
Cargo.toml

@@ -11,6 +11,7 @@ members = [
     "crates/lox-utils",
     "crates/lox-wasm",
     "crates/rdsys-backend-api",
+    "crates/troll-patrol",
     ]
 
 resolver = "2"

+ 2 - 1
LICENSE

@@ -1,7 +1,8 @@
 MIT (Expat) License
 
 Copyright (c) 2022 Ian Goldberg and Lindsey Tulloch
-Copyright (c) 2023 The Tor Project, Inc.
+Copyright (c) 2023-2024 The Tor Project, Inc.
+Copyright (c) 2023 Vecna
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

+ 8 - 1
crates/troll-patrol/Cargo.toml

@@ -1,7 +1,14 @@
 [package]
 name = "troll-patrol"
+authors = ["Vecna <vvecna@uwaterloo.ca>"]
 version = "0.1.0"
 edition = "2021"
+description = "Troll Patrol Bridge Blocking Dection System"
+license = "MIT"
+keywords = ["tor", "troll patrol", "bridges","blocking"]
+repository = "https://gitlab.torproject.org/tpo/anti-censorship/lox/-/tree/main/crates/troll-patrol"
+readme = "README.md"
+
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -24,7 +31,7 @@ hyper-rustls = "0.26.0"
 hyper-util = { version = "0.1", features = ["full"] }
 julianday = "1.2.0"
 lazy_static = "1"
-lox-library = { git = "https://gitlab.torproject.org/vecna/lox.git", version = "0.1.0" }
+lox-library = { path = "../lox-library", version = "0.2.0" }
 memory-stats = { version = "1.0.0", optional = true }
 nalgebra = "0.29"
 rand = { version = "0.8" }

+ 0 - 21
crates/troll-patrol/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Ivy Vecna
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-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 OR COPYRIGHT HOLDERS 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.

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików