From 0fe33b3bd30efafbbcc6a94a3d1cad4c3ccf62d6 Mon Sep 17 00:00:00 2001 From: Julien Voisin Date: Tue, 20 Sep 2022 18:27:38 +0200 Subject: [PATCH] Add more compressed formats support for libmagic (#8540) Co-authored-by: Julien Voisin --- projects/file/Dockerfile | 4 +++- projects/file/build.sh | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/projects/file/Dockerfile b/projects/file/Dockerfile index 43c06081a..982ff170a 100644 --- a/projects/file/Dockerfile +++ b/projects/file/Dockerfile @@ -15,7 +15,9 @@ ################################################################################ FROM gcr.io/oss-fuzz-base/base-builder -RUN apt-get update && apt-get install -y make autoconf automake libtool shtool zlib1g-dev:i386 +RUN apt-get update && apt install -y make autoconf automake libtool shtool +RUN apt-get update && apt install -y libbz2-dev liblzma-dev zlib1g-dev libzstd-dev liblz4-dev +RUN apt-get update && apt install -y libbz2-dev:i386 liblzma-dev:i386 zlib1g-dev:i386 libzstd-dev:i386 liblz4-dev:i386 RUN git clone --depth 1 https://github.com/file/file.git # Supplement file's existing test files diff --git a/projects/file/build.sh b/projects/file/build.sh index 50d0ad7f8..69b6ca08c 100755 --- a/projects/file/build.sh +++ b/projects/file/build.sh @@ -16,15 +16,15 @@ ################################################################################ autoreconf -i -./configure --enable-static +./configure --enable-static --enable-fsect-man5 make V=1 all $CXX $CXXFLAGS -std=c++11 -Isrc/ \ $SRC/magic_fuzzer.cc -o $OUT/magic_fuzzer \ - $LIB_FUZZING_ENGINE ./src/.libs/libmagic.a -l:libz.a + $LIB_FUZZING_ENGINE ./src/.libs/libmagic.a -l:libz.a -l:liblz4.a -l:libbz2.a -l:liblzma.a -l:libzstd.a $CXX $CXXFLAGS -std=c++11 -Isrc/ \ $SRC/magic_fuzzer_loaddb.cc -o $OUT/magic_fuzzer_loaddb \ - $LIB_FUZZING_ENGINE ./src/.libs/libmagic.a -l:libz.a + $LIB_FUZZING_ENGINE ./src/.libs/libmagic.a -l:libz.a -l:liblz4.a -l:libbz2.a -l:liblzma.a -l:libzstd.a cp ./magic/magic.mgc $OUT/