diff --git a/projects/knot-dns/Dockerfile b/projects/knot-dns/Dockerfile index 42974f0ef..9084bfcb2 100644 --- a/projects/knot-dns/Dockerfile +++ b/projects/knot-dns/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update && \ gperf libtool make pkg-config texinfo wget RUN git clone --depth=1 --recursive https://git.savannah.gnu.org/git/libunistring.git -RUN git clone https://git.lysator.liu.se/nettle/nettle.git +RUN git clone --depth=1 https://git.lysator.liu.se/nettle/nettle.git RUN git clone --depth=1 https://gitlab.com/gnutls/gnutls.git RUN git clone --depth=1 https://gitlab.labs.nic.cz/knot/knot-dns diff --git a/projects/knot-dns/build.sh b/projects/knot-dns/build.sh index a5cdad581..653d89b41 100755 --- a/projects/knot-dns/build.sh +++ b/projects/knot-dns/build.sh @@ -39,16 +39,14 @@ if [[ $CFLAGS = *sanitize=memory* ]]; then NETTLE_CONFIGURE_FLAGS="--disable-assembler --disable-fat" fi - cd $SRC/nettle -git checkout tags/nettle_3.4.1_release_20181204 bash .bootstrap ./configure --enable-mini-gmp --enable-static --disable-shared --disable-documentation --prefix=$DEPS_PATH $NETTLE_CONFIGURE_FLAGS ( make -j$(nproc) || make -j$(nproc) ) && make install cd $SRC/gnutls touch .submodule.stamp -make bootstrap +./bootstrap GNUTLS_CFLAGS=`echo $CFLAGS|sed s/-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION//` LIBS="-lunistring" \ CFLAGS="$GNUTLS_CFLAGS" \