From f0af6ab8fe72153de264d7aea1ac65b200c017e7 Mon Sep 17 00:00:00 2001
From: Jonathan Metzman <metzman@chromium.org>
Date: Mon, 1 Aug 2022 20:13:58 -0400
Subject: [PATCH 1/4] upgrade images

---
 docker/base-image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/base-image/Dockerfile b/docker/base-image/Dockerfile
index 38fe27a6a..f80c4f4da 100644
--- a/docker/base-image/Dockerfile
+++ b/docker/base-image/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:xenial
+FROM ubuntu:focal
 
 # Build Python 3.8.6 from source because pandas doesn't support xenial's
 # Python3 version (3.5.2).

From 58ce6f2b1e666525869a49f4ff3554bec06c97e4 Mon Sep 17 00:00:00 2001
From: Jonathan Metzman <metzman@chromium.org>
Date: Wed, 28 Sep 2022 13:22:07 -0400
Subject: [PATCH 2/4] Update core images

---
 docker/base-image/Dockerfile       | 12 ++++++------
 docker/dispatcher-image/Dockerfile |  2 +-
 docker/gcb/base-images.yaml        |  4 ++--
 docker/generate_makefile.py        |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker/base-image/Dockerfile b/docker/base-image/Dockerfile
index f80c4f4da..3322a577b 100644
--- a/docker/base-image/Dockerfile
+++ b/docker/base-image/Dockerfile
@@ -14,6 +14,9 @@
 
 FROM ubuntu:focal
 
+# Avoid interaction when installing timezone related packages.
+ENV DEBIAN_FRONTEND=noninteractive
+
 # Build Python 3.8.6 from source because pandas doesn't support xenial's
 # Python3 version (3.5.2).
 ENV PYTHON_VERSION 3.8.6
@@ -46,13 +49,10 @@ COPY ./requirements.txt /
 RUN pip3 install -r /requirements.txt
 
 # Install google-cloud-sdk.
-RUN apt-get update -y && apt-get install -y \
-    apt-transport-https \
-    lsb-release
-RUN CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \
-    echo "deb https://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" \
+RUN apt-get update -y && apt-get install -y apt-transport-https lsb-release && \
+    echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" \
     | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
     curl https://packages.cloud.google.com/apt/doc/apt-key.gpg \
-    | apt-key add - && \
+    | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \
     apt-get update -y && \
     apt-get install -y google-cloud-sdk
diff --git a/docker/dispatcher-image/Dockerfile b/docker/dispatcher-image/Dockerfile
index 6f75163bb..44e23a96d 100644
--- a/docker/dispatcher-image/Dockerfile
+++ b/docker/dispatcher-image/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/oss-fuzz-base/base-clang@sha256:30706816922bf9c141b15ff4a5a44af8c0ec5700d4b46e0572029c15e495d45b AS base-clang
+FROM gcr.io/oss-fuzz-base/base-clang@sha256:05774d8e388cb4975662c8eb25217e38a799d720b622e5c5d8abb79a76b49e53 AS base-clang
 
 FROM gcr.io/fuzzbench/base-image
 
diff --git a/docker/gcb/base-images.yaml b/docker/gcb/base-images.yaml
index a4f194bc6..93b2aa8ac 100644
--- a/docker/gcb/base-images.yaml
+++ b/docker/gcb/base-images.yaml
@@ -20,10 +20,10 @@ images:
 steps:
 - args:
   - pull
-  - ubuntu:xenial
+  - ubuntu:focal
   env:
     - DOCKER_BUILDKIT=1
-  id: pull-ubuntu-xenial
+  id: pull-ubuntu-focal
   name: docker:19.03.12
 - args:
   - build
diff --git a/docker/generate_makefile.py b/docker/generate_makefile.py
index 154c3aeda..8b17232ab 100755
--- a/docker/generate_makefile.py
+++ b/docker/generate_makefile.py
@@ -116,7 +116,7 @@ def get_rules_for_image(name, image):
                 section += ' .' + dep
     section += '\n'
     if 'base-' in name:
-        section += '\tdocker pull ubuntu:xenial\n'
+        section += '\tdocker pull ubuntu:focal\n'
     section += '\tdocker build \\\n'
     section += '\t--tag ' + os.path.join(BASE_TAG, image['tag']) + ' \\\n'
     section += '\t--build-arg BUILDKIT_INLINE_CACHE=1 \\\n'

From 4f04abd451e8704d1ecb607274271a35c521310f Mon Sep 17 00:00:00 2001
From: Jonathan Metzman <metzman@chromium.org>
Date: Wed, 28 Sep 2022 13:24:14 -0400
Subject: [PATCH 3/4] update libpng

---
 benchmarks/libpng-1.2.56/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/libpng-1.2.56/Dockerfile b/benchmarks/libpng-1.2.56/Dockerfile
index 26c463c56..47defe41a 100644
--- a/benchmarks/libpng-1.2.56/Dockerfile
+++ b/benchmarks/libpng-1.2.56/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && \
     apt-get install -y \

From 9074d2447d6c005bb4f7b500761a925b5da58b3b Mon Sep 17 00:00:00 2001
From: Jonathan Metzman <metzman@chromium.org>
Date: Wed, 28 Sep 2022 15:15:06 -0400
Subject: [PATCH 4/4] Update benchmarks

