From c4bfe3357d5cd98f9d8bdd4aa7452701fb3268a0 Mon Sep 17 00:00:00 2001 From: DecDuck Date: Sun, 1 Mar 2026 22:21:23 +1100 Subject: [PATCH] fix: use renamed package --- libraries/droplet/Cargo.lock | 4 ++-- libraries/droplet/Cargo.toml | 2 +- libraries/droplet/libarchive-rust | 2 +- libraries/droplet/src/lib.rs | 2 +- libraries/droplet/src/versions/archive_backend.rs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/droplet/Cargo.lock b/libraries/droplet/Cargo.lock index 1de698f3..91ac71fa 100644 --- a/libraries/droplet/Cargo.lock +++ b/libraries/droplet/Cargo.lock @@ -258,7 +258,7 @@ dependencies = [ "getrandom 0.3.4", "hex", "humansize", - "libarchive", + "libarchive-drop", "rcgen", "ring", "serde", @@ -465,7 +465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] -name = "libarchive" +name = "libarchive-drop" version = "0.1.1" dependencies = [ "libarchive3-sys", diff --git a/libraries/droplet/Cargo.toml b/libraries/droplet/Cargo.toml index eb6ec359..2e21ce81 100644 --- a/libraries/droplet/Cargo.toml +++ b/libraries/droplet/Cargo.toml @@ -29,7 +29,7 @@ uuid = { version = "1.19.0", features = ["v4"] } sha2 = "0.10.9" futures = "0.3.31" getrandom = "0.3.4" -libarchive = { version = "*", path = "./libarchive-rust" } +libarchive-drop = { version = "*", path = "./libarchive-rust" } speedometer = "0.2.2" [dependencies.x509-parser] diff --git a/libraries/droplet/libarchive-rust b/libraries/droplet/libarchive-rust index 279fd5f7..c694faba 160000 --- a/libraries/droplet/libarchive-rust +++ b/libraries/droplet/libarchive-rust @@ -1 +1 @@ -Subproject commit 279fd5f727d5af50771cdfd660d657dff52c42f7 +Subproject commit c694faba63d2fc3d79c4fde70ebd699adcac9aae diff --git a/libraries/droplet/src/lib.rs b/libraries/droplet/src/lib.rs index 8ad90277..3459ecf0 100644 --- a/libraries/droplet/src/lib.rs +++ b/libraries/droplet/src/lib.rs @@ -7,7 +7,7 @@ pub mod versions; pub mod manifest; pub mod vm; -extern crate libarchive; +extern crate libarchive_drop; #[cfg(test)] pub mod tests; diff --git a/libraries/droplet/src/versions/archive_backend.rs b/libraries/droplet/src/versions/archive_backend.rs index 2f8633ad..5729d1cc 100644 --- a/libraries/droplet/src/versions/archive_backend.rs +++ b/libraries/droplet/src/versions/archive_backend.rs @@ -2,7 +2,7 @@ use std::{path::PathBuf, task::Poll}; use anyhow::{anyhow}; use async_trait::async_trait; -use libarchive::{ +use libarchive_drop::{ archive::{Entry, FileType, ReadCompression, ReadFormat}, reader::{Builder, FileReader, Reader}, };