Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <gerald@wireshark.org>

Signed-off-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2022-12-19 12:15:40 -08:00 committed by GitHub
parent 9781b78936
commit e1e3d0b344
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/wireshark/Dockerfile
View File

@ -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

4
projects/wireshark/build.sh
View File

@ -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"