chore: replace rust-lzma with liblzma

The reason for this is to have an lzma dependency, which supports vendoring.
trustification · Jul 11, 2024 · cf8372a · cf8372a
1 parent 5d160d1
commit cf8372a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,6 +63,7 @@ itertools = "0.13"
 jsn = "0.14"
 jsonpath-rust = "0.6.1"
 lenient_semver = "0.4.2"
+liblzma = "0.3"
 libz-sys = "*"
 log = "0.4.19"
 native-tls = "0.2"
@@ -84,7 +85,6 @@ regex = "1.10.3"
 reqwest = "0.12"
 ring = "0.17.8"
 rstest = "0.21"
-rust-lzma = "0.6.0"
 sbom-walker = { version = "0.8.6", default-features = false, features = ["crypto-openssl", "cyclonedx-bom", "spdx-rs"] }
 schemars = "0.8"
 sea-orm = "0.12"

diff --git a/test-context/Cargo.toml b/test-context/Cargo.toml
@@ -8,16 +8,17 @@ trustify-common = { workspace = true }
 trustify-migration = { workspace = true }
 trustify-module-ingestor = { workspace = true }
 trustify-module-storage = { workspace = true }
-test-context = { workspace = true }
-postgresql_embedded = { workspace = true }
-tracing = { workspace = true }
+
 anyhow = { workspace = true }
-rust-lzma = { workspace = true }
+futures = { workspace = true }
+liblzma = { workspace = true }
 log = { workspace = true }
+postgresql_embedded = { workspace = true }
+test-context = { workspace = true }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
 tokio-util = { workspace = true }
-futures = { workspace = true }
+tracing = { workspace = true }
 
 [dev-dependencies]
 #chrono = { workspace = true }

diff --git a/test-context/src/lib.rs b/test-context/src/lib.rs
@@ -55,7 +55,7 @@ impl TrustifyContext {
         let mut bytes = Vec::new();
         file.read_to_end(&mut bytes).await?;
         if path.ends_with(".xz") {
-            bytes = lzma::decompress(&bytes)?;
+            bytes = liblzma::decode_all(&*bytes)?;
         }
         Ok(Bytes::copy_from_slice(&bytes))
     }

diff --git a/trustd/Cargo.toml b/trustd/Cargo.toml
@@ -22,6 +22,7 @@ url = { workspace = true }
 
 openssl = { workspace = true }
 libz-sys = { workspace = true }
+liblzma = { workspace = true }
 
 [dev-dependencies]
 temp-env = { workspace = true }
@@ -36,7 +37,8 @@ vendored = [
     "openssl/vendored",
     # when using a vendored approach, we need to statically link zlib, otherwise we get some strange linker error
     #   unresolvable R_AARCH64_ADR_PREL_PG_HI21 relocation against symbol `__stack_chk_guard@@GLIBC_2.17'
-    "libz-sys/static"
+    "libz-sys/static",
+    "liblzma/static",
 ]
 pm = [
     "garage-door",