---
 .../arrow_parquet-arrow-fuzz/Dockerfile       |  2 +-
 benchmarks/aspell_aspell_fuzzer/Dockerfile    |  2 +-
 benchmarks/bloaty_fuzz_target/Dockerfile      |  2 +-
 benchmarks/curl_curl_fuzzer_http/Dockerfile   |  2 +-
 .../ffmpeg_ffmpeg_demuxer_fuzzer/Dockerfile   |  2 +-
 .../ffmpeg_ffmpeg_demuxer_fuzzer/build.sh     |  2 +-
 benchmarks/file_magic_fuzzer/Dockerfile       |  2 +-
 benchmarks/freetype2-2017/Dockerfile          |  2 +-
 .../grok_grk_decompress_fuzzer/Dockerfile     |  2 +-
 benchmarks/harfbuzz-1.3.2/Dockerfile          |  2 +-
 benchmarks/jsoncpp_jsoncpp_fuzzer/Dockerfile  |  2 +-
 benchmarks/lcms-2017-03-21/Dockerfile         |  2 +-
 .../libarchive_libarchive_fuzzer/Dockerfile   |  2 +-
 benchmarks/libgit2_objects_fuzzer/Dockerfile  |  2 +-
 benchmarks/libhevc_hevc_dec_fuzzer/Dockerfile |  2 +-
 benchmarks/libhtp_fuzz_htp/Dockerfile         |  2 +-
 benchmarks/libjpeg-turbo-07-2017/Dockerfile   |  2 +-
 benchmarks/libpcap_fuzz_both/Dockerfile       |  2 +-
 benchmarks/libxml2-v2.9.2/Dockerfile          |  2 +-
 .../Dockerfile                                |  2 +-
 benchmarks/libxslt_xpath/Dockerfile           |  2 +-
 benchmarks/libxslt_xpath/benchmark.yaml       | 29 ++---------------
 benchmarks/libxslt_xpath/build.sh             | 22 +++++++++----
 benchmarks/matio_matio_fuzzer/Dockerfile      |  2 +-
 benchmarks/mbedtls_fuzz_dtlsclient/Dockerfile |  2 +-
 benchmarks/mruby-2018-05-23/Dockerfile        |  2 +-
 .../muparser_set_eval_fuzzer/Dockerfile       |  2 +-
 .../njs_njs_process_script_fuzzer/Dockerfile  |  4 +--
 benchmarks/openh264_decoder_fuzzer/Dockerfile |  6 ++--
 benchmarks/openssl_x509/Dockerfile            |  2 +-
 benchmarks/openthread-2019-12-23/Dockerfile   |  2 +-
 benchmarks/oss_fuzz_benchmark_integration.py  | 20 +++++++++---
 benchmarks/php_php-fuzz-execute/Dockerfile    |  2 +-
 .../php_php-fuzz-parser-2020-07-25/Dockerfile |  2 +-
 benchmarks/php_php-fuzz-parser/Dockerfile     |  2 +-
 benchmarks/poppler_pdf_fuzzer/Dockerfile      |  2 +-
 benchmarks/proj4-2017-08-14/Dockerfile        |  2 +-
 benchmarks/proj4_standard_fuzzer/Dockerfile   |  2 +-
 benchmarks/quickjs_eval-2020-01-05/Dockerfile |  2 +-
 benchmarks/re2-2014-12-09/Dockerfile          |  2 +-
 benchmarks/sqlite3_ossfuzz/Dockerfile         |  2 +-
 benchmarks/stb_stbi_read_fuzzer/Dockerfile    |  2 +-
 .../systemd_fuzz-link-parser/Dockerfile       |  7 +----
 .../systemd_fuzz-link-parser/benchmark.yaml   | 31 ++-----------------
 benchmarks/systemd_fuzz-varlink/Dockerfile    |  2 +-
 benchmarks/usrsctp_fuzzer_connect/Dockerfile  |  2 +-
 benchmarks/vorbis-2017-12-11/Dockerfile       |  2 +-
 benchmarks/wireshark_fuzzshark_ip/Dockerfile  |  2 +-
 benchmarks/woff2-2016-05-06/Dockerfile        |  2 +-
 .../zlib_zlib_uncompress_fuzzer/Dockerfile    |  2 +-
 benchmarks/zstd_stream_decompress/Dockerfile  |  2 +-
 fuzzers/afl/builder.Dockerfile                |  2 +-
 fuzzers/afl/fuzzer.py                         |  3 ++
 53 files changed, 89 insertions(+), 123 deletions(-)

diff --git a/benchmarks/arrow_parquet-arrow-fuzz/Dockerfile b/benchmarks/arrow_parquet-arrow-fuzz/Dockerfile
index 321e76b83..ac460c194 100644
--- a/benchmarks/arrow_parquet-arrow-fuzz/Dockerfile
+++ b/benchmarks/arrow_parquet-arrow-fuzz/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update -y -q && \
diff --git a/benchmarks/aspell_aspell_fuzzer/Dockerfile b/benchmarks/aspell_aspell_fuzzer/Dockerfile
index 44327831c..0a1b9ce9e 100644
--- a/benchmarks/aspell_aspell_fuzzer/Dockerfile
+++ b/benchmarks/aspell_aspell_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && apt-get upgrade -y && apt-get install -y pkg-config wget
 
