Replace `tokio-tar` with `krata-tokio-tar` fork (#7271)

## Summary

Replace the unmaintained `tokio-tar` crate with the `krata-tokio-tar`
fork. The latter just merged a fix necessary for the crate to work on
PowerPC, and has better chances of future maintenance.

Fixes #3423

## Test Plan

`cargo test`
This commit is contained in:
Michał Górny 2024-09-10 23:28:53 +02:00 committed by GitHub
parent cc3259be5f
commit 4b7fed84eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 18 deletions

33
Cargo.lock generated
View File

@ -1923,6 +1923,22 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "krata-tokio-tar"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8bd5fee9b96acb5fc36b401896d601e6fdcce52b0e651ce24a3b21fb524e79f"
dependencies = [
"filetime",
"futures-core",
"libc",
"portable-atomic",
"redox_syscall 0.3.5",
"tokio",
"tokio-stream",
"xattr",
]
[[package]]
name = "kurbo"
version = "0.8.3"
@ -4073,21 +4089,6 @@ dependencies = [
"tokio-util",
]
[[package]]
name = "tokio-tar"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75"
dependencies = [
"filetime",
"futures-core",
"libc",
"redox_syscall 0.3.5",
"tokio",
"tokio-stream",
"xattr",
]
[[package]]
name = "tokio-util"
version = "0.7.11"
@ -4835,6 +4836,7 @@ dependencies = [
"distribution-filename",
"fs-err",
"futures",
"krata-tokio-tar",
"md-5",
"pypi-types",
"rayon",
@ -4843,7 +4845,6 @@ dependencies = [
"sha2",
"thiserror",
"tokio",
"tokio-tar",
"tokio-util",
"tracing",
"xz2",

View File

@ -102,6 +102,7 @@ indoc = { version = "2.0.4" }
itertools = { version = "0.13.0" }
jiff = { version = "0.1.6", features = ["serde"] }
junction = { version = "1.0.0" }
krata-tokio-tar = { version = "0.4.2" }
mailparse = { version = "0.15.0" }
md-5 = { version = "0.10.6" }
memchr = { version = "2.7.4" }
@ -144,7 +145,6 @@ thiserror = { version = "1.0.56" }
tl = { git = "https://github.com/charliermarsh/tl.git", rev = "6e25b2ee2513d75385101a8ff9f591ef51f314ec" }
tokio = { version = "1.35.1", features = ["fs", "io-util", "macros", "process", "signal", "sync"] }
tokio-stream = { version = "0.1.14" }
tokio-tar = { version = "0.3.1" }
tokio-util = { version = "0.7.10", features = ["compat"] }
toml = { version = "0.8.12" }
toml_edit = { version = "0.22.13" }

View File

@ -20,6 +20,7 @@ async-compression = { workspace = true, features = ["bzip2", "gzip", "zstd", "xz
async_zip = { workspace = true }
fs-err = { workspace = true, features = ["tokio"] }
futures = { workspace = true }
krata-tokio-tar = { workspace = true }
md-5 = { workspace = true }
rayon = { workspace = true }
reqwest = { workspace = true }
@ -27,7 +28,6 @@ rustc-hash = { workspace = true }
sha2 = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
tokio-tar = { workspace = true }
tokio-util = { workspace = true, features = ["compat"] }
tracing = { workspace = true }
xz2 = { workspace = true, features = ["static"] }