diff --git a/Cargo.toml b/Cargo.toml index 7995fd173..bc3ca8a84 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -197,7 +197,7 @@ security-framework = "3" libc = "0.2" [target.'cfg(target_os = "linux")'.dependencies] -secret-service = { version = "4", features = ["rt-tokio-crypto-rust"] } +secret-service = { version = "5", features = ["rt-tokio-crypto-rust"] } zbus = "5" [dev-dependencies] diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 0df36a2bf..a2e81c8ff 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -484,7 +484,7 @@ dependencies = [ "wasmparser 0.220.1", "wasmtime", "wasmtime-wasi", - "zbus 5.18.0", + "zbus", "zip", ] @@ -3764,19 +3764,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.13.1", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.31.3" @@ -5379,7 +5366,7 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.31.3", + "nix", "radix_trie", "rustyline-derive", "unicode-segmentation", @@ -5472,21 +5459,21 @@ dependencies = [ [[package]] name = "secret-service" -version = "4.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d35ad99a181be0a60ffcbe85d680d98f87bdc4d7644ade319b87076b9dbfd4" +checksum = "9a62d7f86047af0077255a29494136b9aaaf697c76ff70b8e49cded4e2623c14" dependencies = [ "aes", "cbc", "futures-util", "generic-array", + "getrandom 0.2.17", "hkdf 0.12.4", "num", "once_cell", - "rand 0.8.7", "serde", "sha2 0.10.9", - "zbus 4.4.0", + "zbus", ] [[package]] @@ -5881,12 +5868,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strict" version = "0.2.0" @@ -8081,16 +8062,6 @@ dependencies = [ "rustix 1.1.4", ] -[[package]] -name = "xdg-home" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "yoke" version = "0.8.3" @@ -8114,39 +8085,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "zbus" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" -dependencies = [ - "async-broadcast", - "async-process", - "async-recursion", - "async-trait", - "enumflags2", - "event-listener", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.29.0", - "ordered-stream", - "rand 0.8.7", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros 4.4.0", - "zbus_names 3.0.0", - "zvariant 4.2.0", -] - [[package]] name = "zbus" version = "5.18.0" @@ -8172,27 +8110,15 @@ dependencies = [ "rustix 1.1.4", "serde", "serde_repr", + "tokio", "tracing", "uds_windows", "uuid", "windows-sys 0.61.2", "winnow 1.0.4", - "zbus_macros 5.18.0", - "zbus_names 4.3.4", - "zvariant 5.13.1", -] - -[[package]] -name = "zbus_macros" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" -dependencies = [ - "proc-macro-crate 3.5.0", - "proc-macro2", - "quote", - "syn 2.0.119", - "zvariant_utils 2.1.0", + "zbus_macros", + "zbus_names", + "zvariant", ] [[package]] @@ -8205,20 +8131,9 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.119", - "zbus_names 4.3.4", - "zvariant 5.13.1", - "zvariant_utils 3.5.0", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant 4.2.0", + "zbus_names", + "zvariant", + "zvariant_utils", ] [[package]] @@ -8229,7 +8144,7 @@ checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e" dependencies = [ "serde", "winnow 1.0.4", - "zvariant 5.13.1", + "zvariant", ] [[package]] @@ -8413,19 +8328,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "zvariant" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "zvariant_derive 4.2.0", -] - [[package]] name = "zvariant" version = "5.13.1" @@ -8436,21 +8338,8 @@ dependencies = [ "enumflags2", "serde", "winnow 1.0.4", - "zvariant_derive 5.13.1", - "zvariant_utils 3.5.0", -] - -[[package]] -name = "zvariant_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" -dependencies = [ - "proc-macro-crate 3.5.0", - "proc-macro2", - "quote", - "syn 2.0.119", - "zvariant_utils 2.1.0", + "zvariant_derive", + "zvariant_utils", ] [[package]] @@ -8463,18 +8352,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.119", - "zvariant_utils 3.5.0", -] - -[[package]] -name = "zvariant_utils" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", + "zvariant_utils", ] [[package]]