summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock6
-rw-r--r--deny.toml14
-rw-r--r--talpid-core/Cargo.toml4
3 files changed, 14 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock
index e284d11659..70bea27236 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1244,7 +1244,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "hickory-proto"
version = "0.24.0"
-source = "git+https://github.com/hickory-dns/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802"
+source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802"
dependencies = [
"async-recursion",
"async-trait",
@@ -1269,7 +1269,7 @@ dependencies = [
[[package]]
name = "hickory-resolver"
version = "0.24.0"
-source = "git+https://github.com/hickory-dns/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802"
+source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802"
dependencies = [
"cfg-if",
"futures-util",
@@ -1290,7 +1290,7 @@ dependencies = [
[[package]]
name = "hickory-server"
version = "0.24.0"
-source = "git+https://github.com/hickory-dns/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802"
+source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802"
dependencies = [
"async-trait",
"bytes",
diff --git a/deny.toml b/deny.toml
index dc4e883844..f4237c8859 100644
--- a/deny.toml
+++ b/deny.toml
@@ -103,11 +103,15 @@ skip-tree = []
unknown-registry = "deny"
unknown-git = "deny"
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
-# If we need to temporarily depend on a git repository in our Rust dependency tree,
-# it has to be added here. We should try to keep this list minimal. Having git
-# dependencies is not recommended.
-# TODO: Remove git dependency for hickory-dns after new release
-allow-git = ["https://github.com/hickory-dns/hickory-dns"]
+
+# We should never depend on git repositories outside our own github organization.
+# We can't say anything about their availability. They might go away at any point
+# in time. Instead of using third party git repositories, always fork the repository
+# into our github organization and depend on that.
+#
+# But if possible, always avoid git dependencies and try to have the developers publish
+# releases to crates.io instead.
+allow-git = []
[sources.allow-org]
# 1 or more github.com organizations to allow git sources for
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 8883aa4727..da10c68513 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -51,8 +51,8 @@ duct = "0.13"
pfctl = "0.4.4"
subslice = "0.2"
system-configuration = "0.5.1"
-hickory-proto = { git = "https://github.com/hickory-dns/hickory-dns", rev = "9e8f8c67fbcb6d2985503027362a3fb022529802" }
-hickory-server = { git = "https://github.com/hickory-dns/hickory-dns", rev = "9e8f8c67fbcb6d2985503027362a3fb022529802", features = ["resolver"] }
+hickory-proto = { git = "https://github.com/mullvad/hickory-dns", rev = "9e8f8c67fbcb6d2985503027362a3fb022529802" }
+hickory-server = { git = "https://github.com/mullvad/hickory-dns", rev = "9e8f8c67fbcb6d2985503027362a3fb022529802", features = ["resolver"] }
[target.'cfg(windows)'.dependencies]
bitflags = "1.2"