From eb70ee6835638eea4c3ce89e2a59a8e8c306878c Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Sun, 31 Mar 2024 17:53:22 +0800 Subject: [PATCH] Revert "dropbear: fix broken build (#8183)" (#11765) hg.ucc.asn.au was intermittently unavailable it's available now. This reverts commit 10b8aeddd7380fe6f10927fffb495ea020f9b867. It would be good to CC project maintainers when merging something like #8183 (I didn't realise the corpus had been removed, I could have moved the server if needed) --- projects/dropbear/Dockerfile | 1 + projects/dropbear/build.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/projects/dropbear/Dockerfile b/projects/dropbear/Dockerfile index 4952485cb..f2c235486 100644 --- a/projects/dropbear/Dockerfile +++ b/projects/dropbear/Dockerfile @@ -16,6 +16,7 @@ FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y libz-dev autoconf mercurial +RUN hg clone https://hg.ucc.asn.au/dropbear-fuzzcorpus dropbear-corpus RUN git clone https://github.com/mkj/dropbear dropbear WORKDIR dropbear COPY build.sh *.options $SRC/ diff --git a/projects/dropbear/build.sh b/projects/dropbear/build.sh index ca63e7cc6..e6a45fc39 100644 --- a/projects/dropbear/build.sh +++ b/projects/dropbear/build.sh @@ -22,6 +22,9 @@ make -j$(nproc) fuzz-targets FUZZLIB=$LIB_FUZZING_ENGINE TARGETS="$(make list-fuzz-targets)" +make -C $SRC/dropbear-corpus cp -v $TARGETS $OUT/ cp -v *.options $OUT/ +cp -v $SRC/dropbear-corpus/*.zip $OUT/ +cp -v $SRC/dropbear-corpus/*.dict $OUT/