MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-05 04:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'update-deps' into 'master'

Browse Source 
Update deps

See merge request redox-os/redox!2390
This commit is contained in:
Jeremy Soller 2026-10-27 18:03:53 -06:00
commit a354367247
3 changed files with 521 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

892
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
Cargo.toml
View File

@ -48,7 +48,7 @@ redoxer = { git = "https://gitlab.redox-os.org/redox-os/redoxer.git", default-fe
regex = "1.11" regex = "1.11"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
termion = "4" termion = "4"
toml = "0.8" toml = "1"
walkdir = "2.3.1" walkdir = "2.3.1"
ansi-to-tui = { version = "8", optional = true } ansi-to-tui = { version = "8", optional = true }
strip-ansi-escapes = { version = "0.2.1", optional = true } strip-ansi-escapes = { version = "0.2.1", optional = true }

13
src/cook/cook_build.rs
View File

@ -9,7 +9,6 @@ use crate::cook::package::{package_source_paths, package_target};
use crate::cook::{fetch, fs, pty::PtyOut, script::*}; use crate::cook::{fetch, fs, pty::PtyOut, script::*};
use crate::recipe::BuildCompiler; use crate::recipe::BuildCompiler;
use crate::recipe::{AutoDeps, BuildKind, CookRecipe, OptionalPackageRecipe, Recipe}; use crate::recipe::{AutoDeps, BuildKind, CookRecipe, OptionalPackageRecipe, Recipe};
use std::io::Read;
use std::{ use std::{
collections::{BTreeSet, VecDeque}, collections::{BTreeSet, VecDeque},
path::{Path, PathBuf}, path::{Path, PathBuf},
@ -822,16 +821,14 @@ pub fn build_remote(
} }
fn hint_incorrect_pkey(logger: &PtyOut, source_pubkey: &Path, source_pkgar: &Path) -> Option<()> { fn hint_incorrect_pkey(logger: &PtyOut, source_pubkey: &Path, source_pkgar: &Path) -> Option<()> {
// TODO: Move to pkgar
let mut file = std::fs::File::open(source_pkgar).ok()?;
let mut buffer = vec![0u8; pkgar_core::HEADER_SIZE];
file.read_exact(&mut buffer).ok()?;
log_to_pty!( log_to_pty!(
logger, logger,
"DEBUG: Pkgar key mismatch, hint:\n - expected: {:?}\n - current: {:?}", "DEBUG: Pkgar key mismatch, hint:\n - expected: {:?}\n - current: {:?}",
blake3::Hash::from_bytes(unsafe { blake3::Hash::from_bytes(
pkgar_core::Header::new_unchecked(&buffer).ok()?.public_key pkgar_keys::PublicKeyFile::from_header_path(source_pkgar)
}) .ok()?
.pkey
)
.to_hex() .to_hex()
.to_string(), .to_string(),
blake3::Hash::from_bytes(PublicKeyFile::open(source_pubkey).ok()?.pkey) blake3::Hash::from_bytes(PublicKeyFile::open(source_pubkey).ok()?.pkey)