Roll clang to llvmorg-15-init-1464-gbf7f8d6f (#8313)

* Roll clang to llvmorg-15-init-1464-gbf7f8d6f This is incremental roll meant to break less than #8108 * Pin some projects * pin cryptofuzz
2022-08-24 10:31:28 -04:00 · 2022-08-24 10:31:28 -04:00 · dabee12f18
parent e7567e2902
commit dabee12f18
13 changed files with 35 additions and 13 deletions
--- a/infra/base-images/base-clang/checkout_build_install_llvm.sh
+++ b/infra/base-images/base-clang/checkout_build_install_llvm.sh
@ -52,7 +52,7 @@ if [ -n "$INTROSPECTOR_PATCHES" ]; then
 fi

 # For manual bumping.
-OUR_LLVM_REVISION=llvmorg-14-init-7378-gaee49255
+OUR_LLVM_REVISION=llvmorg-15-init-1464-gbf7f8d6f

 mkdir $SRC/chromium_tools
 cd $SRC/chromium_tools
--- a/projects/bearssl/Dockerfile
+++ b/projects/bearssl/Dockerfile
@ -14,7 +14,9 @@
 #
 ################################################################################

-FROM gcr.io/oss-fuzz-base/base-builder
+# Held back because of github.com/google/oss-fuzz/pull/8313
+# Please fix failure and upgrade.
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget python
 RUN git clone --depth 1 https://www.bearssl.org/git/BearSSL
 RUN git clone --depth 1 https://github.com/randombit/botan.git
--- a/projects/bitcoin-core/Dockerfile
+++ b/projects/bitcoin-core/Dockerfile
@ -14,7 +14,9 @@
 #
 ################################################################################

-FROM gcr.io/oss-fuzz-base/base-builder-rust
+# Held back because of github.com/google/oss-fuzz/pull/8313
+# Please fix failure and upgrade.
+FROM gcr.io/oss-fuzz-base/base-builder-rust@sha256:b942129fbed50e87e554a58dbbbbf90382f17c650dc4d4e27b7a9f8e68b1d494

 # Packages taken from:
 # * https://github.com/bitcoin/bitcoin/blob/master/doc/build-unix.md#dependency-build-instructions
--- a/projects/circl/Dockerfile
+++ b/projects/circl/Dockerfile
@ -14,7 +14,9 @@
 #
 ################################################################################

-FROM gcr.io/oss-fuzz-base/base-builder-go
+# Held back because of github.com/google/oss-fuzz/pull/8313
+# Please fix failure and upgrade.
+FROM gcr.io/oss-fuzz-base/base-builder-go@sha256:b602c177fc34e8237e7a8a6211dc6e2a9570477e6c74c8d379ddab6961b8f39c

 ENV GO111MODULE off

--- a/projects/cryptofuzz/Dockerfile
+++ b/projects/cryptofuzz/Dockerfile
@ -14,7 +14,7 @@
 #
 ################################################################################

-FROM gcr.io/oss-fuzz-base/base-builder-rust
+FROM gcr.io/oss-fuzz-base/base-builder-rust@sha256:b942129fbed50e87e554a58dbbbbf90382f17c650dc4d4e27b7a9f8e68b1d494
 ENV GOPATH /root/go
 ENV PATH $PATH:/root/.go/bin:$GOPATH/bin
 RUN install_go.sh
--- a/projects/libecc/Dockerfile
+++ b/projects/libecc/Dockerfile
@ -14,7 +14,9 @@
 #
 ################################################################################

-FROM gcr.io/oss-fuzz-base/base-builder
+# Held back because of github.com/google/oss-fuzz/pull/8313
+# Please fix failure and upgrade.
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget python bison flex texinfo lzip
 RUN git clone https://github.com/ANSSI-FR/libecc.git
 RUN git clone --depth 1 https://github.com/randombit/botan.git
--- a/projects/libressl/Dockerfile
+++ b/projects/libressl/Dockerfile
@ -14,7 +14,9 @@
 #
 ################################################################################

-FROM gcr.io/oss-fuzz-base/base-builder
+# Held back because of github.com/google/oss-fuzz/pull/8313
+# Please fix failure and upgrade.
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f
 RUN apt-get update && apt-get install -y make cmake wget
 RUN git clone --depth 1 https://github.com/libressl-portable/portable.git libressl
 RUN git clone --depth 1 https://github.com/libressl-portable/fuzz.git libressl.fuzzers
--- a/projects/nettle/Dockerfile
+++ b/projects/nettle/Dockerfile
@ -14,7 +14,9 @@
 #
 ################################################################################

-FROM gcr.io/oss-fuzz-base/base-builder
+# Held back because of github.com/google/oss-fuzz/pull/8313
+# Please fix failure and upgrade.
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f
 RUN apt-get install -y software-properties-common make autoconf build-essential wget lzip libtool python
 RUN git clone --depth 1 https://git.lysator.liu.se/nettle/nettle
 RUN git clone --depth 1 https://github.com/randombit/botan.git
--- a/projects/num-bigint/Dockerfile
+++ b/projects/num-bigint/Dockerfile
@ -14,7 +14,9 @@
 #
 ################################################################################

-FROM gcr.io/oss-fuzz-base/base-builder
+# Held back because of github.com/google/oss-fuzz/pull/8313
+# Please fix failure and upgrade.
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget python
 RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz
 RUN git clone --depth 1 https://github.com/randombit/botan.git
--- a/projects/orbit/Dockerfile
+++ b/projects/orbit/Dockerfile
@ -14,7 +14,9 @@
 #
 ################################################################################

-FROM gcr.io/oss-fuzz-base/base-builder
+# Held back because of github.com/google/oss-fuzz/pull/8313
+# Please fix failure and upgrade.
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f
 RUN apt-get update && apt-get install -y m4 libglu1-mesa-dev mesa-common-dev \
  libxmu-dev libxi-dev pkg-config libxxf86vm-dev patchelf

--- a/projects/relic/Dockerfile
+++ b/projects/relic/Dockerfile
@ -14,7 +14,9 @@
 #
 ################################################################################

-FROM gcr.io/oss-fuzz-base/base-builder
+# Held back because of github.com/google/oss-fuzz/pull/8313
+# Please fix failure and upgrade.
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget python
 RUN git clone --depth 1 https://github.com/relic-toolkit/relic.git
 RUN git clone --depth 1 https://github.com/randombit/botan.git
--- a/projects/rustcrypto/Dockerfile
+++ b/projects/rustcrypto/Dockerfile
@ -14,7 +14,9 @@
 #
 ################################################################################

-FROM gcr.io/oss-fuzz-base/base-builder
+# Held back because of github.com/google/oss-fuzz/pull/8313
+# Please fix failure and upgrade.
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget python
 RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz
 RUN git clone --depth 1 https://github.com/randombit/botan.git
--- a/projects/wolfssl/Dockerfile
+++ b/projects/wolfssl/Dockerfile
@ -14,7 +14,9 @@
 #
 ################################################################################

-FROM gcr.io/oss-fuzz-base/base-builder
+# Held back because of github.com/google/oss-fuzz/pull/8313
+# Please fix failure and upgrade.
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f

 RUN apt-get update && apt-get install -y make autoconf automake libtool zip wget python
 RUN git clone https://github.com/wolfssl/wolfssl --depth 1 $SRC/wolfssl