diff --git a/benchmarks/bloaty_fuzz_target/Dockerfile b/benchmarks/bloaty_fuzz_target/Dockerfile
index 30b627deb..3b27a27ea 100644
--- a/benchmarks/bloaty_fuzz_target/Dockerfile
+++ b/benchmarks/bloaty_fuzz_target/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && apt-get upgrade -y && apt-get install -y cmake ninja-build g++
 RUN git clone --depth 1 https://github.com/google/bloaty.git bloaty
 WORKDIR bloaty
diff --git a/benchmarks/curl_curl_fuzzer_http/Dockerfile b/benchmarks/curl_curl_fuzzer_http/Dockerfile
index 2a95753d4..898061703 100644
--- a/benchmarks/curl_curl_fuzzer_http/Dockerfile
+++ b/benchmarks/curl_curl_fuzzer_http/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 # Curl will be checked out to the commit hash specified in benchmark.yaml.
 RUN git clone --depth 1 https://github.com/curl/curl.git /src/curl
diff --git a/benchmarks/ffmpeg_ffmpeg_demuxer_fuzzer/Dockerfile b/benchmarks/ffmpeg_ffmpeg_demuxer_fuzzer/Dockerfile
index 6f519d7b1..9b67837cb 100644
--- a/benchmarks/ffmpeg_ffmpeg_demuxer_fuzzer/Dockerfile
+++ b/benchmarks/ffmpeg_ffmpeg_demuxer_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:c0eeba3437a2173c6a7115cf43062b351ed48cc2b54f54f895423d6a5af1dc3e
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 ADD bionic.list /etc/apt/sources.list.d/bionic.list
 ADD nasm_apt.pin /etc/apt/preferences
 RUN apt-get update && apt-get upgrade -y && apt-get install -y make autoconf automake libtool build-essential \
diff --git a/benchmarks/ffmpeg_ffmpeg_demuxer_fuzzer/build.sh b/benchmarks/ffmpeg_ffmpeg_demuxer_fuzzer/build.sh
index 9619d7bfd..21dceb802 100755
--- a/benchmarks/ffmpeg_ffmpeg_demuxer_fuzzer/build.sh
+++ b/benchmarks/ffmpeg_ffmpeg_demuxer_fuzzer/build.sh
@@ -29,7 +29,7 @@ export LD_LIBRARY_PATH="$FFMPEG_DEPS_PATH/lib"
 cd $SRC
 bzip2 -f -d alsa-lib-*
 tar xf alsa-lib-*
-cd alsa-lib-*
+cd alsa-lib-1.1.0
 ./configure --prefix="$FFMPEG_DEPS_PATH" --enable-static --disable-shared
 make clean
 make -j$(nproc) all
diff --git a/benchmarks/file_magic_fuzzer/Dockerfile b/benchmarks/file_magic_fuzzer/Dockerfile
index dc12ea768..2674570c0 100644
--- a/benchmarks/file_magic_fuzzer/Dockerfile
+++ b/benchmarks/file_magic_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get update && apt-get install -y make autoconf automake libtool shtool zlib1g-dev
 RUN git clone --depth 1 https://github.com/file/file.git
diff --git a/benchmarks/freetype2-2017/Dockerfile b/benchmarks/freetype2-2017/Dockerfile
index 66ca5a8f8..fc92d83a1 100644
--- a/benchmarks/freetype2-2017/Dockerfile
+++ b/benchmarks/freetype2-2017/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update &&  \
     apt-get upgrade -y && \
diff --git a/benchmarks/grok_grk_decompress_fuzzer/Dockerfile b/benchmarks/grok_grk_decompress_fuzzer/Dockerfile
index 60479478b..dc2776a15 100644
--- a/benchmarks/grok_grk_decompress_fuzzer/Dockerfile
+++ b/benchmarks/grok_grk_decompress_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN git clone https://github.com/GrokImageCompression/grok.git grok
 RUN git clone https://github.com/GrokImageCompression/grok-test-data.git grok/data
diff --git a/benchmarks/harfbuzz-1.3.2/Dockerfile b/benchmarks/harfbuzz-1.3.2/Dockerfile
index 2c9430ab3..4063700ac 100644
--- a/benchmarks/harfbuzz-1.3.2/Dockerfile
+++ b/benchmarks/harfbuzz-1.3.2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && \
     apt-get install -y \
diff --git a/benchmarks/jsoncpp_jsoncpp_fuzzer/Dockerfile b/benchmarks/jsoncpp_jsoncpp_fuzzer/Dockerfile
index 865673826..8d953abbb 100644
--- a/benchmarks/jsoncpp_jsoncpp_fuzzer/Dockerfile
+++ b/benchmarks/jsoncpp_jsoncpp_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && apt-get install -y build-essential make curl wget
 
 # Install latest cmake.
diff --git a/benchmarks/lcms-2017-03-21/Dockerfile b/benchmarks/lcms-2017-03-21/Dockerfile
index ea17bafb6..25d53a9c3 100644
--- a/benchmarks/lcms-2017-03-21/Dockerfile
+++ b/benchmarks/lcms-2017-03-21/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && \
     apt-get install -y \
diff --git a/benchmarks/libarchive_libarchive_fuzzer/Dockerfile b/benchmarks/libarchive_libarchive_fuzzer/Dockerfile
index a43ecdbf7..caebf2323 100644
--- a/benchmarks/libarchive_libarchive_fuzzer/Dockerfile
+++ b/benchmarks/libarchive_libarchive_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 # Installing optional libraries can utilize more code path and/or improve
 # performance (avoid calling external programs).
