Changes to sleuthkit build.sh script

projects/sleuthkit/Dockerfile

@@ -18,4 +18,4 @@ FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make autoconf automake libtool libz-dev
 RUN git clone --depth 1 https://github.com/sleuthkit/sleuthkit sleuthkit
 WORKDIR sleuthkit
-COPY build.sh buildcorpus.sh sleuthkit_mem_img.h *_fuzzer.cc $SRC/
+COPY build.sh $SRC/

projects/sleuthkit/build.sh

@@ -18,46 +18,20 @@
 export CFLAGS="$CFLAGS -Wno-error=non-c-typedef-for-linkage"
 export CXXFLAGS="$CXXFLAGS -Wno-error=non-c-typedef-for-linkage"
 
-# Disable error on all warnings
-sed -i 's/-Werror//g' ./tsk/util/Makefile.am
-sed -i 's/-Werror//g' ./tsk/pool/Makefile.am
+# Work around convolution around building static library versus static binaries
+# Also see: https://github.com/sleuthkit/sleuthkit/issues/3020
+sed -i 's/-all-static//g' configure.ac
 
-# Dont fail if some of the seed downloads fail.
-${SRC}/buildcorpus.sh || true
+# Work around hardcoded -Werror flags
+# Also see: https://github.com/sleuthkit/sleuthkit/issues/3012
+sed -i 's/-Werror//g' Makefile.am
+
+# Don't fail if some of the seed downloads fail.
+./ossfuzz/buildcorpus.sh || true
 
 ./bootstrap
-./configure --enable-static --disable-shared --disable-java --without-afflib --without-libewf --without-libvhdi --without-libvmdk
+./configure --enable-static --enable-shared=no --disable-java --without-afflib --without-libcrypto --without-libewf --without-libvhdi --without-libvmdk
 make -j$(nproc)
 
-declare -A TSK_FS_TYPES=(
-  ["ext"]="TSK_FS_TYPE_EXT_DETECT"
-  ["fat"]="TSK_FS_TYPE_FAT_DETECT"
-  ["hfs"]="TSK_FS_TYPE_HFS"
-  ["ntfs"]="TSK_FS_TYPE_NTFS"
-  ["iso9660"]="TSK_FS_TYPE_ISO9660"
-)
-
-declare -A TSK_VS_TYPES=(
-  ["dos"]="TSK_VS_TYPE_DOS"
-  ["gpt"]="TSK_VS_TYPE_GPT"
-  ["mac"]="TSK_VS_TYPE_MAC"
-  ["sun"]="TSK_VS_TYPE_SUN"
-)
-
-# The fls APFS fuzz target has a seperate source file since it uses the libtsk
-# pool layer.
-$CXX $CXXFLAGS -std=c++14 -I.. -I. -Itsk \
-    $SRC/sleuthkit_fls_apfs_fuzzer.cc -o $OUT/sleuthkit_fls_apfs_fuzzer \
-    $LIB_FUZZING_ENGINE $SRC/sleuthkit/tsk/.libs/libtsk.a -lz
-
-for type in ${!TSK_FS_TYPES[@]}; do
-  $CXX $CXXFLAGS -std=c++14 -I.. -I. -Itsk -DFSTYPE=${TSK_FS_TYPES[$type]} \
-      $SRC/sleuthkit_fls_fuzzer.cc -o $OUT/sleuthkit_fls_${type}_fuzzer \
-      $LIB_FUZZING_ENGINE $SRC/sleuthkit/tsk/.libs/libtsk.a -lz
-done
-
-for type in ${!TSK_VS_TYPES[@]}; do
-  $CXX $CXXFLAGS -std=c++14 -I.. -I. -Itsk -DVSTYPE=${TSK_VS_TYPES[$type]} \
-      $SRC/sleuthkit_mmls_fuzzer.cc -o $OUT/sleuthkit_mmls_${type}_fuzzer \
-      $LIB_FUZZING_ENGINE $SRC/sleuthkit/tsk/.libs/libtsk.a -lz
-done
+# Copy the fuzzer binaries to the output directory.
+cp *_fuzzer ${OUT}