summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <faern@faern.net>2021-08-12 11:14:16 +0200
committerLinus Färnstrand <faern@faern.net>2021-08-12 11:14:16 +0200
commit5eaf0c7aa973f99580703ffb533d421d8ad70857 (patch)
treed19cdcdb936e01bb39d9192287104d44e45f781f
parent13e71e065aea7a288a60fe3e6ed7ffc35d35e774 (diff)
downloadmullvadvpn-5eaf0c7aa973f99580703ffb533d421d8ad70857.tar.xz
mullvadvpn-5eaf0c7aa973f99580703ffb533d421d8ad70857.zip
Upgrade windows-service to 0.4.0
-rw-r--r--Cargo.lock50
-rw-r--r--mullvad-daemon/Cargo.toml2
2 files changed, 19 insertions, 33 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 62e1c46fbc..4205f6a56a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -492,20 +492,6 @@ checksum = "449aad22b1364e927ff3bf50f55404efd705c40065fb47f73f28704de707c89e"
[[package]]
name = "err-derive"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "err-derive"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcc7f65832b62ed38939f98966824eb6294911c3629b0e9a262bfb80836d9686"
@@ -1260,7 +1246,7 @@ dependencies = [
"chrono",
"clap",
"env_logger 0.8.2",
- "err-derive 0.3.0",
+ "err-derive",
"futures",
"itertools",
"mullvad-management-interface",
@@ -1285,7 +1271,7 @@ dependencies = [
"ctrlc",
"dirs-next",
"duct",
- "err-derive 0.3.0",
+ "err-derive",
"fern",
"futures",
"ipnetwork",
@@ -1320,7 +1306,7 @@ dependencies = [
name = "mullvad-exclude"
version = "2021.4.0"
dependencies = [
- "err-derive 0.3.0",
+ "err-derive",
"nix 0.19.1",
"talpid-types",
]
@@ -1329,7 +1315,7 @@ dependencies = [
name = "mullvad-jni"
version = "0.1.0"
dependencies = [
- "err-derive 0.3.0",
+ "err-derive",
"futures",
"ipnetwork",
"jnix",
@@ -1352,7 +1338,7 @@ dependencies = [
name = "mullvad-management-interface"
version = "0.1.0"
dependencies = [
- "err-derive 0.3.0",
+ "err-derive",
"futures",
"lazy_static",
"log",
@@ -1375,7 +1361,7 @@ name = "mullvad-paths"
version = "0.1.0"
dependencies = [
"dirs-next",
- "err-derive 0.3.0",
+ "err-derive",
"log",
]
@@ -1387,7 +1373,7 @@ dependencies = [
"dirs-next",
"duct",
"env_logger 0.8.2",
- "err-derive 0.3.0",
+ "err-derive",
"lazy_static",
"mullvad-paths",
"mullvad-rpc",
@@ -1406,7 +1392,7 @@ version = "0.1.0"
dependencies = [
"bytes 0.5.6",
"chrono",
- "err-derive 0.3.0",
+ "err-derive",
"filetime",
"futures",
"http",
@@ -1434,7 +1420,7 @@ version = "2021.4.0"
dependencies = [
"clap",
"env_logger 0.8.2",
- "err-derive 0.3.0",
+ "err-derive",
"lazy_static",
"mullvad-daemon",
"mullvad-management-interface",
@@ -1454,7 +1440,7 @@ name = "mullvad-types"
version = "0.1.0"
dependencies = [
"chrono",
- "err-derive 0.3.0",
+ "err-derive",
"ipnetwork",
"jnix",
"lazy_static",
@@ -1560,7 +1546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2453197ab3fcf147bf0ebd193557eeffa3998e6c84670eb8c9d86393bd09011f"
dependencies = [
"bitflags",
- "err-derive 0.3.0",
+ "err-derive",
"log",
"nftnl-sys",
]
@@ -2532,7 +2518,7 @@ dependencies = [
"cfg-if 1.0.0",
"chrono",
"duct",
- "err-derive 0.3.0",
+ "err-derive",
"failure",
"futures",
"hex",
@@ -2591,7 +2577,7 @@ name = "talpid-dbus"
version = "0.1.0"
dependencies = [
"dbus",
- "err-derive 0.3.0",
+ "err-derive",
"lazy_static",
"libc",
"log",
@@ -2604,7 +2590,7 @@ name = "talpid-openvpn-plugin"
version = "2021.4.0"
dependencies = [
"env_logger 0.8.2",
- "err-derive 0.3.0",
+ "err-derive",
"log",
"openvpn-plugin",
"parity-tokio-ipc",
@@ -2632,7 +2618,7 @@ name = "talpid-types"
version = "0.1.0"
dependencies = [
"base64",
- "err-derive 0.3.0",
+ "err-derive",
"ipnetwork",
"jnix",
"rand 0.7.3",
@@ -3204,12 +3190,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-service"
-version = "0.3.1"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdfb0437cd780b66551aa81b466470f1159b1878ed45438b738de8bc6e5012b6"
+checksum = "0c643e10139d127d30d6d753398c8a6f0a43532e8370f6c9d29ebbff29b984ab"
dependencies = [
"bitflags",
- "err-derive 0.2.4",
+ "err-derive",
"widestring",
"winapi 0.3.9",
]
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 008a9e90ad..811db6e3ab 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -49,7 +49,7 @@ simple-signal = "1.1"
[target.'cfg(windows)'.dependencies]
ctrlc = "3.0"
duct = "0.13"
-windows-service = "0.3"
+windows-service = "0.4"
winapi = { version = "0.3", features = ["errhandlingapi", "handleapi", "libloaderapi", "ntlsa", "synchapi", "tlhelp32", "winbase", "winerror", "winuser"] }
dirs-next = "2.0"