From e1e3d0b3441f8b15eb335af3e203ee764543a1d4 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Mon, 19 Dec 2022 12:15:40 -0800 Subject: [PATCH] Wireshark: Update build options and dependencies. (#9241) The "wireshark", "logray", and "sharkd" targets all depend on SpeexDSP (Wireshark commit ae14849864), so disable them. Don't install bison; we haven't needed it since 2020 (Wireshark commit f21cd2e23f). Signed-off-by: Gerald Combs Signed-off-by: Gerald Combs --- projects/wireshark/Dockerfile | 2 +- projects/wireshark/build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/wireshark/Dockerfile b/projects/wireshark/Dockerfile index bddbf98ef..dd22532e5 100644 --- a/projects/wireshark/Dockerfile +++ b/projects/wireshark/Dockerfile @@ -17,7 +17,7 @@ FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y ninja-build cmake \ - flex bison libc-ares-dev \ + flex libc-ares-dev \ libglib2.0-dev libgcrypt20-dev RUN git clone --depth=1 https://gitlab.com/wireshark/wireshark.git diff --git a/projects/wireshark/build.sh b/projects/wireshark/build.sh index 82a0279ab..d883a86a6 100755 --- a/projects/wireshark/build.sh +++ b/projects/wireshark/build.sh @@ -36,8 +36,8 @@ CMAKE_DEFINES="$CMAKE_DEFINES -DENABLE_PCAP=OFF -DENABLE_GNUTLS=OFF" # There is no need to manually disable programs via BUILD_xxx=OFF since the # all-fuzzers targets builds the minimum required binaries. However we do have -# to disable the Qt GUI or else the cmake step will fail. -CMAKE_DEFINES="$CMAKE_DEFINES -DBUILD_wireshark=OFF" +# to disable the Qt GUI and sharkd or else the cmake step will fail. +CMAKE_DEFINES="$CMAKE_DEFINES -DBUILD_wireshark=OFF -DBUILD_logray=OFF -DBUILD_sharkd=OFF" cd "$WIRESHARK_BUILD_PATH"