diff options
| author |  Daniel Salzman <daniel.salzman@nic.cz> | 2019-01-07 16:43:35 +0100 |
|---|---|---|
| committer |  Max Moroz <dor3s1@gmail.com> | 2019-01-07 07:43:35 -0800 |
| commit | d8db26e77fcb9ac1b55a4bdbc6efc9eb41f5d1e4 (patch) | |
| tree | 1ef94b61006a1d5a2a4073e1585c97ad014998f5 /projects/knot-dns | |
| parent | d0d79130d349d9e4b21dd616c12da29ac4c6419a (diff) | |
[knot-dns] fix issue 12386 and remove temporary workaround (#2072)
* Revert "[knot-dns] use libnettle 3.4.1 to build gnutls (#2013)"
This reverts commit 269cfb6bf8113399dd38aed92a7330ed48cfe631.
* [knot-dns] use bootstrap before build (issue 12386)
Diffstat (limited to 'projects/knot-dns')
| -rw-r--r-- | projects/knot-dns/Dockerfile | 2 | ||||
| -rwxr-xr-x | projects/knot-dns/build.sh | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/projects/knot-dns/Dockerfile b/projects/knot-dns/Dockerfile index 42974f0e..9084bfcb 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 a5cdad58..653d89b4 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" \ |