Skip to content

Commit

Permalink
Update bzip2-rs to 0.5.0 and switch to Rust backend implementation
Browse files Browse the repository at this point in the history
The bzip2-rs library now has a new maintainer (same folks that maintain
the sudo-rs project). Version 0.5.0 was recently released, which
includes some much needed bug fixes, but is missing one final one, so we
still need to keep our fork for now.

This commit also switches the backend implementation from the official C
implementation to a Rust implementation maintained by the bzip2-rs
folks. This leaves xz as the only C dependency remaining in avbroot.

Signed-off-by: Andrew Gunnerson <[email protected]>
  • Loading branch information
chenxiaolong committed Dec 12, 2024
1 parent 10e0748 commit d1b6bce
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
13 changes: 10 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions avbroot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ x509-cert = { version = "0.2.4", features = ["builder"] }
zerocopy = { version = "0.8.10", features = ["std"] }
zerocopy-derive = "0.8.5"

# There are multiple upstream bugs that cause infinite loops in the Drop
# implementation of write::BzDecoder. Unfortunately, the project is no longer
# maintained, so we have to maintain our own fork with the necessary fixes.
# https://github.com/trifectatechfoundation/bzip2-rs/pull/118
[dependencies.bzip2]
git = "https://github.com/chenxiaolong/bzip2-rs"
rev = "6e0f9836ec87b19261461b6cc1772e14aff8e851"
rev = "554b916bf68d246fe20b4c7da509d8a3c4e66e5f"
default-features = false
features = ["libbz2-rs-sys"]

# https://github.com/zip-rs/zip/pull/383
[dependencies.zip]
Expand Down
1 change: 1 addition & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ allow = [
"Apache-2.0",
"Apache-2.0 WITH LLVM-exception",
"BSD-3-Clause",
"bzip2-1.0.6",
"GPL-3.0",
"ISC",
"MIT",
Expand Down

0 comments on commit d1b6bce

Please sign in to comment.