Version 2.0.3

Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>

CHANGELOG.md

@@ -7,6 +7,12 @@
     to update the actual links at the bottom of the file.
 -->
 
+### Version 2.0.3
+
+* Upgrade xz version in precompiled binaries ([Issue #138], [PR #139 @chenxiaolong])
+    * This fixes the `ota extract` and `ota verify` commands in some multithreaded situations.
+* Add `--version` option to print out avbroot's version ([Issue #138], [PR #140 @chenxiaolong])
+
 ### Version 2.0.2
 
 * Fix `data_offset` being set for payload operations that don't need it ([PR #136 @chenxiaolong])
@@ -26,8 +32,11 @@ Behind-the-scenes changes:
 * Initial Rust release. The old Python implementation can be found in the `python` branch. ([PR #130 @chenxiaolong])
 
 <!-- Do not manually edit the lines below. Use `cargo xtask update-changelog` to regenerate. -->
+[Issue #138]: https://github.com/chenxiaolong/avbroot/issues/138
 [PR #130 @chenxiaolong]: https://github.com/chenxiaolong/avbroot/pull/130
 [PR #132 @chenxiaolong]: https://github.com/chenxiaolong/avbroot/pull/132
 [PR #135 @chenxiaolong]: https://github.com/chenxiaolong/avbroot/pull/135
 [PR #136 @chenxiaolong]: https://github.com/chenxiaolong/avbroot/pull/136
 [PR #137 @chenxiaolong]: https://github.com/chenxiaolong/avbroot/pull/137
+[PR #139 @chenxiaolong]: https://github.com/chenxiaolong/avbroot/pull/139
+[PR #140 @chenxiaolong]: https://github.com/chenxiaolong/avbroot/pull/140

Cargo.lock

@@ -105,7 +105,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "avbroot"
-version = "2.0.2"
+version = "2.0.3"
 dependencies = [
  "anyhow",
  "assert_matches",
@@ -483,7 +483,7 @@ dependencies = [
 
 [[package]]
 name = "e2e"
-version = "2.0.2"
+version = "2.0.3"
 dependencies = [
  "anyhow",
  "avbroot",
@@ -926,8 +926,7 @@ dependencies = [
 [[package]]
 name = "lzma-sys"
 version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
+source = "git+https://github.com/chenxiaolong/xz2-rs?rev=fe2050b9c3395db15d8610f1dabb505440c1a556#fe2050b9c3395db15d8610f1dabb505440c1a556"
 dependencies = [
  "cc",
  "libc",
@@ -2253,7 +2252,7 @@ dependencies = [
 
 [[package]]
 name = "xtask"
-version = "2.0.2"
+version = "2.0.3"
 dependencies = [
  "anyhow",
  "clap",
@@ -2268,8 +2267,7 @@ dependencies = [
 [[package]]
 name = "xz2"
 version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
+source = "git+https://github.com/chenxiaolong/xz2-rs?rev=fe2050b9c3395db15d8610f1dabb505440c1a556#fe2050b9c3395db15d8610f1dabb505440c1a556"
 dependencies = [
  "lzma-sys",
 ]

Cargo.toml

@@ -4,7 +4,7 @@ members = ["avbroot", "e2e", "xtask"]
 resolver = "2"
 
 [workspace.package]
-version = "2.0.2"
+version = "2.0.3"
 license = "GPL-3.0-only"
 edition = "2021"
 repository = "https://github.com/chenxiaolong/avbroot"

avbroot/Cargo.toml

@@ -44,7 +44,6 @@ thiserror = "1.0.47"
 toml_edit = { version = "0.19.14", features = ["serde"] }
 topological-sort = "0.2.2"
 x509-cert = { version = "0.2.4", features = ["builder"] }
-xz2 = "0.1.7"
 
 # There's an upstream bug that causes an infinite loop in the write::BzDecoder
 # destructor if the decoder is fed invalid data. While this never happens during
@@ -55,6 +54,14 @@ xz2 = "0.1.7"
 git = "https://github.com/jongiddy/bzip2-rs"
 rev = "2aefcb4d3634de1df226c73d93f758d65228bb8c"
 
+# The upstream xz2 crate uses an old version of liblzma when compiling with the
+# `static` feature and doesn't enable all of the encoders and decoders. This
+# causes certain payload data to fail to decompress.
+# https://github.com/chenxiaolong/avbroot/issues/138
+[dependencies.xz2]
+git = "https://github.com/chenxiaolong/xz2-rs"
+rev = "fe2050b9c3395db15d8610f1dabb505440c1a556"
+
 # https://github.com/zip-rs/zip/pull/383
 [dependencies.zip]
 git = "https://github.com/chenxiaolong/zip"

avbroot/src/cli/args.rs

@@ -28,6 +28,7 @@ pub enum Command {
 }
 
 #[derive(Debug, Parser)]
+#[command(version)]
 pub struct Cli {
     #[command(subcommand)]
     pub command: Command,

deny.toml

@@ -35,6 +35,7 @@ deny = [
 unknown-registry = "deny"
 unknown-git = "deny"
 allow-git = [
+    "https://github.com/chenxiaolong/xz2-rs",
     "https://github.com/chenxiaolong/zip",
     "https://github.com/jongiddy/bzip2-rs",
 ]

modules/clearotacerts/module.prop

@@ -1,6 +1,6 @@
 id=com.chiller3.avbroot.clearotacerts
 name=clearotacerts
-version=v2.0.2
-versionCode=131074
+version=v2.0.3
+versionCode=131075
 author=chenxiaolong
 description=Block A/B OTAs by clearing verification certificates

modules/oemunlockonboot/module.prop

@@ -1,6 +1,6 @@
 id=com.chiller3.avbroot.oemunlockonboot
 name=oemunlockonboot
-version=v2.0.2
-versionCode=131074
+version=v2.0.3
+versionCode=131075
 author=chenxiaolong
 description=Enable OEM unlocking on every boot