diff --git a/benchmarks/libgit2_objects_fuzzer/Dockerfile b/benchmarks/libgit2_objects_fuzzer/Dockerfile
index 010ed81ee..31c702ade 100644
--- a/benchmarks/libgit2_objects_fuzzer/Dockerfile
+++ b/benchmarks/libgit2_objects_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && apt-get install -y make autoconf automake libtool cmake
 RUN git clone https://github.com/libgit2/libgit2 libgit2
diff --git a/benchmarks/libhevc_hevc_dec_fuzzer/Dockerfile b/benchmarks/libhevc_hevc_dec_fuzzer/Dockerfile
index 95710ef4e..460ea5435 100644
--- a/benchmarks/libhevc_hevc_dec_fuzzer/Dockerfile
+++ b/benchmarks/libhevc_hevc_dec_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 MAINTAINER harish.mahendrakar@ittiam.com
 RUN apt-get update && apt-get install -y wget cmake
 RUN git clone https://android.googlesource.com/platform/external/libhevc
diff --git a/benchmarks/libhtp_fuzz_htp/Dockerfile b/benchmarks/libhtp_fuzz_htp/Dockerfile
index 77fd1487e..8c34bc73c 100644
--- a/benchmarks/libhtp_fuzz_htp/Dockerfile
+++ b/benchmarks/libhtp_fuzz_htp/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && apt-get install -y make autoconf automake libtool zlib1g-dev liblzma-dev
 RUN git clone https://github.com/OISF/libhtp.git libhtp
diff --git a/benchmarks/libjpeg-turbo-07-2017/Dockerfile b/benchmarks/libjpeg-turbo-07-2017/Dockerfile
index c0726938a..6d4593e46 100644
--- a/benchmarks/libjpeg-turbo-07-2017/Dockerfile
+++ b/benchmarks/libjpeg-turbo-07-2017/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && \
     apt-get install -y \
diff --git a/benchmarks/libpcap_fuzz_both/Dockerfile b/benchmarks/libpcap_fuzz_both/Dockerfile
index 6be82c520..28f800101 100644
--- a/benchmarks/libpcap_fuzz_both/Dockerfile
+++ b/benchmarks/libpcap_fuzz_both/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && apt-get install -y make cmake flex bison
 RUN git clone --depth 1 https://github.com/the-tcpdump-group/libpcap.git libpcap
 # for corpus as wireshark
diff --git a/benchmarks/libxml2-v2.9.2/Dockerfile b/benchmarks/libxml2-v2.9.2/Dockerfile
index 27566d64f..6af065776 100644
--- a/benchmarks/libxml2-v2.9.2/Dockerfile
+++ b/benchmarks/libxml2-v2.9.2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && \
     apt-get upgrade -y ca-certificates && \
diff --git a/benchmarks/libxml2_libxml2_xml_reader_for_file_fuzzer/Dockerfile b/benchmarks/libxml2_libxml2_xml_reader_for_file_fuzzer/Dockerfile
index 60a457081..5586c3f7c 100644
--- a/benchmarks/libxml2_libxml2_xml_reader_for_file_fuzzer/Dockerfile
+++ b/benchmarks/libxml2_libxml2_xml_reader_for_file_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 # Upgrade to avoid certs errors
 RUN apt-get update && apt-get upgrade -y && \
diff --git a/benchmarks/libxslt_xpath/Dockerfile b/benchmarks/libxslt_xpath/Dockerfile
index 79aedcd0d..79eacf330 100644
--- a/benchmarks/libxslt_xpath/Dockerfile
+++ b/benchmarks/libxslt_xpath/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 # Note that we don't use the system libxml2 but a custom instrumented build.
 # libgcrypt is required for the crypto extensions of libexslt.
diff --git a/benchmarks/libxslt_xpath/benchmark.yaml b/benchmarks/libxslt_xpath/benchmark.yaml
index 0e0d99a7c..f1a88fcb2 100644
--- a/benchmarks/libxslt_xpath/benchmark.yaml
+++ b/benchmarks/libxslt_xpath/benchmark.yaml
@@ -1,29 +1,4 @@
-commit: 2c20c70cd81e5ba51dc8e160fbd1c855eb97f065
-commit_date: 2020-09-20 15:01:51+00:00
+commit: 7bcc8dca27041e2b03855508fe54d435d816a78f
+commit_date: 2022-09-22 10:59:13+00:00
 fuzz_target: xpath
 project: libxslt
-unsupported_fuzzers:
-  - aflcc
-  - aflplusplus_qemu
-  - aflplusplus_um_random
-  - aflplusplus_um_prioritize
-  - afl_um_random
-  - afl_um_prioritize
-  - honggfuzz_um_random
-  - honggfuzz_um_prioritize
-  - eclipser_um_random
-  - eclipser_um_prioritize
-  - libfuzzer_um_random
-  - libfuzzer_um_prioritize
-  - aflplusplus_qemu_tracepc
-  - aflplusplus_frida
-  - klee
-  - weizz_qemu
-  - aflplusplus_cmplog_double
-  - symcc_aflplusplus_single
-  - eclipser_aflplusplus
-  - aflplusplus_qemu_double
-  - fuzzolic_aflplusplus_z3
-  - symqemu_aflplusplus
-  - fuzzolic_aflplusplus_fuzzy
-  - fuzzolic_aflplusplus_z3dict
diff --git a/benchmarks/libxslt_xpath/build.sh b/benchmarks/libxslt_xpath/build.sh
index fcfa95acf..bdf0e00ec 100755
--- a/benchmarks/libxslt_xpath/build.sh
+++ b/benchmarks/libxslt_xpath/build.sh
@@ -16,9 +16,19 @@
 #
 ################################################################################
 
