Suricata rust clang16 (#10019)

catenacyber · web-flow · commit bf6ebb8d0a49 · 2023-04-04T02:13:55.000-07:00
Meant to fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=57490&q=label%3AProj-suricata Cf rust-lang/rust#107149 When will oss-fuzz use clang 16 for C ?
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@`
`15`	`15`	`#`
`16`	`16`	`################################################################################`
`17`	`17`
	`18`	`+# until clang 16 is used for C cf https://github.com/rust-lang/rust/issues/107149#issuecomment-1492637779`
	`19`	`+rustup default nightly-2023-03-24`
	`20`	`+`
`18`	`21`	`# build dependencies statically`
`19`	`22`	`if [ "$SANITIZER" = "memory" ]`
`20`	`23`	`then`