refactor(config): Align ubuntu-24-04 images with legacy setup

This change standardizes the Ubuntu 24.04 image configurations to
ensure they only update the base OS version, without altering tool
versions or core logic, maintaining consistency with the legacy images.

Key changes include:
- Reverted AFL++ installation to the legacy version in the base-builder.
- Synchronized the honggfuzz precompilation script.
- Added missing ccache, patchelf, and other configurations to the
  base-builder Dockerfile.
- Removed redundant Fuzz Introspector installation and aligned CFLAGS
  in the base-clang Dockerfile.
- Removed Python dependency version upgrades from the fuzzbench image
  setup.

Author: hunsche

infra/base-images/base-builder-fuzzbench/fuzzbench_install_dependencies_ubuntu_24_04

@@ -21,8 +21,6 @@ else
   apt-get update && apt-get install -y gcc gfortran python3-dev libopenblas-dev liblapack-dev cython3 libpq-dev
 fi
 wget -O /tmp/requirements.txt https://raw.githubusercontent.com/google/fuzzbench/master/requirements.txt
-sed -i 's/pytype==2022.10.13/pytype==2024.4.11/' /tmp/requirements.txt
-sed -i 's/Orange3==3.33.0/Orange3==3.39.0/' /tmp/requirements.txt
 pip3 install pip --upgrade
 CFLAGS= CXXFLAGS= pip3 install -r /tmp/requirements.txt
 rm /tmp/requirements.txt

infra/base-images/base-builder/precompile_honggfuzz_ubuntu_24_04

@@ -1,4 +1,4 @@
-#!/bin/bash -eu
+#!/bin/bash -eux
 # Copyright 2019 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,7 +33,8 @@ make clean
 # These CFLAGs match honggfuzz's default, with the exception of -mtune to
 # improve portability and `-D_HF_LINUX_NO_BFD` to remove assembly instructions
 # from the filenames.
-CC=clang CFLAGS="-O3 -funroll-loops -D_HF_LINUX_NO_BFD -fPIE" LDFLAGS="-no-pie" make
+sed -i 's/-Werror//g' Makefile
+CC=clang CFLAGS="-O3 -funroll-loops -D_HF_LINUX_NO_BFD -Wno-unterminated-string-initialization -Wno-error" make
 
 # libhfuzz.a will be added by CC/CXX linker directly during linking,
 # but it's defined here to satisfy the build infrastructure
@@ -42,4 +43,4 @@ popd > /dev/null
 
 apt-get remove -y --purge ${PACKAGES[@]}
 apt-get autoremove -y
-echo "Done."
+echo "Done."

infra/base-images/base-builder/ubuntu-24-04.Dockerfile

@@ -122,10 +122,12 @@ ENV FUZZER_LDFLAGS ""
 
 WORKDIR $SRC
 
+COPY afl_llvm22_patch.diff $SRC/
 RUN git clone https://github.com/AFLplusplus/AFLplusplus.git aflplusplus && \
     cd aflplusplus && \
-    git checkout daaefcddc063b356018c29027494a00bcfc3e240 && \
+    git checkout eadc8a2a7e0fa0338802ee6254bf296489ce4fd7 && \
     wget --no-check-certificate -O oss.sh https://raw.githubusercontent.com/vanhauser-thc/binary_blobs/master/oss.sh && \
+    git apply $SRC/afl_llvm22_patch.diff && \
     rm -rf .git && \
     chmod 755 oss.sh
 
@@ -198,4 +200,33 @@ COPY indexer /opt/indexer
 COPY --from=gcr.io/oss-fuzz-base/indexer /indexer/build/indexer /opt/indexer/indexer
 RUN chmod a+x /opt/indexer/indexer /opt/indexer/index_build.py
 
+COPY llvmsymbol.diff $SRC
+COPY detect_repo.py /opt/cifuzz/
+COPY bazel.bazelrc /root/.bazelrc
+
+# Set up ccache binary and cache directory.
+# /ccache/bin will contain the compiler wrappers, and /ccache/cache will
+# contain the actual cache, which can be saved.
+# To use this, set PATH=/ccache/bin:$PATH.
+RUN mkdir -p /ccache/bin && mkdir -p /ccache/cache && \
+    ln -s /usr/local/bin/ccache /ccache/bin/clang && \
+    ln -s /usr/local/bin/ccache /ccache/bin/clang++ && \
+    ln -s /usr/local/bin/ccache /ccache/bin/clang-jcc && \
+    ln -s /usr/local/bin/ccache /ccache/bin/clang++-jcc
+ENV CCACHE_DIR /ccache/cache
+
+# Don't check that the compiler is the same, so we can switch between jcc and
+# clang under the hood and re-use the same build cache.
+ENV CCACHE_COMPILERCHECK none
+ENV CCACHE_COMPILERTYPE clang
+
+# Build newer patchelf than the one available from Ubuntu.
+RUN cd /tmp && git clone https://github.com/NixOS/patchelf && \
+    apt-get update && apt-get install -y autoconf && \
+    cd patchelf && git checkout 523f401584d9584e76c9c77004e7abeb9e6c4551 && \
+    unset CFLAGS && export CXXFLAGS='-stdlib=libc++' && export LDFLAGS='-lpthread' && \
+    ./bootstrap.sh && ./configure && make && \
+    cp /tmp/patchelf/src/patchelf /usr/local/bin && \
+    rm -rf /tmp/patchelf && apt-get remove -y autoconf
+
 CMD ["compile"]

infra/base-images/base-clang/ubuntu-24-04.Dockerfile

@@ -33,15 +33,6 @@ RUN apt-get update && apt-get install -y wget sudo && \
     SUDO_FORCE_REMOVE=yes apt-get autoremove --purge -y wget sudo && \
     rm -rf /usr/local/doc/cmake /usr/local/bin/cmake-gui
 
-RUN apt-get update && apt-get install -y git && \
-    git clone https://github.com/ossf/fuzz-introspector.git fuzz-introspector && \
-    cd fuzz-introspector && \
-    git checkout 332d674f00b8abc4c9ebf10e9c42e5b72b331c63 && \
-    git submodule init && \
-    git submodule update && \
-    apt-get autoremove --purge -y git && \
-    rm -rf .git
-
 COPY checkout_build_install_llvm_ubuntu_24_04.sh /root/
 RUN chmod +x /root/checkout_build_install_llvm_ubuntu_24_04.sh
 # Keep all steps in the same script to decrease the number of intermediate
@@ -68,12 +59,12 @@ ENV CCC "clang++"
 ENV CFLAGS -O1 \
   -fno-omit-frame-pointer \
   -gline-tables-only \
-  -Wno-error=enum-constexpr-conversion \
   -Wno-error=incompatible-function-pointer-types \
   -Wno-error=int-conversion \
   -Wno-error=deprecated-declarations \
   -Wno-error=implicit-function-declaration \
   -Wno-error=implicit-int \
+  -Wno-error=unknown-warning-option \
   -Wno-error=vla-cxx-extension \
   -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 ENV CXXFLAGS_EXTRA "-stdlib=libc++"