From 6e9d0defcfb82556c2c9007c34da77d791ce7726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Wed, 7 Dec 2022 21:30:38 +0100
Subject: [PATCH] bind9: Add libcap-dev as it is mandatory on Linux now (#8949)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ondřej Surý <ondrej@sury.org>
---
 projects/bind9/Dockerfile   | 1 +
 projects/bind9/build.sh     | 6 +++++-
 projects/bind9/project.yaml | 2 --
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/projects/bind9/Dockerfile b/projects/bind9/Dockerfile
index 25ba53882..a61ee0c39 100644
--- a/projects/bind9/Dockerfile
+++ b/projects/bind9/Dockerfile
@@ -23,6 +23,7 @@ RUN apt-get -y install		\
 	autotools-dev		\
 	bison			\
 	build-essential		\
+	libcap-dev		\
 	libnghttp2-dev		\
 	libssl-dev		\
 	libtool			\
diff --git a/projects/bind9/build.sh b/projects/bind9/build.sh
index 933f6b4b0..5b9c2a528 100644
--- a/projects/bind9/build.sh
+++ b/projects/bind9/build.sh
@@ -17,7 +17,7 @@
 
 # build the project
 autoreconf -fi
-./configure --disable-shared --enable-static --enable-developer --without-cmocka --without-zlib --disable-linux-caps --prefix="$WORK" --enable-fuzzing=ossfuzz
+./configure --disable-shared --enable-static --enable-developer --without-cmocka --without-zlib --prefix="$WORK" --enable-fuzzing=ossfuzz
 (cd lib/isc && make -j"$(nproc)" all V=1)
 (cd lib/dns && make -j"$(nproc)" all V=1)
 
@@ -26,9 +26,13 @@ LIBDNS_CFLAGS="-Ilib/dns/include"
 LIBISC_LIBS="lib/isc/.libs/libisc.a -Wl,-Bstatic -lssl -lcrypto -luv -lnghttp2 -Wl,-Bdynamic"
 LIBDNS_LIBS="lib/dns/.libs/libdns.a -Wl,-Bstatic -lcrypto -Wl,-Bdynamic"
 
+# dns_name_fromwire needs old.c/old.h code to be linked in
+sed -i 's/#include "old.h"/#include "old.c"/' fuzz/dns_name_fromwire.c
+
 for fuzzer in fuzz/*.c; do
     output=$(basename "${fuzzer%.c}")
     [ "$output" = "main" ] && continue
+    [ "$output" = "old" ] && continue
     # We need to try little bit harder to link everything statically
     (cd fuzz && make -j"$(nproc)" "${output}.o" V=1)
     ${CXX} ${CXXFLAGS} \
diff --git a/projects/bind9/project.yaml b/projects/bind9/project.yaml
index 684f5250a..4d5a63129 100644
--- a/projects/bind9/project.yaml
+++ b/projects/bind9/project.yaml
@@ -13,7 +13,5 @@ auto_ccs:
   - "pspacek@isc.org"
 sanitizers:
   - address
-  - memory:
-     experimental: True
   - undefined
 main_repo: 'https://gitlab.isc.org/isc-projects/bind9.git'