From 8c1e39f15e845c99e337c95319915e51b78ce86b Mon Sep 17 00:00:00 2001
From: maflcko <6399679+maflcko@users.noreply.github.com>
Date: Thu, 20 Jun 2024 00:13:26 +0200
Subject: [PATCH] knot-dns: Use latest builder (#12095)

Co-authored-by: MarcoFalke <6399679+MarcoFalke@users.noreply.github.com>
---
 projects/knot-dns/Dockerfile | 3 +--
 projects/knot-dns/build.sh   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/projects/knot-dns/Dockerfile b/projects/knot-dns/Dockerfile
index 7ada5ffca..c8fa8b8c1 100644
--- a/projects/knot-dns/Dockerfile
+++ b/projects/knot-dns/Dockerfile
@@ -14,8 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e
-# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y \
  autoconf \
  autogen \
diff --git a/projects/knot-dns/build.sh b/projects/knot-dns/build.sh
index 626e91dc9..e01593ebc 100755
--- a/projects/knot-dns/build.sh
+++ b/projects/knot-dns/build.sh
@@ -32,7 +32,7 @@ make -j$(nproc)
 make install
 
 GNUTLS_CONFIGURE_FLAGS=""
-NETTLE_CONFIGURE_FLAGS=""
+NETTLE_CONFIGURE_FLAGS="--disable-assembler"  # Temporarily disalbe asm to work around error "Libnettle 3.6 was not found."
 if [[ $CFLAGS = *sanitize=memory* ]]; then
   GNUTLS_CONFIGURE_FLAGS="--disable-hardware-acceleration"
   NETTLE_CONFIGURE_FLAGS="--disable-assembler --disable-fat"