diff options
| author | bors <bors@rust-lang.org> | 2023-01-10 18:47:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-10 18:47:05 +0000 |
| commit | 90743e7298aca107ddaa0c202a4d3604e29bfeb6 (patch) | |
| tree | b9d89dc0174f00106b9da239fc97a1d06dd28498 /src | |
| parent | 69f9c33d71c871fc16ac445211281c6e7a340943 (diff) | |
| parent | 7a7064963ee41885be88f558736ca73dd8b02d70 (diff) | |
| download | rust-1.66.1.tar.gz rust-1.66.1.zip | |
Auto merge of #106685 - pietroalbini:pa-cve-stable, r=pietroalbini 1.66.1
[stable] Prepare Rust 1.66.1 and fix CVE-2022-46176 See https://blog.rust-lang.org/2023/01/10/cve-2022-46176.html r? `@ghost`
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh | 2 | ||||
| -rwxr-xr-x | src/ci/scripts/checkout-submodules.sh | 15 | ||||
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 2 | ||||
| -rw-r--r-- | src/version | 2 |
5 files changed, 12 insertions, 9 deletions
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh b/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh index 80a066cac29..33da9f7f381 100755 --- a/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh @@ -27,6 +27,6 @@ python3 "$X_PY" test --stage 2 src/tools/rustfmt python3 "$X_PY" test --stage 2 src/tools/miri # We natively run this script on x86_64-unknown-linux-gnu and x86_64-pc-windows-msvc. # Also cover some other targets (on both of these hosts) via cross-testing. -python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-msvc +#python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-msvc #FIXME(https://github.com/rust-lang/rust/issues/103519): macOS testing is currently disabled # python3 "$X_PY" test --stage 2 src/tools/miri --target aarch64-apple-darwin diff --git a/src/ci/scripts/checkout-submodules.sh b/src/ci/scripts/checkout-submodules.sh index f6cb8f8a6da..5bb343241ae 100755 --- a/src/ci/scripts/checkout-submodules.sh +++ b/src/ci/scripts/checkout-submodules.sh @@ -36,7 +36,8 @@ function fetch_github_commit_archive { rm $cached } -included="src/llvm-project src/doc/book src/doc/rust-by-example" +#included="src/llvm-project src/doc/book src/doc/rust-by-example" +included="" modules="$(git config --file .gitmodules --get-regexp '\.path$' | cut -d' ' -f2)" modules=($modules) use_git="" @@ -60,9 +61,9 @@ done retry sh -c "git submodule deinit -f $use_git && \ git submodule sync && \ git submodule update -j 16 --init --recursive --depth 1 $use_git" -STATUS=0 -for pid in ${bg_pids[*]} -do - wait $pid || STATUS=1 -done -exit ${STATUS} +#STATUS=0 +#for pid in ${bg_pids[*]} +#do +# wait $pid || STATUS=1 +#done +#exit ${STATUS} diff --git a/src/tools/cargo b/src/tools/cargo -Subproject d65d197ad5c6c09234369f219f943e291d4f04b +Subproject ad779e08be893e57a9e17a810223a3e966f8c0d diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 8a0239eceff..06c89cea1e2 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -47,6 +47,7 @@ const EXCEPTIONS: &[(&str, &str)] = &[ ("dunce", "CC0-1.0"), // cargo (dev dependency) ("similar", "Apache-2.0"), // cargo (dev dependency) ("normalize-line-endings", "Apache-2.0"), // cargo (dev dependency) + ("subtle", "BSD-3-Clause"), // cargo ]; const EXCEPTIONS_CRANELIFT: &[(&str, &str)] = &[ @@ -205,6 +206,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "snap", "stable_deref_trait", "stacker", + "subtle", "syn", "synstructure", "tempfile", diff --git a/src/version b/src/version index b6148bc0a75..0403bed10c3 100644 --- a/src/version +++ b/src/version @@ -1 +1 @@ -1.66.0 +1.66.1 |