diff options
| author | DavidKorczynski <david@adalogics.com> | 2021-09-18 21:33:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-18 21:33:01 +0100 |
| commit | 1933636ced2cac2f16496a25d02d144f76493d09 (patch) | |
| tree | f7ea5f1ad9ba25e1e9f99008cca25b4950669bee /projects/wget2 | |
| parent | 2f12ebf27589b27f2475fdbf5734c248ac6edfbc (diff) | |
| download | oss-fuzz-1933636ced2cac2f16496a25d02d144f76493d09.tar.gz | |
wget2: upgrade build to latest base builder (#6483)
* wget2: upgrade build to latest base builder
* cleanup build
* wget2: simplify build
* wget2: cleanup build
* wget2: last cleanup (hopefully)
* wget2: cleanup build
Diffstat (limited to 'projects/wget2')
| -rw-r--r-- | projects/wget2/Dockerfile | 9 | ||||
| -rwxr-xr-x | projects/wget2/build.sh | 18 |
2 files changed, 10 insertions, 17 deletions
diff --git a/projects/wget2/Dockerfile b/projects/wget2/Dockerfile index ffff58e4f..8513d586d 100644 --- a/projects/wget2/Dockerfile +++ b/projects/wget2/Dockerfile @@ -14,11 +14,7 @@ # ################################################################################ -# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. -# See https://github.com/google/oss-fuzz/issues/6291 for more details. -FROM gcr.io/oss-fuzz-base/base-builder:xenial -# Delete line above and uncomment line below to upgrade to 20.04. -# FROM gcr.io/oss-fuzz-base/base-builder +FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y \ make \ pkg-config \ @@ -38,7 +34,8 @@ RUN apt-get update && apt-get install -y \ wget \ python \ lzip \ - rsync + rsync \ + libmicrohttpd-dev ENV GNULIB_TOOL $SRC/gnulib/gnulib-tool RUN git clone git://git.savannah.gnu.org/gnulib.git diff --git a/projects/wget2/build.sh b/projects/wget2/build.sh index 6a8ac6f63..866a4259f 100755 --- a/projects/wget2/build.sh +++ b/projects/wget2/build.sh @@ -72,29 +72,20 @@ CFLAGS="$GNUTLS_CFLAGS" \ make -j$(nproc) make install -cd $SRC/libmicrohttpd-* -LIBS="-lgnutls -lhogweed -lnettle -lidn2 -lunistring" \ -./configure --prefix=$WGET2_DEPS_PATH --disable-doc --disable-examples --disable-shared --enable-static -make -j$(nproc) -make install - - # avoid iconv() memleak on Ubuntu 16.04 image (breaks test suite) export ASAN_OPTIONS=detect_leaks=0 cd $SRC/wget2 ./bootstrap -# build and run non-networking tests -LIBS="-lgnutls -lhogweed -lnettle -lidn2 -lunistring" \ +LIBS="-lgnutls -lhogweed -lnettle -lidn2 -lunistring -lpsl" \ ./configure -C --enable-static --disable-shared --disable-doc --without-plugin-support make clean make -j$(nproc) make -j$(nproc) -C unit-tests check make -j$(nproc) -C fuzz check -# build for fuzzing -LIBS="-lgnutls -lhogweed -lnettle -lidn2 -lunistring" \ +LIBS="-lgnutls -lhogweed -lnettle -lidn2 -lunistring -lpsl" \ ./configure -C --enable-fuzzing --enable-static --disable-shared --disable-doc --without-plugin-support make clean make -j$(nproc) -C lib @@ -102,8 +93,13 @@ make -j$(nproc) -C include make -j$(nproc) -C libwget make -j$(nproc) -C src +# Ensure our libraries can be found +ln -s $WGET2_DEPS_PATH/lib64/libhogweed.a $WGET2_DEPS_PATH/lib/libhogweed.a +ln -s $WGET2_DEPS_PATH/lib64/libnettle.a $WGET2_DEPS_PATH/lib/libnettle.a + # build fuzzers cd fuzz + CXXFLAGS="$CXXFLAGS -L$WGET2_DEPS_PATH/lib/" make oss-fuzz find . -name '*_fuzzer' -exec cp -v '{}' $OUT ';' |