diff --git a/.gitignore b/.gitignore index 85da98e..8c04a16 100644 --- a/.gitignore +++ b/.gitignore @@ -432,3 +432,4 @@ /rustc-1.75.0-src.tar.xz /rustc-1.76.0-src.tar.xz /wasi-libc-03b228e46bb02fcc5927253e1b8ad715072b1ae4.tar.gz +/rustc-1.77.0-src.tar.xz diff --git a/rust.spec b/rust.spec index bb3b19c..3cddd3a 100644 --- a/rust.spec +++ b/rust.spec @@ -1,5 +1,5 @@ Name: rust -Version: 1.76.0 +Version: 1.77.0 Release: 1%{?dist} Summary: The Rust Programming Language License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-DFS-2016) @@ -14,9 +14,9 @@ ExclusiveArch: %{rust_arches} # To bootstrap from scratch, set the channel and date from src/stage0.json # e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13 # or nightly wants some beta-YYYY-MM-DD -%global bootstrap_version 1.75.0 -%global bootstrap_channel 1.75.0 -%global bootstrap_date 2023-12-28 +%global bootstrap_version 1.76.0 +%global bootstrap_channel 1.76.0 +%global bootstrap_date 2024-02-08 # Only the specified arches will use bootstrap binaries. # NOTE: Those binaries used to be uploaded with every new release, but that was @@ -67,9 +67,9 @@ ExclusiveArch: %{rust_arches} # Requires stable libgit2 1.7, and not the next minor soname change. # This needs to be consistent with the bindings in vendor/libgit2-sys. -%global min_libgit2_version 1.7.1 +%global min_libgit2_version 1.7.2 %global next_libgit2_version 1.8.0~ -%global bundled_libgit2_version 1.7.1 +%global bundled_libgit2_version 1.7.2 %if 0%{?fedora} >= 39 %bcond_with bundled_libgit2 %else @@ -135,7 +135,7 @@ Patch4: 0001-bootstrap-allow-disabling-target-self-contained.patch Patch5: 0002-set-an-external-library-path-for-wasm32-wasi.patch # We don't want to use the bundled library in libsqlite3-sys -Patch6: rustc-1.76.0-unbundle-sqlite.patch +Patch6: rustc-1.77.0-unbundle-sqlite.patch ### RHEL-specific patches below ### @@ -146,7 +146,7 @@ Source102: cargo_vendor.attr Source103: cargo_vendor.prov # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949) -Patch100: rustc-1.76.0-disable-libssh2.patch +Patch100: rustc-1.77.0-disable-libssh2.patch # Get the Rust triple for any arch. %{lua: function rust_triple(arch) @@ -749,6 +749,7 @@ test -r "%{profiler}" --set build.doc-stage=2 \ --set build.install-stage=2 \ --set build.test-stage=2 \ + --set build.optimized-compiler-builtins=false \ --enable-extended \ --tools=cargo,clippy,rls,rust-analyzer,rustfmt,src \ --enable-vendor \ @@ -1063,6 +1064,9 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" %changelog +* Thu Mar 21 2024 Nikita Popov - 1.77.0-1 +- Update to 1.77.0 + * Thu Feb 08 2024 Josh Stone - 1.76.0-1 - Update to 1.76.0. diff --git a/rustc-1.76.0-disable-libssh2.patch b/rustc-1.76.0-disable-libssh2.patch deleted file mode 100644 index 2c6fba2..0000000 --- a/rustc-1.76.0-disable-libssh2.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-01-07 18:12:08.000000000 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-01-09 15:25:51.519781381 -0800 -@@ -2071,7 +2071,6 @@ - dependencies = [ - "cc", - "libc", -- "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -@@ -2113,20 +2112,6 @@ - "pkg-config", - "vcpkg", - ] -- --[[package]] --name = "libssh2-sys" --version = "0.3.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" --dependencies = [ -- "cc", -- "libc", -- "libz-sys", -- "openssl-sys", -- "pkg-config", -- "vcpkg", --] - - [[package]] - name = "libz-sys" ---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-01-09 15:23:02.369032291 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-01-09 15:24:44.015679666 -0800 -@@ -40,7 +40,7 @@ - curl-sys = "0.4.70" - filetime = "0.2.22" - flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] } --git2 = "0.18.1" -+git2 = { version = "0.18.1", default-features = false, features = ["https"] } - git2-curl = "0.19.0" - gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } - gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] } diff --git a/rustc-1.76.0-unbundle-sqlite.patch b/rustc-1.76.0-unbundle-sqlite.patch deleted file mode 100644 index 6c1c667..0000000 --- a/rustc-1.76.0-unbundle-sqlite.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-01-07 18:12:08.000000000 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-01-09 15:36:23.808367445 -0800 -@@ -2109,7 +2109,6 @@ - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" - dependencies = [ -- "cc", - "pkg-config", - "vcpkg", - ] ---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-01-07 18:12:08.000000000 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-01-09 15:36:18.534437627 -0800 -@@ -73,7 +73,7 @@ - pulldown-cmark = { version = "0.9.3", default-features = false } - rand = "0.8.5" - regex = "1.10.2" --rusqlite = { version = "0.30.0", features = ["bundled"] } -+rusqlite = { version = "0.30.0", features = [] } - rustfix = { version = "0.7.0", path = "crates/rustfix" } - same-file = "1.0.6" - security-framework = "2.9.2" diff --git a/rustc-1.77.0-disable-libssh2.patch b/rustc-1.77.0-disable-libssh2.patch new file mode 100644 index 0000000..859fecb --- /dev/null +++ b/rustc-1.77.0-disable-libssh2.patch @@ -0,0 +1,44 @@ +diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-02-14 14:06:05.881165093 +0100 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-02-14 14:06:27.169456166 +0100 +@@ -2072,7 +2072,6 @@ checksum = "ee4126d8b4ee5c9d9ea891dd875c + dependencies = [ + "cc", + "libc", +- "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +@@ -2113,20 +2112,6 @@ dependencies = [ + "pkg-config", + "vcpkg", + ] +- +-[[package]] +-name = "libssh2-sys" +-version = "0.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" +-dependencies = [ +- "cc", +- "libc", +- "libz-sys", +- "openssl-sys", +- "pkg-config", +- "vcpkg", +-] + + [[package]] + name = "libz-sys" +diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-02-14 14:06:10.400226884 +0100 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-02-14 14:06:51.225785086 +0100 +@@ -44,7 +44,7 @@ curl = "0.4.44" + curl-sys = "0.4.70" + filetime = "0.2.23" + flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] } +-git2 = "0.18.2" ++git2 = { version = "0.18.2", default-features = false, features = ["https"] } + git2-curl = "0.19.0" + gix = { version = "0.57.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } + gix-features-for-configuration-only = { version = "0.37.1", package = "gix-features", features = [ "parallel" ] } diff --git a/rustc-1.77.0-unbundle-sqlite.patch b/rustc-1.77.0-unbundle-sqlite.patch new file mode 100644 index 0000000..50aa4a8 --- /dev/null +++ b/rustc-1.77.0-unbundle-sqlite.patch @@ -0,0 +1,23 @@ +diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-02-14 13:00:20.318976752 +0100 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-02-14 13:00:28.447051475 +0100 +@@ -2110,7 +2110,6 @@ version = "0.27.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" + dependencies = [ +- "cc", + "pkg-config", + "vcpkg", + ] +diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-02-14 13:00:14.942927327 +0100 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-02-14 13:00:40.688164017 +0100 +@@ -77,7 +77,7 @@ proptest = "1.4.0" + pulldown-cmark = { version = "0.9.3", default-features = false } + rand = "0.8.5" + regex = "1.10.2" +-rusqlite = { version = "0.30.0", features = ["bundled"] } ++rusqlite = { version = "0.30.0", features = [] } + rustfix = { version = "0.8.0", path = "crates/rustfix" } + same-file = "1.0.6" + security-framework = "2.9.2" diff --git a/sources b/sources index e29d03b..e9e2382 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rustc-1.76.0-src.tar.xz) = 92e16cfdeb91bde341fe6c2774d92868275b07aa1d46d870ddc9291eadfe4ea9af93e06586fa7d6b8d60534903945cbbe706d354c90272712989c58d2bf174bf +SHA512 (rustc-1.77.0-src.tar.xz) = 59f19d9def93b613ac72925625e6662622f445506489b8f1cd405d037c28becd53ae1446b46edfd63734f6f236af2dc326a57a184f01bc10d497c96227f09034 SHA512 (wasi-libc-03b228e46bb02fcc5927253e1b8ad715072b1ae4.tar.gz) = 56306817a6d683aeaf61c3376700804f143b9be101729693c1c88666ea201f02a3e7a3b32150f688a784ac4aae30e46bdbe3fc79a1a9c62e7b460d11ad509045