Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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 269cfb6bf8.

* [knot-dns] use bootstrap before build (issue 12386)
This commit is contained in:
Daniel Salzman 2019-01-07 16:43:35 +01:00 committed by Max Moroz
parent d0d79130d3
commit d8db26e77f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/knot-dns/Dockerfile
View File

@ -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

4
projects/knot-dns/build.sh
View File

@ -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" \