-# This would require an instrumented libgcrypt build.
-CRYPTO_CONF=--with-crypto
-CRYPTO_LIBS=-lgcrypt
+if [ "$SANITIZER" = undefined ]; then
+    export CFLAGS="$CFLAGS -fsanitize=unsigned-integer-overflow -fno-sanitize-recover=unsigned-integer-overflow"
+    export CXXFLAGS="$CXXFLAGS -fsanitize=unsigned-integer-overflow -fno-sanitize-recover=unsigned-integer-overflow"
+fi
+
+if [ "$SANITIZER" = memory ]; then
+    # This would require an instrumented libgcrypt build.
+    CRYPTO_CONF=--without-crypto
+    CRYPTO_LIBS=
+else
+    CRYPTO_CONF=--with-crypto
+    CRYPTO_LIBS=-lgcrypt
+fi
 
 cd ../libxml2
 ./autogen.sh \
@@ -49,7 +59,7 @@ cd ../libxslt
     --without-profiler
 make -j$(nproc) V=1
 
-for file in xpath fuzz; do
+for file in xpath xslt fuzz; do
     # Compile as C
     $CC $CFLAGS \
         -I. -I../libxml2/include \
@@ -57,7 +67,7 @@ for file in xpath fuzz; do
         -o tests/fuzz/$file.o
 done
 
-for fuzzer in xpath; do
+for fuzzer in xpath xslt; do
     # Link with $CXX
     $CXX $CXXFLAGS \
         tests/fuzz/$fuzzer.o tests/fuzz/fuzz.o \
