From d30b10a5830cfc01c1b7e5e48fec94add79ef45c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Thu, 3 Aug 2023 19:04:04 +0000 Subject: [PATCH 1/3] dev-lang/rust: Update from 1.71.0 to 1.71.1 --- changelog/updates/2023-08-03-rust-1.71.1-update.md | 1 + .../src/third_party/coreos-overlay/dev-lang/rust/Manifest | 4 ++-- .../dev-lang/rust/{rust-1.71.0.ebuild => rust-1.71.1.ebuild} | 0 .../profiles/coreos/base/package.accept_keywords | 4 ++-- .../coreos-overlay/profiles/coreos/base/package.unmask | 5 ++--- .../virtual/rust/{rust-1.71.0.ebuild => rust-1.71.1.ebuild} | 0 6 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 changelog/updates/2023-08-03-rust-1.71.1-update.md rename sdk_container/src/third_party/coreos-overlay/dev-lang/rust/{rust-1.71.0.ebuild => rust-1.71.1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/virtual/rust/{rust-1.71.0.ebuild => rust-1.71.1.ebuild} (100%) diff --git a/changelog/updates/2023-08-03-rust-1.71.1-update.md b/changelog/updates/2023-08-03-rust-1.71.1-update.md new file mode 100644 index 0000000000..0691666c85 --- /dev/null +++ b/changelog/updates/2023-08-03-rust-1.71.1-update.md @@ -0,0 +1 @@ +- Rust ([1.71.1](https://github.com/rust-lang/rust/releases/tag/1.71.1)) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest index a0ee133214..b2fdde4e9c 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest @@ -30,5 +30,5 @@ DIST rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz 163456784 BLAKE2B 49a8397a7129a DIST rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e5fae8b3c87f54b39d922fe0c7694e0ba115ae34a668cc873390fc9e4638baaff5b6d1b4c67228c6bfc57b4da9bf77d6a452ca12bf6653d5610895b8ba19d64d SHA512 352749df741287107b966fd603113c51e82a426a7151e224e3a8d1cc7bd4658ef86147f6fce62caccd7b5779d9961be72cbb618db79a2850e8a8c4b0bc229ad3 DIST rust-1.70.0-x86_64-unknown-linux-musl.tar.xz 233692884 BLAKE2B 295e815bbee6dc135ad17dd78801999afa7880a7a8f5ad4932a7580f1b03d50b850bcc3eb68e9d679e0a2d68392d446423ea752e47bb22d64823bf3222e0b377 SHA512 5e42224e109d525a321c107005660059ddcb0414392abc660b80fb09a55c936c79215989646be0aff6b0427b2f5d82a2a19ec3bd3235883a2037575808aeb69b DIST rust-1.70.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 7c5be81109607f191f339cfef87c736e2d35d4a045511036ee6e9bd68f22fbaae825ad5c463b0a5bf29606a8b9cf488172d1338aa4d034767b0f59243613c250 SHA512 241863164ee1a0d702080c9967e2ec5bb7af9222236316c8857b89b517fcbdc362b26ff3e362c4be7fd2989d3fd2aad0a0476feacecd2604855dfa53f5f1af27 -DIST rustc-1.71.0-src.tar.xz 151962928 BLAKE2B da8d83cd6621947816630ae487efe7d087266c1352949cedbbd441ba7c7f7c7beb13b9470e66e2f3359c37a050d0e44d22481c418532d3ebb339a456ab092648 SHA512 2c93bafdd248563765a285add48ca77c1e4bad4d5431675ae6a5cdee4cfe7a41e6bcc880a489ca1069a307fd9a005f2d5f8e230dfc95b4a69152b4f9ca49ac44 -DIST rustc-1.71.0-src.tar.xz.asc 801 BLAKE2B e5ddc4b18a6caeeb63c5aed5b5d15989d086f408787d2e603e50e7b8548dc078683062627280fd2a0393bec01c314eb1cc59f9b0e3146abf07b8365a0b44c640 SHA512 cb1b208c8b2bfccf02c73c4246fb238edb0dd10e292c1ef781920964e54e40add3089d988769982c0ce06b719014685b1c37daa2d08b513d86ad73808f4ce3ac +DIST rustc-1.71.1-src.tar.xz 151983068 BLAKE2B 3dfdbc246feb84a79ae94c2de978c5585ee06cf6b683d2245869b62e28f7c79f89cc589f5431537713bf088236a0b824acefc1b68e418e9eb72e1eea98054e3f SHA512 fd0e5a16bdbeb539184513583089e55f681cb772810df357b6b1464853f7022ac02edab3dd155b2262ed0047e2a25dea3808dd078dcdfce9d399384465009db4 +DIST rustc-1.71.1-src.tar.xz.asc 801 BLAKE2B a88c073a70552d73e2d7695eceabdaa478f34501b7271fabf7f4a09f3efa545181f34353e45776b05918e6aeba88adb02f9731454f7085a7abf1602fc6589983 SHA512 9dd0406cf22f1daa7fcfd015fc1c6f8d36586aa99bf14c1491ee464c1f892ab759feb83e8b55b64713170fb777fdbe038fb5fd01a59c911b6599223baaba0677 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.71.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.71.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.71.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.71.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 23f5bfa07c..39b3313825 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -26,7 +26,7 @@ =dev-lang/nasm-2.15.05 ~arm64 # Accept unstable host Rust compilers -=dev-lang/rust-1.71.0 ~amd64 ~arm64 +=dev-lang/rust-1.71.1 ~amd64 ~arm64 # Needed by arm64-native SDK. =dev-lang/yasm-1.3.0-r1 ~arm64 @@ -88,4 +88,4 @@ =sys-power/acpid-2.0.33 ~amd64 ~arm64 # Accept unstable host Rust compilers. -=virtual/rust-1.71.0 ~amd64 ~arm64 +=virtual/rust-1.71.1 ~amd64 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask index 739c725ec0..6768e727c8 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask @@ -11,9 +11,8 @@ # Overwrite portage-stable mask. We haven't seen LLVM related problems # with rust so far, so keep using 1.70.0. -~dev-lang/rust-1.71.0 -~dev-lang/rust-1.71.0 -~virtual/rust-1.71.0 +~dev-lang/rust-1.71.1 +~virtual/rust-1.71.1 # portage-stable masked catalyst-3, and has not provided a stable way to # update to catalyst-4 so overriding the change for now to use catalyst-3 diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.71.0.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.71.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.71.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.71.1.ebuild From 4d7d503f88c34e6fedfbd067ed0acca89c79ff54 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 3 Aug 2023 21:22:56 +0200 Subject: [PATCH 2/3] changelog: add security changelog for Rust 1.71.1 --- changelog/security/2023-08-03-rust-1.71.1.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/security/2023-08-03-rust-1.71.1.md diff --git a/changelog/security/2023-08-03-rust-1.71.1.md b/changelog/security/2023-08-03-rust-1.71.1.md new file mode 100644 index 0000000000..b23e9b290d --- /dev/null +++ b/changelog/security/2023-08-03-rust-1.71.1.md @@ -0,0 +1 @@ +- SDK: Rust ([CVE-2023-38497](https://nvd.nist.gov/vuln/detail/CVE-2023-38497)) From 3876c47d55edb73e7c1777a747228cba0443e0c1 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 4 Aug 2023 07:57:19 +0200 Subject: [PATCH 3/3] overlay dev-lang/rust: fix bash completion issue Revert commit 80f124a6200c01c504620993863adf8008e176b0. The bash completion is fixed again in upstream, so there is no need to change bash completion paths. Set it back to the original. --- .../coreos-overlay/dev-lang/rust/rust-1.71.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.71.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.71.1.ebuild index 755540fbb0..a635b023fd 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.71.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.71.1.ebuild @@ -663,8 +663,8 @@ src_install() { DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die # bug #689562, #689160 - rm -v "${ED}/usr/lib/${PN}/${PV}/src/etc/bash_completion.d/cargo" || die - rmdir -v "${ED}/usr/lib/${PN}/${PV}"/src/etc{/bash_completion.d,} || die + rm -v "${ED}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die + rmdir -v "${ED}/usr/lib/${PN}/${PV}"/etc{/bash_completion.d,} || die newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo local symlinks=(