From dabee12f18bfb11bb71cd1ded17bf0ffa8202635 Mon Sep 17 00:00:00 2001 From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> Date: Wed, 24 Aug 2022 10:31:28 -0400 Subject: [PATCH] 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 --- infra/base-images/base-clang/checkout_build_install_llvm.sh | 2 +- projects/bearssl/Dockerfile | 4 +++- projects/bitcoin-core/Dockerfile | 4 +++- projects/circl/Dockerfile | 4 +++- projects/cryptofuzz/Dockerfile | 2 +- projects/libecc/Dockerfile | 4 +++- projects/libressl/Dockerfile | 4 +++- projects/nettle/Dockerfile | 4 +++- projects/num-bigint/Dockerfile | 4 +++- projects/orbit/Dockerfile | 4 +++- projects/relic/Dockerfile | 4 +++- projects/rustcrypto/Dockerfile | 4 +++- projects/wolfssl/Dockerfile | 4 +++- 13 files changed, 35 insertions(+), 13 deletions(-) diff --git a/infra/base-images/base-clang/checkout_build_install_llvm.sh b/infra/base-images/base-clang/checkout_build_install_llvm.sh index 24c6cc29d..77cf0fa58 100755 --- 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 diff --git a/projects/bearssl/Dockerfile b/projects/bearssl/Dockerfile index e19062003..f5d01e518 100644 --- 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 diff --git a/projects/bitcoin-core/Dockerfile b/projects/bitcoin-core/Dockerfile index 61972719b..31b0d8a71 100644 --- 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 diff --git a/projects/circl/Dockerfile b/projects/circl/Dockerfile index 771de0e70..3e411812a 100644 --- 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 diff --git a/projects/cryptofuzz/Dockerfile b/projects/cryptofuzz/Dockerfile index bcc7999c7..ef379b1d3 100644 --- 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 diff --git a/projects/libecc/Dockerfile b/projects/libecc/Dockerfile index d417ee598..4d4543ca0 100644 --- 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 diff --git a/projects/libressl/Dockerfile b/projects/libressl/Dockerfile index 73d483fe2..685a333c9 100644 --- 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 diff --git a/projects/nettle/Dockerfile b/projects/nettle/Dockerfile index b5d2735d1..cdce6435b 100644 --- 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 diff --git a/projects/num-bigint/Dockerfile b/projects/num-bigint/Dockerfile index 918cd6956..6dd0a03e1 100644 --- 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 diff --git a/projects/orbit/Dockerfile b/projects/orbit/Dockerfile index 4d408fcaf..838a800b1 100644 --- 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 diff --git a/projects/relic/Dockerfile b/projects/relic/Dockerfile index 9bd88059a..68380532b 100644 --- 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 diff --git a/projects/rustcrypto/Dockerfile b/projects/rustcrypto/Dockerfile index 2695918a0..0655fd72e 100644 --- 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 diff --git a/projects/wolfssl/Dockerfile b/projects/wolfssl/Dockerfile index e8fed2eed..a08f99746 100644 --- 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