Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Ubuntu upgrade] Fix projects so they don't break with upgrade. #6304

Merged
merged 1 commit into from
Aug 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion projects/bignum-fuzzer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
################################################################################

FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y software-properties-common python-software-properties wget curl sudo mercurial autoconf bison texinfo libboost-all-dev cmake
RUN apt-get update && apt-get install -y software-properties-common curl sudo mercurial autoconf bison texinfo libboost-all-dev cmake wget

RUN wget https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-2.5.1.tar.gz
RUN git clone --depth 1 https:/guidovranken/bignum-fuzzer
Expand Down
2 changes: 1 addition & 1 deletion projects/clib/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
################################################################################

FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y make cmake ninja libcurl4-gnutls-dev -qq
RUN apt-get update && apt-get install -y make cmake libcurl4-gnutls-dev -qq
RUN git clone https:/clibs/clib
WORKDIR $SRC/
COPY build.sh $SRC/
2 changes: 1 addition & 1 deletion projects/containerd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
################################################################################

FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y btrfs-progs libc-dev pkg-config libseccomp-dev gcc wget
RUN apt-get update && apt-get install -y btrfs-progs libc-dev pkg-config libseccomp-dev gcc wget libbtrfs-dev
RUN git clone --depth 1 https:/containerd/containerd
COPY build.sh $SRC/
WORKDIR $SRC/containerd
6 changes: 5 additions & 1 deletion projects/cpython3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
FROM gcr.io/oss-fuzz-base/base-builder
# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04.
# See https:/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

RUN apt-get update
RUN apt-get install -y build-essential libncursesw5-dev \
Expand Down
2 changes: 1 addition & 1 deletion projects/cryptofuzz/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN apt-get update && \
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add - && \
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main' && \
apt-get update && \
apt-get install -y software-properties-common python-software-properties make autoconf automake libtool build-essential cmake mercurial gyp ninja-build zlib1g-dev libsqlite3-dev bison flex texinfo
apt-get install -y software-properties-common wget make autoconf automake libtool build-essential cmake mercurial gyp ninja-build zlib1g-dev libsqlite3-dev bison flex texinfo

RUN git clone --depth 1 https:/guidovranken/cryptofuzz
RUN git clone --depth 1 https:/guidovranken/cryptofuzz-corpora
Expand Down
17 changes: 10 additions & 7 deletions projects/firefox/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@
################################################################################

FROM gcr.io/oss-fuzz-base/base-builder
RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \
gawk \
libstdc++6 \
m4 \
python \
software-properties-common
RUN apt-get update && \
apt-get install -y software-properties-common && \
add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
apt-get update && \
apt-get upgrade -y && \
apt-get install -y --no-install-recommends \
gawk \
libstdc++6 \
m4 \
python

# This wrapper of cargo seems to interfere with our build system.
RUN rm -f /usr/local/bin/cargo
Expand Down
2 changes: 1 addition & 1 deletion projects/flac/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ cd $SRC/fuzzing-headers

# Build fuzzers
cd $SRC/flac-fuzzers/
$CXX $CXXFLAGS -I $SRC/flac/include/ -I $SRC/ExoPlayer/extensions/flac/src/main/jni/ -I /usr/lib/jvm/java-8-openjdk-amd64/include/ -I /usr/lib/jvm/java-8-openjdk-amd64/include/linux/ fuzzer_exo.cpp \
$CXX $CXXFLAGS -I $SRC/flac/include/ -I $SRC/ExoPlayer/extensions/flac/src/main/jni/ -I /usr/lib/jvm/java-11-openjdk-amd64/include/ -I /usr/lib/jvm/java-11-openjdk-amd64/include/linux/ fuzzer_exo.cpp \
$SRC/flac/src/libFLAC++/.libs/libFLAC++.a $SRC/flac/src/libFLAC/.libs/libFLAC.a $SRC/libogg-install/lib/libogg.a $LIB_FUZZING_ENGINE -o $OUT/fuzzer_exo
$CXX $CXXFLAGS -I $SRC/flac/include/ fuzzer_decoder.cpp $SRC/flac/src/libFLAC++/.libs/libFLAC++.a $SRC/flac/src/libFLAC/.libs/libFLAC.a $SRC/libogg-install/lib/libogg.a $LIB_FUZZING_ENGINE -o $OUT/fuzzer_decoder
$CXX $CXXFLAGS -I $SRC/flac/include/ fuzzer_encoder.cpp $SRC/flac/src/libFLAC++/.libs/libFLAC++.a $SRC/flac/src/libFLAC/.libs/libFLAC.a $SRC/libogg-install/lib/libogg.a $LIB_FUZZING_ENGINE -o $OUT/fuzzer_encoder
Expand Down
2 changes: 1 addition & 1 deletion projects/git/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN apt-get update && \
cvs cvsps gettext libcgi-pm-perl libcurl4-gnutls-dev \
libdbd-sqlite3-perl liberror-perl libexpat1-dev libhttp-date-perl \
libio-pty-perl libmailtools-perl libpcre2-dev libpcre3-dev libsvn-perl \
libtime-modules-perl libyaml-perl libz-dev python subversion tcl unzip \
perl-modules libyaml-perl libz-dev python subversion tcl unzip \
asciidoc docbook-xsl xmlto libssl-dev zip
RUN git clone https:/git/git git
WORKDIR git
Expand Down
4 changes: 2 additions & 2 deletions projects/gnutls/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
################################################################################

