From 5ee2b02221864aa495a06fe255a9564b7c6049dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 24 Jul 2024 13:41:30 +0400 Subject: [PATCH] chore: bump deps --- .cargo/config.toml | 4 +-- Cargo.lock | 72 ++++++++++++++++++++++------------------- qemu-display/Cargo.toml | 28 ++++++++-------- qemu-rdp/Cargo.toml | 6 ++-- qemu-vnc/Cargo.toml | 2 +- 5 files changed, 59 insertions(+), 53 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index b1b35b3..6c54740 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,6 +1,6 @@ [alias] xtask = "run --package xtask --" -[patch."https://github.com/Devolutions/IronRDP"] -ironrdp = { path = "../IronRDP/crates/ironrdp" } +#[patch."https://github.com/Devolutions/IronRDP"] +#ironrdp = { path = "../IronRDP/crates/ironrdp" } diff --git a/Cargo.lock b/Cargo.lock index a9400ba..bc4c4df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -794,9 +794,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "8f6b81fb3c84f5563d509c59b5a48d935f689e993afa90fe39047f05adef9142" dependencies = [ "clap_builder", "clap_derive 4.5.8", @@ -804,9 +804,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "5ca6706fd5224857d9ac5eb9355f6683563cc0541c7cd9d014043b57cbec78ac" dependencies = [ "anstream", "anstyle", @@ -2211,6 +2211,7 @@ checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" [[package]] name = "ironrdp" version = "0.5.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "ironrdp-cliprdr", "ironrdp-connector", @@ -2224,6 +2225,7 @@ dependencies = [ [[package]] name = "ironrdp-acceptor" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "ironrdp-async", "ironrdp-connector", @@ -2235,6 +2237,7 @@ dependencies = [ [[package]] name = "ironrdp-ainput" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "bitflags 2.6.0", "ironrdp-dvc", @@ -2246,6 +2249,7 @@ dependencies = [ [[package]] name = "ironrdp-async" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "bytes", "ironrdp-connector", @@ -2256,6 +2260,7 @@ dependencies = [ [[package]] name = "ironrdp-cliprdr" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "bitflags 2.6.0", "ironrdp-pdu", @@ -2267,6 +2272,7 @@ dependencies = [ [[package]] name = "ironrdp-connector" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "ironrdp-error", "ironrdp-pdu", @@ -2281,6 +2287,7 @@ dependencies = [ [[package]] name = "ironrdp-displaycontrol" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "ironrdp-dvc", "ironrdp-pdu", @@ -2291,6 +2298,7 @@ dependencies = [ [[package]] name = "ironrdp-dvc" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "ironrdp-pdu", "ironrdp-svc", @@ -2301,10 +2309,12 @@ dependencies = [ [[package]] name = "ironrdp-error" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" [[package]] name = "ironrdp-graphics" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "bit_field", "bitflags 2.6.0", @@ -2321,6 +2331,7 @@ dependencies = [ [[package]] name = "ironrdp-pdu" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "bit_field", "bitflags 2.6.0", @@ -2342,6 +2353,7 @@ dependencies = [ [[package]] name = "ironrdp-rdpsnd" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "bitflags 2.6.0", "ironrdp-pdu", @@ -2352,6 +2364,7 @@ dependencies = [ [[package]] name = "ironrdp-server" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "anyhow", "async-trait", @@ -2373,6 +2386,7 @@ dependencies = [ [[package]] name = "ironrdp-session" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "ironrdp-connector", "ironrdp-displaycontrol", @@ -2387,6 +2401,7 @@ dependencies = [ [[package]] name = "ironrdp-svc" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "bitflags 2.6.0", "ironrdp-pdu", @@ -2395,6 +2410,7 @@ dependencies = [ [[package]] name = "ironrdp-tokio" version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP#9410f5356b25d2eecc2cee1aed0804ecca4cf3f6" dependencies = [ "bytes", "ironrdp-async", @@ -2433,9 +2449,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -2683,13 +2699,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2833,21 +2850,11 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - [[package]] name = "object" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -3443,7 +3450,7 @@ dependencies = [ "anyhow", "async-trait", "bytes", - "clap 4.5.9", + "clap 4.5.10", "ironrdp", "keycodemap", "pixman-sys", @@ -3784,9 +3791,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.11" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "aws-lc-rs", "log 0.4.22", @@ -4343,28 +4350,27 @@ dependencies = [ [[package]] name = "tokio" -version = "1.38.1" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -4433,7 +4439,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.14", + "winnow 0.6.15", ] [[package]] @@ -5193,9 +5199,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374ec40a2d767a3c1b4972d9475ecd557356637be906f2cb3f7fe17a6eb5e22f" +checksum = "557404e450152cd6795bb558bca69e43c585055f4606e3bcae5894fc6dac9ba0" dependencies = [ "memchr", ] diff --git a/qemu-display/Cargo.toml b/qemu-display/Cargo.toml index 10d7eb9..68ae7f0 100644 --- a/qemu-display/Cargo.toml +++ b/qemu-display/Cargo.toml @@ -13,30 +13,30 @@ qmp = ["dep:qapi", "dep:base64"] tracing.workspace = true zbus.workspace = true cfg-if = "1.0" -derivative = "2.2.0" +derivative = "2.2" zvariant = { version = "4", features = ["serde_bytes"] } -libc = "0.2.155" +libc = "0.2" enumflags2 = { version = "0.7", features = ["serde"] } -serde = { version = "1.0.202", features = ["derive"] } -serde_repr = "0.1.19" -serde_bytes = "0.11.14" -futures-util = { version = "0.3.30", features = ["async-await-macro"] } +serde = { version = "1.0", features = ["derive"] } +serde_repr = "0.1" +serde_bytes = "0.11" +futures-util = { version = "0.3", features = ["async-await-macro"] } once_cell = "1.19" -futures = "0.3.30" +futures = "0.3" usbredirhost = "0.2" async-broadcast = "0.7" -async-trait = "0.1.80" -async-lock = "3.3.0" +async-trait = "0.1" +async-lock = "3.4" qapi = { version = "0.14", features = ["qmp"], optional = true } -base64 = { version = "0.22.1", optional = true } +base64 = { version = "0.22", optional = true } [target.'cfg(windows)'.dependencies] -uds_windows = "1.1.0" -windows = { version = "0.43.0", features = ["Win32_Networking_WinSock", "Win32_Foundation", "Win32_System_IO", "Win32_System_Threading"] } +uds_windows = "1.1" +windows = { version = "0.43", features = ["Win32_Networking_WinSock", "Win32_Foundation", "Win32_System_IO", "Win32_System_Threading"] } [target.'cfg(windows)'.dev-dependencies] -async-std = { version = "1.12.0", features = ["attributes"] } -tracing-subscriber = { version = "0.3.18", features = ["env-filter" , "fmt"], default-features = false } +async-std = { version = "1.12", features = ["attributes"] } +tracing-subscriber = { version = "0.3", features = ["env-filter" , "fmt"], default-features = false } [dev-dependencies] pixman-sys.workspace = true diff --git a/qemu-rdp/Cargo.toml b/qemu-rdp/Cargo.toml index a3a65c6..70ab243 100644 --- a/qemu-rdp/Cargo.toml +++ b/qemu-rdp/Cargo.toml @@ -7,14 +7,14 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -qemu-display = { path = "../qemu-display" } +qemu-display.workspace = true tracing.workspace = true +keycodemap.workspace = true tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } -keycodemap = { path = "../keycodemap" } bytes = "1.6" pixman-sys = "0.1.0" rustls-pemfile = "2.1" -tokio = { version = "1.37", features = ["full"] } +tokio = { version = "1.39", features = ["full"] } anyhow = "1.0" clap = { version = "4.5", features = ["derive", "cargo"] } async-trait = "0.1" diff --git a/qemu-vnc/Cargo.toml b/qemu-vnc/Cargo.toml index 5e91efb..e8316b8 100644 --- a/qemu-vnc/Cargo.toml +++ b/qemu-vnc/Cargo.toml @@ -16,4 +16,4 @@ libc = "0.2.155" image = "0.23.14" derivative = "2.2.0" async-io = "1.13.0" -async-trait = "0.1.80" +async-trait = "0.1.81"