@@ -70,4 +80,4 @@ for fuzzer in xpath; do
     zip -j $OUT/${fuzzer}_seed_corpus.zip tests/fuzz/seed/$fuzzer/*
 done
 
-cp tests/fuzz/xpath.dict tests/fuzz/xpath.xml $OUT/
+cp tests/fuzz/*.dict tests/fuzz/*.xml $OUT/
diff --git a/benchmarks/matio_matio_fuzzer/Dockerfile b/benchmarks/matio_matio_fuzzer/Dockerfile
index ad912ea56..ecc135991 100644
--- a/benchmarks/matio_matio_fuzzer/Dockerfile
+++ b/benchmarks/matio_matio_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 MAINTAINER t-beu@users.sourceforge.net
 RUN apt-get update && apt-get install -y make autoconf automake libhdf5-dev libtool zlib1g-dev
 ENV HDF5_DIR /usr/lib/x86_64-linux-gnu/hdf5/serial
diff --git a/benchmarks/mbedtls_fuzz_dtlsclient/Dockerfile b/benchmarks/mbedtls_fuzz_dtlsclient/Dockerfile
index d53911da9..f3f699992 100644
--- a/benchmarks/mbedtls_fuzz_dtlsclient/Dockerfile
+++ b/benchmarks/mbedtls_fuzz_dtlsclient/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && apt-get install -y make cmake
 RUN git clone --recursive --depth 1 https://github.com/ARMmbed/mbedtls.git mbedtls
 RUN git clone --depth 1 https://github.com/google/boringssl.git boringssl
diff --git a/benchmarks/mruby-2018-05-23/Dockerfile b/benchmarks/mruby-2018-05-23/Dockerfile
index 520bf30e2..bd2e32835 100644
--- a/benchmarks/mruby-2018-05-23/Dockerfile
+++ b/benchmarks/mruby-2018-05-23/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && apt-get install -y build-essential ruby bison ninja-build \
     cmake zlib1g-dev libbz2-dev liblzma-dev
 RUN git clone --depth 1 https://github.com/mruby/mruby mruby
diff --git a/benchmarks/muparser_set_eval_fuzzer/Dockerfile b/benchmarks/muparser_set_eval_fuzzer/Dockerfile
index 2cc4c4048..255b2be45 100644
--- a/benchmarks/muparser_set_eval_fuzzer/Dockerfile
+++ b/benchmarks/muparser_set_eval_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN apt-get install -y build-essential cmake pkg-config
 RUN git clone https://github.com/beltoforion/muparser.git muparser
diff --git a/benchmarks/njs_njs_process_script_fuzzer/Dockerfile b/benchmarks/njs_njs_process_script_fuzzer/Dockerfile
index a3a2fe366..49728a0c8 100644
--- a/benchmarks/njs_njs_process_script_fuzzer/Dockerfile
+++ b/benchmarks/njs_njs_process_script_fuzzer/Dockerfile
@@ -14,11 +14,11 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && apt-get install -y make autoconf automake libtool \
     mercurial libpcre3-dev subversion
 RUN hg clone http://hg.nginx.org/njs
-RUN svn co svn://vcs.exim.org/pcre/code/trunk pcre
+RUN git clone --branch pcre2-10.39 https://github.com/PCRE2Project/pcre2 pcre
 
 WORKDIR njs
 COPY build.sh $SRC/
diff --git a/benchmarks/openh264_decoder_fuzzer/Dockerfile b/benchmarks/openh264_decoder_fuzzer/Dockerfile
index 29c9a69ce..b1478fdaa 100644
--- a/benchmarks/openh264_decoder_fuzzer/Dockerfile
+++ b/benchmarks/openh264_decoder_fuzzer/Dockerfile
@@ -14,11 +14,11 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 MAINTAINER twsmith@mozilla.com
 RUN dpkg --add-architecture i386 && \
     apt-get update && \
-    apt-get install -y libstdc++-5-dev libstdc++-5-dev:i386 nasm subversion
-RUN git clone --depth 1 https://github.com/cisco/openh264.git openh264
+    apt-get install -y libstdc++-9-dev libstdc++-9-dev:i386 nasm subversion
+RUN git clone https://github.com/cisco/openh264.git openh264
 WORKDIR openh264
 COPY build.sh decoder_fuzzer.cpp $SRC/
diff --git a/benchmarks/openssl_x509/Dockerfile b/benchmarks/openssl_x509/Dockerfile
index 64b5e2b45..ff13ed542 100644
--- a/benchmarks/openssl_x509/Dockerfile
+++ b/benchmarks/openssl_x509/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && apt-get install -y make
 RUN git clone --depth 1 https://github.com/openssl/openssl.git
 WORKDIR openssl
diff --git a/benchmarks/openthread-2019-12-23/Dockerfile b/benchmarks/openthread-2019-12-23/Dockerfile
index 6f2a3e955..020b0552f 100644
--- a/benchmarks/openthread-2019-12-23/Dockerfile
+++ b/benchmarks/openthread-2019-12-23/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && \
     apt-get install -y \
diff --git a/benchmarks/oss_fuzz_benchmark_integration.py b/benchmarks/oss_fuzz_benchmark_integration.py
index 48123e906..03c5c27b1 100755
--- a/benchmarks/oss_fuzz_benchmark_integration.py
+++ b/benchmarks/oss_fuzz_benchmark_integration.py
@@ -77,6 +77,7 @@ def find_digest(self, timestamp):
 def copy_oss_fuzz_files(project, commit_date, benchmark_dir):
     """Checks out the right files from OSS-Fuzz to build the benchmark based on
     |project| and |commit_date|. Then copies them to |benchmark_dir|."""
+    print('j')
     if not os.path.exists(os.path.join(OSS_FUZZ_DIR, '.git')):
         logs.error(
             '%s is not a git repo. Try running: git submodule update --init',
@@ -170,7 +171,11 @@ def replace_base_builder(benchmark_dir, commit_date):
     base_builder_name = _get_base_builder(dockerfile_path)
     base_builder_repo = _load_docker_repo(base_builder_name)
     if base_builder_repo:
-        base_builder_digest = base_builder_repo.find_digest(commit_date)
+        # base_builder_digest = base_builder_repo.find_digest(commit_date)
+        base_builder_digest = ('sha256:fb1a9a49752c9e504687448d1f1a048ec1e0'
+                               '62e2e40f7e8a23e86b63ff3dad7c')
+        print(f'Using image {base_builder_digest}. '
+              'See https://github.com/google/oss-fuzz/issues/8625')
         logs.info('Using base-builder with digest %s.', base_builder_digest)
         _replace_base_builder_digest(
             dockerfile_path, base_builder_name, base_builder_digest)
@@ -201,9 +206,9 @@ def integrate_benchmark(project, fuzz_target, benchmark_name, commit,
     # work on arbitrary iso format strings.
     commit_date = datetime.datetime.fromisoformat(commit_date).astimezone(
         datetime.timezone.utc)
-    if commit_date >= OSS_FUZZ_IMAGE_UPGRADE_DATE:
+    if commit_date <= OSS_FUZZ_IMAGE_UPGRADE_DATE:
         raise ValueError(
-            f'Cannot integrate benchmark after {OSS_FUZZ_IMAGE_UPGRADE_DATE}. '
+            f'Cannot integrate benchmark before {OSS_FUZZ_IMAGE_UPGRADE_DATE}. '
             'See https://github.com/google/fuzzbench/issues/1353')
     copy_oss_fuzz_files(project, commit_date, benchmark_dir)
     replace_base_builder(benchmark_dir, commit_date)
@@ -230,14 +235,19 @@ def main():
         '--benchmark-name',
         help='Benchmark name. Defaults to <project>_<fuzz_target>',
         required=False)
-    parser.add_argument('-c', '--commit', help='Project commit hash.')
+    parser.add_argument('-c', '--commit', help='Project commit hash.',
+                        required=True)
     parser.add_argument(
         '-d',
         '--date',
-        help='Date of the commit. Example: 2019-10-19T09:07:25+01:00')
+        help='Date of the commit. Example: 2019-10-19T09:07:25+01:00',
+        required=True)
 
     logs.initialize()
     args = parser.parse_args()
+    if args.date is None and args.commit is None:
+        args.date = str(datetime.datetime.utcnow())
+        print('Neither date nor commit specified, using time now: ', args.date)
     benchmark = integrate_benchmark(
         args.project, args.fuzz_target, args.benchmark_name,
         args.commit, args.date)
diff --git a/benchmarks/php_php-fuzz-execute/Dockerfile b/benchmarks/php_php-fuzz-execute/Dockerfile
index abf51f5b5..1edacfaab 100644
--- a/benchmarks/php_php-fuzz-execute/Dockerfile
+++ b/benchmarks/php_php-fuzz-execute/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && \
     apt-get install -y autoconf automake libtool bison re2c pkg-config
 RUN git clone --depth 1 --branch master https://github.com/php/php-src.git php-src
diff --git a/benchmarks/php_php-fuzz-parser-2020-07-25/Dockerfile b/benchmarks/php_php-fuzz-parser-2020-07-25/Dockerfile
index abf51f5b5..1edacfaab 100644
--- a/benchmarks/php_php-fuzz-parser-2020-07-25/Dockerfile
+++ b/benchmarks/php_php-fuzz-parser-2020-07-25/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && \
     apt-get install -y autoconf automake libtool bison re2c pkg-config
 RUN git clone --depth 1 --branch master https://github.com/php/php-src.git php-src
diff --git a/benchmarks/php_php-fuzz-parser/Dockerfile b/benchmarks/php_php-fuzz-parser/Dockerfile
index 18e18c4d5..7d8934275 100644
--- a/benchmarks/php_php-fuzz-parser/Dockerfile
+++ b/benchmarks/php_php-fuzz-parser/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && \
     apt-get install -y autoconf automake libtool bison re2c pkg-config
 
diff --git a/benchmarks/poppler_pdf_fuzzer/Dockerfile b/benchmarks/poppler_pdf_fuzzer/Dockerfile
index 484fb42fc..624c023bc 100644
--- a/benchmarks/poppler_pdf_fuzzer/Dockerfile
+++ b/benchmarks/poppler_pdf_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 MAINTAINER jonathan@titanous.com
 RUN apt-get update && apt-get upgrade -y && apt-get install -y make autoconf libz-dev lib32z1-dev zlib1g-dev automake libtool pkg-config cmake
 RUN git clone --depth 1 https://anongit.freedesktop.org/git/poppler/poppler.git
diff --git a/benchmarks/proj4-2017-08-14/Dockerfile b/benchmarks/proj4-2017-08-14/Dockerfile
index 44e51f680..e8bbe1b2a 100644
--- a/benchmarks/proj4-2017-08-14/Dockerfile
+++ b/benchmarks/proj4-2017-08-14/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && \
     apt-get install -y \
diff --git a/benchmarks/proj4_standard_fuzzer/Dockerfile b/benchmarks/proj4_standard_fuzzer/Dockerfile
index 8da1d80e6..39ea90596 100644
--- a/benchmarks/proj4_standard_fuzzer/Dockerfile
+++ b/benchmarks/proj4_standard_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && apt-get install -y make autoconf automake libtool g++ sqlite3 libsqlite3-dev pkg-config
 RUN git clone --depth 1 https://github.com/OSGeo/proj.4 proj.4
 WORKDIR proj.4
diff --git a/benchmarks/quickjs_eval-2020-01-05/Dockerfile b/benchmarks/quickjs_eval-2020-01-05/Dockerfile
index 270633b67..e26818eed 100644
--- a/benchmarks/quickjs_eval-2020-01-05/Dockerfile
+++ b/benchmarks/quickjs_eval-2020-01-05/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && \
     apt-get install -y autoconf automake libtool bison pkg-config
 RUN git clone --depth 1 --branch master https://github.com/bellard/quickjs quickjs
diff --git a/benchmarks/re2-2014-12-09/Dockerfile b/benchmarks/re2-2014-12-09/Dockerfile
index ba4d7cf8b..355704ca3 100644
--- a/benchmarks/re2-2014-12-09/Dockerfile
+++ b/benchmarks/re2-2014-12-09/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && \
     apt-get install -y \
diff --git a/benchmarks/sqlite3_ossfuzz/Dockerfile b/benchmarks/sqlite3_ossfuzz/Dockerfile
index dd1e33a5b..550814da6 100644
--- a/benchmarks/sqlite3_ossfuzz/Dockerfile
+++ b/benchmarks/sqlite3_ossfuzz/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && apt-get upgrade -y && apt-get install -y make autoconf automake libtool curl tcl zlib1g-dev
 
 RUN mkdir $SRC/sqlite3 && \
diff --git a/benchmarks/stb_stbi_read_fuzzer/Dockerfile b/benchmarks/stb_stbi_read_fuzzer/Dockerfile
index 250736ee1..33ae29bd1 100644
--- a/benchmarks/stb_stbi_read_fuzzer/Dockerfile
+++ b/benchmarks/stb_stbi_read_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && \
     apt-get install -y wget tar
diff --git a/benchmarks/systemd_fuzz-link-parser/Dockerfile b/benchmarks/systemd_fuzz-link-parser/Dockerfile
index 26c882881..ec767dec9 100644
--- a/benchmarks/systemd_fuzz-link-parser/Dockerfile
+++ b/benchmarks/systemd_fuzz-link-parser/Dockerfile
@@ -14,12 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
-RUN apt-get update &&\
-    apt-get install -y gperf m4 gettext python3-pip \
-        libcap-dev libmount-dev libkmod-dev \
-        pkg-config wget &&\
-    pip3 install meson==0.55.3 ninja==1.10.0
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN git clone --depth 1 https://github.com/systemd/systemd systemd
 WORKDIR systemd
 COPY build.sh $SRC/
diff --git a/benchmarks/systemd_fuzz-link-parser/benchmark.yaml b/benchmarks/systemd_fuzz-link-parser/benchmark.yaml
index a40435c78..cb604c95e 100644
--- a/benchmarks/systemd_fuzz-link-parser/benchmark.yaml
+++ b/benchmarks/systemd_fuzz-link-parser/benchmark.yaml
@@ -1,31 +1,4 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-commit: 99fdffaa194cbfed659b0c1bfd0ace4bfcd2a245
-commit_date: 2020-02-10 16:19:52+00:00
+commit: 07faa4990fcc1e80c9ef63c09eb91bb73dab19cb
+commit_date: 2022-09-28 12:03:03+00:00
 fuzz_target: fuzz-link-parser
 project: systemd
-unsupported_fuzzers:
-  - aflplusplus_gcc
-  - aflcc
-  - klee
-  - aflplusplus_cmplog_double
-  - symcc_aflplusplus_single
-  - eclipser_aflplusplus
-  - aflplusplus_qemu_double
-  - aflplusplus_frida
-  - fuzzolic_aflplusplus_z3
-  - symqemu_aflplusplus
-  - fuzzolic_aflplusplus_fuzzy
-  - fuzzolic_aflplusplus_z3dict
diff --git a/benchmarks/systemd_fuzz-varlink/Dockerfile b/benchmarks/systemd_fuzz-varlink/Dockerfile
index 02da09273..64d0009fc 100644
--- a/benchmarks/systemd_fuzz-varlink/Dockerfile
+++ b/benchmarks/systemd_fuzz-varlink/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && \
     apt-get install -y \
diff --git a/benchmarks/usrsctp_fuzzer_connect/Dockerfile b/benchmarks/usrsctp_fuzzer_connect/Dockerfile
index 5374e9404..3ef7db986 100644
--- a/benchmarks/usrsctp_fuzzer_connect/Dockerfile
+++ b/benchmarks/usrsctp_fuzzer_connect/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 MAINTAINER weinrank@fh-muenster.de
 RUN apt-get update && apt-get install -y make cmake pkg-config
 RUN git clone --branch oss-fuzz https://github.com/weinrank/usrsctp usrsctp
diff --git a/benchmarks/vorbis-2017-12-11/Dockerfile b/benchmarks/vorbis-2017-12-11/Dockerfile
index 8732dcfb7..1f91edebc 100644
--- a/benchmarks/vorbis-2017-12-11/Dockerfile
+++ b/benchmarks/vorbis-2017-12-11/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && \
     apt-get install -y \
diff --git a/benchmarks/wireshark_fuzzshark_ip/Dockerfile b/benchmarks/wireshark_fuzzshark_ip/Dockerfile
index ce7468c91..40ebc7558 100644
--- a/benchmarks/wireshark_fuzzshark_ip/Dockerfile
+++ b/benchmarks/wireshark_fuzzshark_ip/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && apt-get install -y make cmake \
                        flex bison \
diff --git a/benchmarks/woff2-2016-05-06/Dockerfile b/benchmarks/woff2-2016-05-06/Dockerfile
index 2d59303af..e96ef5885 100644
--- a/benchmarks/woff2-2016-05-06/Dockerfile
+++ b/benchmarks/woff2-2016-05-06/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && \
     apt-get install -y \
diff --git a/benchmarks/zlib_zlib_uncompress_fuzzer/Dockerfile b/benchmarks/zlib_zlib_uncompress_fuzzer/Dockerfile
index c1ff52339..e84e45c15 100644
--- a/benchmarks/zlib_zlib_uncompress_fuzzer/Dockerfile
+++ b/benchmarks/zlib_zlib_uncompress_fuzzer/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 -b develop https://github.com/madler/zlib.git
 WORKDIR zlib
diff --git a/benchmarks/zstd_stream_decompress/Dockerfile b/benchmarks/zstd_stream_decompress/Dockerfile
index f7a687af6..921974dc3 100644
--- a/benchmarks/zstd_stream_decompress/Dockerfile
+++ b/benchmarks/zstd_stream_decompress/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:1b6a6993690fa947df74ceabbf6a1f89a46d7e4277492addcd45a8525e34be5a
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:fb1a9a49752c9e504687448d1f1a048ec1e062e2e40f7e8a23e86b63ff3dad7c
 
 RUN apt-get update && apt-get upgrade -y && apt-get install -y make python wget
 # Clone source
diff --git a/fuzzers/afl/builder.Dockerfile b/fuzzers/afl/builder.Dockerfile
index d4beed782..0b382b81e 100644
--- a/fuzzers/afl/builder.Dockerfile
+++ b/fuzzers/afl/builder.Dockerfile
@@ -20,7 +20,7 @@ FROM $parent_image
 RUN git clone https://github.com/google/AFL.git /afl && \
     cd /afl && \
     git checkout 61037103ae3722c8060ff7082994836a794f978e && \
-    AFL_NO_X86=1 make
+    CFLAGS= CXXFLAGS= AFL_NO_X86=1 make
 
 # Use afl_driver.cpp from LLVM as our fuzzing library.
 RUN apt-get update && \
diff --git a/fuzzers/afl/fuzzer.py b/fuzzers/afl/fuzzer.py
index 853c0890c..484105489 100755
--- a/fuzzers/afl/fuzzer.py
+++ b/fuzzers/afl/fuzzer.py
@@ -48,6 +48,9 @@ def get_stats(output_corpus, fuzzer_log):  # pylint: disable=unused-argument
     """Gets fuzzer stats for AFL."""
     # Get a dictionary containing the stats AFL reports.
     stats_file = os.path.join(output_corpus, 'fuzzer_stats')
+    if not os.path.exists(stats_file):
+        print('Can\'t find fuzzer_stats')
+        return '{}'
     with open(stats_file) as file_handle:
         stats_file_lines = file_handle.read().splitlines()
     stats_file_dict = {}