Compare commits

...

1 Commits

Author SHA1 Message Date
Cole Miller
6f0cd742b5 Bump oo7 to address panic 2024-12-29 21:17:58 -05:00
2 changed files with 21 additions and 117 deletions

133
Cargo.lock generated
View File

@@ -356,7 +356,7 @@ dependencies = [
"serde",
"serde_repr",
"url",
"zbus 5.1.1",
"zbus",
]
[[package]]
@@ -8420,15 +8420,14 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "oo7"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24"
version = "0.3.0"
source = "git+https://github.com/bilelmoussaoui/oo7?rev=9d20779#9d20779f1ad43a6678e08d22cc04c1080eca92ef"
dependencies = [
"aes",
"ashpd",
"async-fs 2.1.2",
"async-io 2.4.0",
"async-lock 3.4.0",
"async-net 2.0.0",
"blocking",
"cbc",
"cipher",
@@ -8436,6 +8435,7 @@ dependencies = [
"endi",
"futures-lite 2.5.0",
"futures-util",
"getrandom 0.2.15",
"hkdf",
"hmac",
"md-5",
@@ -8446,9 +8446,9 @@ dependencies = [
"serde",
"sha2",
"subtle",
"zbus 4.4.0",
"zbus",
"zeroize",
"zvariant 4.2.0",
"zvariant",
]
[[package]]
@@ -16076,44 +16076,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-executor",
"async-fs 2.1.2",
"async-io 2.4.0",
"async-lock 3.4.0",
"async-process 2.3.0",
"async-recursion 1.1.1",
"async-task",
"async-trait",
"blocking",
"enumflags2",
"event-listener 5.3.1",
"futures-core",
"futures-sink",
"futures-util",
"hex",
"nix",
"ordered-stream",
"rand 0.8.5",
"serde",
"serde_repr",
"sha1",
"static_assertions",
"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.1.1"
@@ -16145,22 +16107,9 @@ dependencies = [
"windows-sys 0.59.0",
"winnow",
"xdg-home",
"zbus_macros 5.1.1",
"zbus_names 4.1.0",
"zvariant 5.1.0",
]
[[package]]
name = "zbus_macros"
version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"syn 2.0.90",
"zvariant_utils 2.1.0",
"zbus_macros",
"zbus_names",
"zvariant",
]
[[package]]
@@ -16173,20 +16122,9 @@ dependencies = [
"proc-macro2",
"quote",
"syn 2.0.90",
"zbus_names 4.1.0",
"zvariant 5.1.0",
"zvariant_utils 3.0.2",
]
[[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]]
@@ -16198,7 +16136,7 @@ dependencies = [
"serde",
"static_assertions",
"winnow",
"zvariant 5.1.0",
"zvariant",
]
[[package]]
@@ -16757,19 +16695,6 @@ dependencies = [
"zune-core",
]
[[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.1.0"
@@ -16782,21 +16707,8 @@ dependencies = [
"static_assertions",
"url",
"winnow",
"zvariant_derive 5.1.0",
"zvariant_utils 3.0.2",
]
[[package]]
name = "zvariant_derive"
version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"syn 2.0.90",
"zvariant_utils 2.1.0",
"zvariant_derive",
"zvariant_utils",
]
[[package]]
@@ -16809,18 +16721,7 @@ dependencies = [
"proc-macro2",
"quote",
"syn 2.0.90",
"zvariant_utils 3.0.2",
]
[[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.90",
"zvariant_utils",
]
[[package]]

View File

@@ -148,7 +148,10 @@ pathfinder_geometry = "0.5"
[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
# Always used
flume = "0.11"
oo7 = "0.3.0"
# Unreleased fix for a panic: https://github.com/bilelmoussaoui/oo7/pull/172
oo7 = { git = "https://github.com/bilelmoussaoui/oo7", rev = "9d20779", default-features = false, features = [
"async-std", "native_crypto"
] }
# Used in both windowing options
ashpd = { workspace = true, optional = true }