Skip to content

Commit 6bf99e2

Browse files
committed
Update dependencies to suppress cargo audit and deprecated code warnings
Also, fix CI: Atheris fails to compile with fresh Python on latest Ubuntu 24.04
1 parent af9e9e4 commit 6bf99e2

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

.github/workflows/amd64.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ jobs:
1919
run: cargo build --all-features --verbose
2020
- name: Run tests
2121
run: |
22+
sudo add-apt-repository ppa:deadsnakes/ppa
2223
sudo apt update && sudo apt install -y gdb pip curl python3.10-dev llvm \
2324
openjdk-17-jdk ca-certificates gnupg
24-
pip3 install atheris
25+
python3.10 -m pip install atheris
2526
sudo mkdir -p /etc/apt/keyrings
2627
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
2728
export NODE_MAJOR=20

.github/workflows/coverage.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ jobs:
1717
- uses: actions/checkout@v4
1818
- name: Install Dependences
1919
run: |
20+
sudo add-apt-repository ppa:deadsnakes/ppa
2021
sudo apt update && sudo apt install -y gdb pip curl python3.10-dev llvm \
2122
openjdk-17-jdk ca-certificates gnupg
22-
pip3 install atheris
23+
python3.10 -m pip install atheris
2324
sudo mkdir -p /etc/apt/keyrings
2425
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
2526
export NODE_MAJOR=20

casr/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ chrono = "0.4"
1818
goblin = "0.8"
1919
log = "0.4"
2020
simplelog = "0.12"
21-
cursive = { version = "0.20", default-features = false, features = ["termion-backend"] }
22-
cursive_tree_view = "0.8"
21+
cursive = { version = "0.21", default-features = false, features = ["termion-backend"] }
22+
cursive_tree_view = "0.9"
2323
gdb-command = "0.7"
2424
nix = "0.26"
2525
rayon = "1.10"
2626
num_cpus = "1.16"
2727
is_executable = "1.0"
28-
linux-personality = "1.0"
28+
linux-personality = "2.0"
2929
colored = "2.0"
3030
serde = { version = "1.0", features = ["derive"] }
3131
serde_json = "1.0"

casr/src/bin/casr-cli.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ fn build_tree_report(
385385
}
386386

387387
for line in report.disassembly.iter() {
388-
tree.insert_item(line.clone(), Placement::LastChild, row);
388+
tree.insert_item(line.replace('\t', " "), Placement::LastChild, row);
389389
}
390390
}
391391

@@ -627,7 +627,10 @@ fn build_slider_report(
627627
});
628628

629629
if !report.disassembly.is_empty() {
630-
state.push_str(&format!("\n{}", &report.disassembly.join("\n")));
630+
state.push_str(&format!(
631+
"\n{}",
632+
&report.disassembly.join("\n").replace('\t', " ")
633+
));
631634
}
632635
if !state.is_empty() {
633636
select.add_item("CrashState", state);

casr/src/bin/casr-san.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ fn main() -> Result<()> {
147147
}
148148
#[cfg(target_os = "linux")]
149149
{
150-
use linux_personality::{personality, ADDR_NO_RANDOMIZE};
150+
use linux_personality::{personality, Personality};
151151

152152
unsafe {
153153
sanitizers_cmd.pre_exec(|| {
154-
if personality(ADDR_NO_RANDOMIZE).is_err() {
154+
if personality(Personality::ADDR_NO_RANDOMIZE).is_err() {
155155
panic!("Cannot set personality");
156156
}
157157
Ok(())

0 commit comments

Comments
 (0)