export DEPS_PATH=$SRC/deps
export PKG_CONFIG_PATH=$DEPS_PATH/lib/pkgconfig
export PKG_CONFIG_PATH=$DEPS_PATH/lib64/pkgconfig:$DEPS_PATH/lib/pkgconfig
export CPPFLAGS="-I$DEPS_PATH/include"
export LDFLAGS="-L$DEPS_PATH/lib"
export LDFLAGS="-L$DEPS_PATH/lib -L$DEPS_PATH/lib64"
export GNULIB_SRCDIR=$SRC/gnulib

cd $SRC/libunistring
Expand Down
2 changes: 1 addition & 1 deletion projects/grpc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

FROM gcr.io/oss-fuzz-base/base-builder

RUN apt-get update && apt-get install -y software-properties-common python-software-properties
RUN apt-get update && apt-get install -y software-properties-common
RUN add-apt-repository ppa:webupd8team/java
RUN apt-get update && apt-get -y install \
vim \
Expand Down
2 changes: 1 addition & 1 deletion projects/janus-gateway/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y \
gtk-doc-tools \
libconfig-dev \
libglib2.0-dev \
libgnutls-dev \
libgnutls28-dev \
libini-config-dev \
libjansson-dev \
libnice-dev \
Expand Down
2 changes: 1 addition & 1 deletion projects/knot-dns/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Cribbed from projects/wget2, thanks [email protected]

export DEPS_PATH=$SRC/knot_deps
export PKG_CONFIG_PATH=$DEPS_PATH/lib/pkgconfig
export PKG_CONFIG_PATH=$DEPS_PATH/lib64/pkgconfig:$DEPS_PATH/lib/pkgconfig
export CPPFLAGS="-I$DEPS_PATH/include"
export LDFLAGS="-L$DEPS_PATH/lib"
export GNULIB_SRCDIR=$SRC/gnulib
Expand Down
2 changes: 1 addition & 1 deletion projects/liblouis/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y make autoconf automake libtool \
pkg-config zlib1g-dev pciutils-dev libpci-dev
pkg-config zlib1g-dev libpci-dev
RUN git clone --depth 1 https:/liblouis/liblouis
WORKDIR liblouis
COPY build.sh $SRC/
4 changes: 4 additions & 0 deletions projects/libpsl/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ CPPFLAGS="$CPPFLAGS -fno-sanitize=vptr" \
--disable-tests --disable-samples --with-data-packaging=static --prefix=$DEPS_PATH
# ugly hack to avoid build error
echo '#include <locale.h>' >>i18n/digitlst.h

# Hack so that upgrade to Ubuntu 20.04 works.
ln -s /usr/include/locale.h /usr/include/xlocale.h

make -j
make install

Expand Down
2 changes: 1 addition & 1 deletion projects/librawspeed/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && \
apt-get install -y apt-transport-https ca-certificates gnupg software-properties-common wget && \
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add - && \
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main' && \
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' && \
apt-get update && apt-get install -y cmake make
RUN git clone --depth 1 https:/darktable-org/rawspeed.git librawspeed
WORKDIR librawspeed
Expand Down
2 changes: 1 addition & 1 deletion projects/libtpms/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN \
apt-get update && \
apt-get install -y \
make autoconf automake libtool \
libstdc++-5-dev \
libstdc++-9-dev \
libssl-dev libseccomp-dev pkg-config
RUN git clone --depth 1 https:/stefanberger/libtpms libtpms
WORKDIR libtpms
Expand Down
6 changes: 5 additions & 1 deletion projects/libvips/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ RUN apt-get update && apt-get install -y \
libexpat1-dev \
libffi-dev \
libselinux1-dev \
glib2.0-dev \
autopoint \
gettext \
libtool \
glib2.0-dev
RUN pip3 install meson ninja
RUN mkdir afl-testcases
Expand All @@ -43,7 +47,7 @@ RUN git clone --depth 1 https:/libjpeg-turbo/libjpeg-turbo
RUN git clone --depth 1 https:/glennrp/libpng.git
RUN git clone --depth 1 https:/randy408/libspng.git
RUN git clone --depth 1 https://chromium.googlesource.com/webm/libwebp
RUN git clone --depth 1 https://gitlab.com/libtiff/libtiff
RUN git clone --depth 1 https://gitlab.com/libtiff/libtiff
RUN git clone --depth 1 https://aomedia.googlesource.com/aom
RUN git clone --depth 1 https:/strukturag/libheif
RUN git clone --depth 1 --recursive https:/libjxl/libjxl.git
Expand Down
6 changes: 5 additions & 1 deletion projects/lldb-eval/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
#
################################################################################

