summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2022-01-04 10:18:13 +0000
committerEmīls <emils@mullvad.net>2022-01-04 10:18:13 +0000
commit36c4800f92d385debaf3ca01ecda664c5c1ab11b (patch)
tree5328b7d595de5e9fa960579581bae748c88e05b5
parent85405bdf3fe64fdade01b417debbae7d908d0f8a (diff)
parent866617ba4946205ab98536bbea5e9c508e9e6d08 (diff)
downloadmullvadvpn-36c4800f92d385debaf3ca01ecda664c5c1ab11b.tar.xz
mullvadvpn-36c4800f92d385debaf3ca01ecda664c5c1ab11b.zip
Merge branch 'update-system-configuration'
-rw-r--r--Cargo.lock36
-rw-r--r--talpid-core/Cargo.toml2
2 files changed, 11 insertions, 27 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 40baf2d081..a3fdecbf56 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -244,32 +244,16 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]]
name = "core-foundation"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
-dependencies = [
- "core-foundation-sys 0.7.0",
- "libc",
-]
-
-[[package]]
-name = "core-foundation"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
dependencies = [
- "core-foundation-sys 0.8.2",
+ "core-foundation-sys",
"libc",
]
[[package]]
name = "core-foundation-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
-
-[[package]]
-name = "core-foundation-sys"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
@@ -2345,8 +2329,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467"
dependencies = [
"bitflags",
- "core-foundation 0.9.1",
- "core-foundation-sys 0.8.2",
+ "core-foundation",
+ "core-foundation-sys",
"libc",
"security-framework-sys",
]
@@ -2357,7 +2341,7 @@ version = "2.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"
dependencies = [
- "core-foundation-sys 0.8.2",
+ "core-foundation-sys",
"libc",
]
@@ -2578,22 +2562,22 @@ dependencies = [
[[package]]
name = "system-configuration"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4bc0637a2b8c0b1a5145cca3e21b707865edc7e32285771536af1ade129468"
+checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd"
dependencies = [
"bitflags",
- "core-foundation 0.7.0",
+ "core-foundation",
"system-configuration-sys",
]
[[package]]
name = "system-configuration-sys"
-version = "0.4.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "269e271436d8e4bb2621c535a11fe03d5d012f74b19af72f80288f3a72f6180a"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
dependencies = [
- "core-foundation-sys 0.7.0",
+ "core-foundation-sys",
"libc",
]
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index d10620f565..ed4cd9b4c1 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -69,7 +69,7 @@ internet-checksum = "0.2"
[target.'cfg(target_os = "macos")'.dependencies]
either = "1"
pfctl = "0.4.4"
-system-configuration = "0.4"
+system-configuration = "0.5"
trust-dns-server = { git = "https://github.com/mullvad/trust-dns", rev = "c782de0645335d1893a854337b965dd07790c068", features = [ "trust-dns-resolver" ] }
tun = "0.5.1"
subslice = "0.2"