summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2022-02-15 11:22:05 +0100
committerLinus Färnstrand <linus@mullvad.net>2022-02-15 11:22:05 +0100
commita2fa8be6135eff710bdf71d0150ee9ef30f7b434 (patch)
tree6e7e3b1ce797b329e17b41287b7fd4f57fcc7262
parenta9db5d6ef3e0cb0bf1e5720ee6cd6c3ece0eba40 (diff)
parentcbb89f5fe43ec797bc2a7f8331d7981faa6c763b (diff)
downloadmullvadvpn-a2fa8be6135eff710bdf71d0150ee9ef30f7b434.tar.xz
mullvadvpn-a2fa8be6135eff710bdf71d0150ee9ef30f7b434.zip
Merge branch 'fix-minimal-versions'
-rw-r--r--Cargo.lock20
-rw-r--r--mullvad-cli/Cargo.toml4
-rw-r--r--mullvad-daemon/Cargo.toml4
-rw-r--r--mullvad-exclude/Cargo.toml2
-rw-r--r--mullvad-jni/Cargo.toml2
-rw-r--r--mullvad-management-interface/Cargo.toml2
-rw-r--r--mullvad-paths/Cargo.toml2
-rw-r--r--mullvad-problem-report/Cargo.toml2
-rw-r--r--mullvad-rpc/Cargo.toml4
-rw-r--r--mullvad-setup/Cargo.toml2
-rw-r--r--mullvad-types/Cargo.toml4
-rw-r--r--talpid-core/Cargo.toml8
-rw-r--r--talpid-dbus/Cargo.toml2
-rw-r--r--talpid-openvpn-plugin/Cargo.toml2
-rw-r--r--talpid-types/Cargo.toml2
15 files changed, 31 insertions, 31 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 0ae972964d..c0d8da579d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -517,9 +517,9 @@ checksum = "449aad22b1364e927ff3bf50f55404efd705c40065fb47f73f28704de707c89e"
[[package]]
name = "err-derive"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcc7f65832b62ed38939f98966824eb6294911c3629b0e9a262bfb80836d9686"
+checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e"
dependencies = [
"proc-macro-error",
"proc-macro2",
@@ -1290,9 +1290,9 @@ dependencies = [
[[package]]
name = "mnl"
-version = "0.2.0"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6efb50a48dbacd112e7e847b9847fa530ec4a473ba6322a2f82c42ef333e226"
+checksum = "d1a5469630da93e1813bb257964c0ccee3b26b6879dd858039ddec35cc8681ed"
dependencies = [
"libc",
"log",
@@ -1301,9 +1301,9 @@ dependencies = [
[[package]]
name = "mnl-sys"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5302035599c722b3a5b92a6502ff73c501dc6d100c53b89f0fae0cb932a37122"
+checksum = "9750685b201e1ecfaaf7aa5d0387829170fa565989cc481b49080aa155f70457"
dependencies = [
"libc",
"pkg-config",
@@ -1611,9 +1611,9 @@ dependencies = [
[[package]]
name = "nftnl"
-version = "0.6.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2453197ab3fcf147bf0ebd193557eeffa3998e6c84670eb8c9d86393bd09011f"
+checksum = "e9201688bd0bc571dfa4c21ce0a525480c8b782776cf88e12571fa89108dd920"
dependencies = [
"bitflags",
"err-derive",
@@ -1623,9 +1623,9 @@ dependencies = [
[[package]]
name = "nftnl-sys"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de1b9f700ed2553ce1c7bcef72fb6d52e56cdf2bd6ef74ceb0cef89800fe153"
+checksum = "26b5c587b6a5e76a3a5d51e0a757ae66dbff38c277563485807ae979ce361b56"
dependencies = [
"cfg-if 1.0.0",
"libc",
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index c26170ba6c..da023d9375 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -13,9 +13,9 @@ path = "src/main.rs"
[dependencies]
base64 = "0.13"
-chrono = { version = "0.4", features = ["serde"] }
+chrono = { version = "0.4.19", features = ["serde"] }
clap = { version = "3.0", features = ["cargo"] }
-err-derive = "0.3.0"
+err-derive = "0.3.1"
env_logger = "0.8.2"
futures = "0.3"
natord = "1.0.9"
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index efc214809e..0dbe6572eb 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -9,9 +9,9 @@ publish = false
[dependencies]
cfg-if = "1.0"
-chrono = { version = "0.4", features = ["serde"] }
+chrono = { version = "0.4.19", features = ["serde"] }
clap = { version = "3.0", features = ["cargo"] }
-err-derive = "0.3.0"
+err-derive = "0.3.1"
either = "1"
fern = { version = "0.6", features = ["colored"] }
futures = "0.3"
diff --git a/mullvad-exclude/Cargo.toml b/mullvad-exclude/Cargo.toml
index f753cf604e..a7568de367 100644
--- a/mullvad-exclude/Cargo.toml
+++ b/mullvad-exclude/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
[target.'cfg(target_os = "linux")'.dependencies]
nix = "0.23"
-err-derive = "0.3.0"
+err-derive = "0.3.1"
talpid-types = { path = "../talpid-types" }
diff --git a/mullvad-jni/Cargo.toml b/mullvad-jni/Cargo.toml
index 78b9eec17b..bcb9c69443 100644
--- a/mullvad-jni/Cargo.toml
+++ b/mullvad-jni/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
crate_type = ["cdylib"]
[target.'cfg(target_os = "android")'.dependencies]
-err-derive = "0.3.0"
+err-derive = "0.3.1"
futures = "0.3"
ipnetwork = "0.16"
jnix = { version = "0.4", features = ["derive"] }
diff --git a/mullvad-management-interface/Cargo.toml b/mullvad-management-interface/Cargo.toml
index 91f341b8b9..d17eba82d9 100644
--- a/mullvad-management-interface/Cargo.toml
+++ b/mullvad-management-interface/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
publish = false
[dependencies]
-err-derive = "0.3.0"
+err-derive = "0.3.1"
mullvad-types = { path = "../mullvad-types" }
mullvad-paths = { path = "../mullvad-paths" }
talpid-types = { path = "../talpid-types" }
diff --git a/mullvad-paths/Cargo.toml b/mullvad-paths/Cargo.toml
index 439aa3f236..64d9e277dc 100644
--- a/mullvad-paths/Cargo.toml
+++ b/mullvad-paths/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
publish = false
[dependencies]
-err-derive = "0.3.0"
+err-derive = "0.3.1"
log = "0.4"
[target.'cfg(any(windows, target_os = "macos"))'.dependencies]
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index cfbf358f52..a8e658dd08 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
clap = { version = "3.0", features = ["cargo"] }
dirs-next = "2.0"
env_logger = "0.8.2"
-err-derive = "0.3.0"
+err-derive = "0.3.1"
lazy_static = "1.0"
log = "0.4"
regex = "1.0"
diff --git a/mullvad-rpc/Cargo.toml b/mullvad-rpc/Cargo.toml
index 05c8933c0d..88d47d25aa 100644
--- a/mullvad-rpc/Cargo.toml
+++ b/mullvad-rpc/Cargo.toml
@@ -12,8 +12,8 @@ publish = false
api-override = []
[dependencies]
-chrono = { version = "0.4", features = ["serde"] }
-err-derive = "0.3.0"
+chrono = { version = "0.4.19", features = ["serde"] }
+err-derive = "0.3.1"
futures = "0.3"
http = "0.2"
hyper = { version = "0.14", features = ["client", "stream"] }
diff --git a/mullvad-setup/Cargo.toml b/mullvad-setup/Cargo.toml
index 65b9f101a7..b997a027f9 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -14,7 +14,7 @@ path = "src/main.rs"
[dependencies]
clap = { version = "3.0", features = ["cargo"] }
env_logger = "0.8.2"
-err-derive = "0.3.0"
+err-derive = "0.3.1"
lazy_static = "1.1.0"
mullvad-management-interface = { path = "../mullvad-management-interface" }
diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml
index b8e2131a83..94a48c5538 100644
--- a/mullvad-types/Cargo.toml
+++ b/mullvad-types/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2021"
publish = false
[dependencies]
-chrono = { version = "0.4", features = ["serde"] }
-err-derive = "0.3.0"
+chrono = { version = "0.4.19", features = ["serde"] }
+err-derive = "0.3.1"
ipnetwork = "0.16"
lazy_static = "1.1.0"
log = "0.4"
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 97d5d3dc54..2bb9d56a9b 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -13,7 +13,7 @@ async-trait = "0.1"
atty = "0.2"
cfg-if = "1.0"
duct = "0.13"
-err-derive = "0.3.0"
+err-derive = "0.3.1"
futures = "0.3.15"
hex = "0.4"
ipnetwork = "0.16"
@@ -27,7 +27,7 @@ shell-escape = "0.1"
talpid-types = { path = "../talpid-types" }
uuid = { version = "0.8", features = ["v4"] }
zeroize = "1"
-chrono = "0.4"
+chrono = "0.4.19"
tokio = { version = "1.8", features = [ "process", "rt-multi-thread", "fs" ] }
tokio-stream = { version = "0.1", features = [ "io-util" ] }
rand = "0.7"
@@ -58,8 +58,8 @@ netlink-packet-route = "0.8"
netlink-proto = "0.7"
netlink-sys = "0.7"
byteorder = "1"
-nftnl = { version = "0.6", features = ["nftnl-1-1-0"] }
-mnl = { version = "0.2.0", features = ["mnl-1-0-4"] }
+nftnl = { version = "0.6.2", features = ["nftnl-1-1-0"] }
+mnl = { version = "0.2.2", features = ["mnl-1-0-4"] }
which = { version = "4.0", default-features = false }
tun = "0.5.1"
talpid-dbus = { path = "../talpid-dbus" }
diff --git a/talpid-dbus/Cargo.toml b/talpid-dbus/Cargo.toml
index 9160c4980e..5a8dd150f0 100644
--- a/talpid-dbus/Cargo.toml
+++ b/talpid-dbus/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
[target.'cfg(target_os = "linux")'.dependencies]
dbus = "0.9"
-err-derive = "0.3.0"
+err-derive = "0.3.1"
lazy_static = "1.0"
log = "0.4"
libc = "0.2"
diff --git a/talpid-openvpn-plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml
index 1ff75f60f5..36473689d7 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
crate-type = ["cdylib"]
[dependencies]
-err-derive = "0.3.0"
+err-derive = "0.3.1"
log = "0.4"
env_logger = "0.8.2"
parity-tokio-ipc = "0.9"
diff --git a/talpid-types/Cargo.toml b/talpid-types/Cargo.toml
index 33c62e3244..8275e054b0 100644
--- a/talpid-types/Cargo.toml
+++ b/talpid-types/Cargo.toml
@@ -13,7 +13,7 @@ ipnetwork = "0.16"
base64 = "0.13"
x25519-dalek = { version = "1.1", features = [ "std", "u64_backend" ], default-features = false }
rand = "0.7"
-err-derive = "0.3.0"
+err-derive = "0.3.1"
[target.'cfg(target_os = "android")'.dependencies]
jnix = { version = "0.4", features = ["derive"] }