diff options
| author | bors <bors@rust-lang.org> | 2023-03-27 07:38:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-27 07:38:54 +0000 |
| commit | 9eb3afe9ebe9c7d2b84b71002d44f4a0edac95e0 (patch) | |
| tree | 8f606a650f95120a50b98f69efec62b53f624fd5 | |
| parent | 8460ca823e8367a30dda430efda790588b8c84d3 (diff) | |
| parent | fa0aae449a5b6bec92874fa2d9c0b915136662bb (diff) | |
Auto merge of #109644 - pietroalbini:pa-1.68.2, r=pietroalbini1.68.2
[stable] Prepare Rust 1.68.2
This PR prepares the 1.68.2 point release, including the following Cargo PRs:
* rust-lang/cargo#11883
* rust-lang/cargo#11889
The following PR was also included as a pre-requisite for backporting:
* rust-lang/cargo#11635
cc `@rust-lang/release`
r? `@ghost`
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | RELEASES.md | 11 | ||||
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/version | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock index 64df70f68e9..c4bb084d908 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -342,7 +342,7 @@ dependencies = [ [[package]] name = "cargo" -version = "0.69.0" +version = "0.69.1" dependencies = [ "anyhow", "base64", diff --git a/RELEASES.md b/RELEASES.md index bc776ce2ac8..e2b43690d93 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,14 @@ +Version 1.68.2 (2023-03-28) +=========================== + +- [Update the GitHub RSA host key bundled within Cargo](https://github.com/rust-lang/cargo/pull/11883). + The key was [rotated by GitHub](https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/) + on 2023-03-24 after the old one leaked. +- [Mark the old GitHub RSA host key as revoked](https://github.com/rust-lang/cargo/pull/11889). + This will prevent Cargo from accepting the leaked key even when trusted by + the system. +- [Add support for `@revoked` and a better error message for `@cert-authority` in Cargo's SSH host key verification](https://github.com/rust-lang/cargo/pull/11635) + Version 1.68.1 (2023-03-23) =========================== diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 115f34552518a2f9b96d740192addbac1271e7e +Subproject 6feb7c9cfc0c5604732dba75e4c3b2dbea38e8d diff --git a/src/version b/src/version index 0944cc489c2..5deab586f9a 100644 --- a/src/version +++ b/src/version @@ -1 +1 @@ -1.68.1 +1.68.2 |