summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2019-02-02 20:49:58 +0000
committerEmīls Piņķis <emils@mullvad.net>2019-02-04 15:58:43 +0000
commitc3b5f93095cfdb8a180fd13793d48a03fe0bb354 (patch)
tree01625767c77245b8fc2934745475f62d5f81fcbd
parent80a54659dd391472fa8d6268c0b0cc54973520a3 (diff)
downloadmullvadvpn-c3b5f93095cfdb8a180fd13793d48a03fe0bb354.tar.xz
mullvadvpn-c3b5f93095cfdb8a180fd13793d48a03fe0bb354.zip
Update ipnetwork to 0.14
-rw-r--r--Cargo.lock15
-rw-r--r--mullvad-types/Cargo.toml2
-rw-r--r--talpid-core/Cargo.toml2
-rw-r--r--talpid-types/Cargo.toml2
4 files changed, 15 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock
index ffe72fe10e..f368a20953 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -603,6 +603,14 @@ dependencies = [
]
[[package]]
+name = "ipnetwork"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "iproute2"
version = "0.0.2"
source = "git+https://github.com/mullvad/netlink?branch=best-effort-nla-parsing#132ab47bcbb32079ba4ededaa76a3d7b6257da40"
@@ -1117,7 +1125,7 @@ version = "0.1.0"
dependencies = [
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipnetwork 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"mullvad-paths 0.1.0",
@@ -1790,7 +1798,7 @@ dependencies = [
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipnetwork 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"iproute2 0.0.2 (git+https://github.com/mullvad/netlink?branch=best-effort-nla-parsing)",
"jsonrpc-core 8.0.2 (git+https://github.com/mullvad/jsonrpc?branch=mullvad-fork)",
"jsonrpc-macros 8.0.1 (git+https://github.com/mullvad/jsonrpc?branch=mullvad-fork)",
@@ -1867,7 +1875,7 @@ dependencies = [
"base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipnetwork 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -2439,6 +2447,7 @@ dependencies = [
"checksum ioctl-sys 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5e2c4b26352496eaaa8ca7cfa9bd99e93419d3f7983dc6e99c2a35fe9e33504a"
"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
"checksum ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d1d8b990621b5b0806fac3dbf71d1833a4c0a9e25702d10bd8b2c629c7ae01c"
+"checksum ipnetwork 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3d862c86f7867f19b693ec86765e0252d82e53d4240b9b629815675a0714ad1"
"checksum iproute2 0.0.2 (git+https://github.com/mullvad/netlink?branch=best-effort-nla-parsing)" = "<none>"
"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
"checksum jsonrpc-client-core 0.5.0 (git+https://github.com/mullvad/jsonrpc-client-rs?rev=e9dbdc80)" = "<none>"
diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml
index c0202ed1b6..3ea590c995 100644
--- a/mullvad-types/Cargo.toml
+++ b/mullvad-types/Cargo.toml
@@ -14,7 +14,7 @@ error-chain = "0.12"
log = "0.4"
regex = "1"
lazy_static = "1.1.0"
-ipnetwork = "0.13"
+ipnetwork = "0.14"
talpid-types = { path = "../talpid-types" }
mullvad-paths = { path = "../mullvad-paths" }
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index cc76d632e0..e8b92207ef 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -27,7 +27,7 @@ talpid-types = { path = "../talpid-types" }
[target.'cfg(unix)'.dependencies]
hex = "0.3"
-ipnetwork = "0.13"
+ipnetwork = "0.14"
lazy_static = "1.0"
tun = { git = "https://github.com/pinkisemils/rust-tun", branch = "add-raw-fd-traits" }
nix = "0.12"
diff --git a/talpid-types/Cargo.toml b/talpid-types/Cargo.toml
index f8023d8e86..9ef4fa89b3 100644
--- a/talpid-types/Cargo.toml
+++ b/talpid-types/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
serde = { version = "1.0", features = ["derive"] }
-ipnetwork = "0.13"
+ipnetwork = "0.14"
base64 = "0.10"
hex = "0.3"
error-chain = "0.12"