FROM gcr.io/oss-fuzz-base/base-builder
# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04.
# See https:/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

RUN apt-get update \
&& apt-get install -y wget git patchelf zlib1g-dev python libtinfo-dev --no-install-recommends
Expand Down
2 changes: 1 addition & 1 deletion projects/openh264/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && \
apt-get install -y libstdc++-5-dev libstdc++-5-dev:i386 nasm subversion
apt-get install -y libstdc++-9-dev libstdc++-9-dev:i386 nasm subversion
RUN git clone --depth 1 https:/cisco/openh264.git openh264
WORKDIR openh264
COPY build.sh decoder_fuzzer.cpp $SRC/
2 changes: 1 addition & 1 deletion projects/openssh/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y make autoconf automake libtool
RUN apt-get install -y libz-dev libssl1.0.0 libssl-dev libedit-dev zip
RUN apt-get install -y libz-dev libssl1.1 libssl-dev libedit-dev zip
RUN git clone --depth 1 https:/openssh/openssh-portable openssh
RUN git clone --depth 1 https:/djmdjm/openssh-fuzz-cases
WORKDIR openssh
Expand Down
2 changes: 1 addition & 1 deletion projects/openvpn/fuzz_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static int init_frame(struct frame *frame) {
}

int LLVMFuzzerInitialize(int *argc, char ***argv) {
CRYPTO_malloc_init();
OPENSSL_malloc_init();
SSL_library_init();
ERR_load_crypto_strings();

Expand Down
2 changes: 1 addition & 1 deletion projects/openvpn/fuzz_proxy.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ limitations under the License.

int LLVMFuzzerInitialize(int *argc, char ***argv)
{
CRYPTO_malloc_init();
OPENSSL_malloc_init();
SSL_library_init();
ERR_load_crypto_strings();

Expand Down
2 changes: 1 addition & 1 deletion projects/openvpn/fuzz_verify_cert.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static int parse_x509(const uint8_t *data, size_t size, X509 **out) {


int LLVMFuzzerInitialize(int *argc, char ***argv) {
CRYPTO_malloc_init();
OPENSSL_malloc_init();
SSL_library_init();
ERR_load_crypto_strings();

Expand Down
2 changes: 1 addition & 1 deletion projects/openvswitch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y make autoconf automake \
libtool python python3-pip \
libz-dev libssl-dev libssl1.0.0 wget
libz-dev libssl-dev libssl1.1 wget
RUN pip3 install six
RUN git clone --depth 1 https:/openvswitch/ovs.git openvswitch
RUN git clone --depth 1 https:/openvswitch/ovs-fuzzing-corpus.git \
Expand Down
10 changes: 7 additions & 3 deletions projects/openweave/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@
#
################################################################################

FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y python-pip python-setuptools bridge-utils \
# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04.
# See https:/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
RUN apt-get update && apt-get install -y python3-pip python-setuptools bridge-utils \
libglib2.0-dev libdbus-1-dev libudev-dev \
libical-dev libreadline-dev udev \
libtool autoconf automake
libtool autoconf automake systemd
RUN pip3 install --user google-cloud googleapis-common-protos grpcio protobuf pycryptodomex
RUN cpan -i Text::Template
RUN git clone --depth 1 https:/openweave/openweave-core
Expand Down
2 changes: 1 addition & 1 deletion projects/powerdns/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ FROM gcr.io/oss-fuzz-base/base-builder
# maintainer for this file

# install required packages to build your project
RUN add-apt-repository -y ppa:savoury1/boost-defaults-1.71 && apt-get update && apt-get install -y autoconf automake bison dh-autoreconf flex boost1.71-dev libluajit-5.1-dev libedit-dev libprotobuf-dev libssl-dev libtool make pkg-config protobuf-compiler ragel
RUN apt-get update && apt-get install -y autoconf automake bison dh-autoreconf flex boost1.71-all-dev libluajit-5.1-dev libedit-dev libprotobuf-dev libssl-dev libtool make pkg-config protobuf-compiler ragel

# checkout all sources needed to build your project
RUN git clone https:/PowerDNS/pdns.git pdns
Expand Down
2 changes: 1 addition & 1 deletion projects/skia/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
FROM gcr.io/oss-fuzz-base/base-builder

# Mesa and libz/zlib needed to build swiftshader
RUN apt-get update && apt-get install -y python wget libglu1-mesa-dev cmake lib32z1-dev zlib1g-dev
RUN apt-get update && apt-get install -y python wget libglu1-mesa-dev cmake lib32z1-dev zlib1g-dev libxext-dev

RUN git clone 'https://chromium.googlesource.com/chromium/tools/depot_tools.git' --depth 1
ENV PATH="${SRC}/depot_tools:${PATH}"
Expand Down
5 changes: 5 additions & 0 deletions projects/tmux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,8 @@ cat "${SRC}/tmux-fuzzing-corpus/iterm2"/* | \
split -a5 -db$MAXLEN - iterm2.
zip -q -j -r "${OUT}/input-fuzzer_seed_corpus.zip" \
"${WORK}/fuzzing_corpus/"

# Handle libevent not existing on runner.
mkdir $OUT/lib
cp /lib/x86_64-linux-gnu/libevent_core* $OUT/lib
patchelf --set-rpath '$ORIGIN/lib' $OUT/input-fuzzer
2 changes: 1 addition & 1 deletion projects/tpm2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Defines a docker image that can build fuzzers.
#
FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y make libssl-dev binutils libgcc-5-dev
RUN apt-get update && apt-get install -y make libssl-dev binutils libgcc-9-dev
RUN git clone --depth 1 https://chromium.googlesource.com/chromiumos/third_party/tpm2
WORKDIR tpm2
RUN cp /src/tpm2/fuzz/build.sh /src/
7 changes: 7 additions & 0 deletions projects/usbguard/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,10 @@ if [[ ! -d "$SRC/usbguard/src/Tests/Fuzzers/$corpus_dir" ]] ; then
cp -R "$SRC/usbguard/src/Tests/USB/data" "${corpus_dir}"
zip -r "${zip_name}" "${corpus_dir}"
fi

# Ubuntu 20.04 doesn't have a static libqb.
mkdir -p $OUT/lib
cp /lib/x86_64-linux-gnu/libqb* $OUT/lib
patchelf --set-rpath '$ORIGIN/lib' $OUT/fuzzer-uevent
patchelf --set-rpath '$ORIGIN/lib' $OUT/fuzzer-usb-descriptor
patchelf --set-rpath '$ORIGIN/lib' $OUT/fuzzer-rules
2 changes: 1 addition & 1 deletion projects/wget/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
################################################################################

export WGET_DEPS_PATH=$SRC/wget_deps
export PKG_CONFIG_PATH=$WGET_DEPS_PATH/lib/pkgconfig
export PKG_CONFIG_PATH=$WGET_DEPS_PATH/lib64/pkgconfig:$WGET_DEPS_PATH/lib/pkgconfig
export CPPFLAGS="-I$WGET_DEPS_PATH/include"
export LDFLAGS="-L$WGET_DEPS_PATH/lib"
export GNULIB_SRCDIR=$SRC/gnulib
Expand Down
2 changes: 1 addition & 1 deletion projects/wget2/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
################################################################################

export WGET2_DEPS_PATH=$SRC/wget2_deps
export PKG_CONFIG_PATH=$WGET2_DEPS_PATH/lib/pkgconfig
export PKG_CONFIG_PATH=$WGET2_DEPS_PATH/lib64/pkgconfig:$WGET2_DEPS_PATH/lib/pkgconfig
export CPPFLAGS="-I$WGET2_DEPS_PATH/include"
export LDFLAGS="-L$WGET2_DEPS_PATH/lib"
export GNULIB_SRCDIR=$SRC/gnulib
Expand Down
2 changes: 1 addition & 1 deletion projects/xpdf/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
################################################################################

FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y make wget cmake libqt4-dev
RUN apt-get update && apt-get install software-properties-common -y && apt-get update && apt-add-repository ppa:rock-core/qt4 && apt-get install -y make wget cmake libqt4-dev
RUN wget --no-check-certificate https://dl.xpdfreader.com/xpdf-latest.tar.gz

WORKDIR $SRC
Expand Down