From bf6ebb8d0a490f9dbf2cb901227977c5655338a4 Mon Sep 17 00:00:00 2001 From: Catena cyber <35799796+catenacyber@users.noreply.github.com> Date: Tue, 4 Apr 2023 11:13:55 +0200 Subject: [PATCH] Suricata rust clang16 (#10019) Meant to fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=57490&q=label%3AProj-suricata Cf https://github.com/rust-lang/rust/issues/107149 When will oss-fuzz use clang 16 for C ? --- projects/suricata/Dockerfile | 3 +++ projects/suricata/build.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/projects/suricata/Dockerfile b/projects/suricata/Dockerfile index 382d31533527..cb7b5d9083eb 100644 --- a/projects/suricata/Dockerfile +++ b/projects/suricata/Dockerfile @@ -28,6 +28,9 @@ RUN git clone --depth=1 https://github.com/catenacyber/fuzzpcap ADD https://rules.emergingthreats.net/open/suricata/emerging.rules.zip emerging.rules.zip +# until clang 16 is used for C cf https://github.com/rust-lang/rust/issues/107149#issuecomment-1492637779 +RUN rustup install nightly-2023-03-24 +RUN rustup component add rust-src --toolchain nightly-2023-03-24-x86_64-unknown-linux-gnu RUN cargo install --force cbindgen RUN git clone --depth 1 https://github.com/OISF/suricata.git suricata diff --git a/projects/suricata/build.sh b/projects/suricata/build.sh index 556e900e09ab..161321637dad 100755 --- a/projects/suricata/build.sh +++ b/projects/suricata/build.sh @@ -15,6 +15,9 @@ # ################################################################################ +# until clang 16 is used for C cf https://github.com/rust-lang/rust/issues/107149#issuecomment-1492637779 +rustup default nightly-2023-03-24 + # build dependencies statically if [ "$SANITIZER" = "memory" ] then