From e74acd6a707017ac3b75334c0f613f88bd8fb357 Mon Sep 17 00:00:00 2001 From: Julien Voisin Date: Wed, 5 Oct 2022 16:34:26 +0200 Subject: [PATCH] Make use of liblzo2 in libarchive (#8685) Co-authored-by: Julien Voisin --- projects/libarchive/Dockerfile | 4 ++-- projects/libarchive/build.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/libarchive/Dockerfile b/projects/libarchive/Dockerfile index f37efbe87..3d8f1abdf 100644 --- a/projects/libarchive/Dockerfile +++ b/projects/libarchive/Dockerfile @@ -18,8 +18,8 @@ FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y make autoconf libtool pkg-config \ libbz2-dev liblzo2-dev liblzma-dev liblz4-dev libz-dev \ - libssl-dev libacl1-dev libattr1-dev lrzip \ - liblz4-tool lzop zstd lcab genisoimage jlha-utils rar default-jdk + libssl-dev libacl1-dev libattr1-dev lrzip liblzo2-dev \ + liblz4-tool lzop zstd lcab genisoimage jlha-utils rar default-jdk RUN curl -LO http://mirrors.kernel.org/ubuntu/pool/main/a/automake-1.16/automake_1.16.5-1.3_all.deb && \ apt install ./automake_1.16.5-1.3_all.deb RUN git clone --depth 1 https://github.com/libarchive/libarchive.git diff --git a/projects/libarchive/build.sh b/projects/libarchive/build.sh index 77ef2ad6d..c08c8bd7d 100755 --- a/projects/libarchive/build.sh +++ b/projects/libarchive/build.sh @@ -55,8 +55,9 @@ cp $SRC/libarchive/contrib/oss-fuzz/corpus.zip\ git clone --depth=1 https://github.com/corkami/pocs find $SRC/pocs/ -type f -print0 | xargs -0 -I % zip -jr $OUT/libarchive_fuzzer_seed_corpus.zip % + # build fuzzer(s) $CXX $CXXFLAGS -I../libarchive \ $SRC/libarchive_fuzzer.cc -o $OUT/libarchive_fuzzer \ $LIB_FUZZING_ENGINE ./libarchive/libarchive.a \ - -lcrypto -lacl -llzma -llz4 -lbz2 -lz ${DEPS}/libxml2.a + -Wl,-Bstatic -llzo2 -Wl,-Bdynamic -lcrypto -lacl -llzma -llz4 -lbz2 -lz ${DEPS}/libxml2.a