From 6f0a24f0d53746857360836e87a3bdf4ce57bb31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Thu, 13 Aug 2020 16:21:38 +0200
Subject: [PATCH] [bind9] Re-enable AFL fuzzing engine. (#4310)

---
 projects/bind9/build.sh     | 6 ++++--
 projects/bind9/project.yaml | 3 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/projects/bind9/build.sh b/projects/bind9/build.sh
index af6f26b96..4340caa6a 100644
--- a/projects/bind9/build.sh
+++ b/projects/bind9/build.sh
@@ -18,8 +18,9 @@
 # build the project
 autoreconf -fi
 ./configure --disable-shared --enable-static --enable-developer --without-cmocka --without-zlib --disable-linux-caps --prefix="$WORK" --enable-fuzzing=ossfuzz
-make -j"$(nproc)" all
-(cd fuzz && TESTS='' make -e -j"$(nproc)" check)
+(cd libltdl && make -j"$(nproc)" all V=1)
+(cd lib/isc && make -j"$(nproc)" all V=1)
+(cd lib/dns && make -j"$(nproc)" all V=1)
 
 LIBISC_CFLAGS="-Ilib/isc/unix/include -Ilib/isc/pthreads/include -Ilib/isc/include"
 LIBDNS_CFLAGS="-Ilib/dns/include"
@@ -30,6 +31,7 @@ for fuzzer in fuzz/*.c; do
     output=$(basename "${fuzzer%.c}")
     [ "$output" = "main" ] && continue
     # We need to try little bit harder to link everything statically
+    (cd fuzz && make -j"$(nproc)" "${output}.o" V=1)
     ${CXX} ${CXXFLAGS} \
 	   -o "${OUT}/${output}_fuzzer" \
 	   "fuzz/${output}.o" \
diff --git a/projects/bind9/project.yaml b/projects/bind9/project.yaml
index d19e7214c..5ed597c6c 100644
--- a/projects/bind9/project.yaml
+++ b/projects/bind9/project.yaml
@@ -8,9 +8,6 @@ auto_ccs:
   - "wpk@isc.org"
   - "matthijs@isc.org"
   - "dfronza@isc.org"
-fuzzing_engines:
-  - libfuzzer
-  - honggfuzz
 sanitizers:
   - address
   - memory: