diff --git a/0001-add-support-for-ppc64le.patch b/0001-add-support-for-ppc64le.patch index 442d0b4ebee465c8a7c82bea910e0f3855c6ff31..75f6ee87212b3a1df01ffda35d2ba187b897c71b 100644 --- a/0001-add-support-for-ppc64le.patch +++ b/0001-add-support-for-ppc64le.patch @@ -129,10 +129,10 @@ index 768aac9..155f21e 100755 v("musl-root-riscv32gc", "target.riscv32gc-unknown-linux-musl.musl-root", "riscv32gc-unknown-linux-musl install directory") v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root", -diff --git a/vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs b/vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs +diff --git a/vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs b/vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs index 1264742..14427a7 100644 ---- a/vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs -+++ b/vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs +--- a/vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs ++++ b/vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs @@ -282,6 +282,9 @@ impl Build { "powerpc64le-unknown-freebsd" => "BSD-generic64", "powerpc64le-unknown-linux-gnu" => "linux-ppc64le", diff --git a/rust.spec b/rust.spec index e2b2de2004a2a1424e00395a42a3d6a7f82a5d0a..bcb5788e745f9611c00ffc65794a05d68f401dbc 100644 --- a/rust.spec +++ b/rust.spec @@ -11,8 +11,8 @@ %bcond_without analyzer Name: rust -Version: 1.79.0 -Release: 3 +Version: 1.80.0 +Release: 1 Summary: The Rust Programming Language License: Apache-2.0 OR MIT URL: https://www.rust-lang.org @@ -24,7 +24,7 @@ Source3: cargo-config Source4: cargo-config.sh Source5: cargo-config.csh -Patch0000: rustc-1.79.0-disable-libssh2.patch +Patch0000: rustc-1.80.0-disable-libssh2.patch # By default, rust tries to use "rust-lld" as a linker for some targets. Patch0001: 0001-Use-lld-provided-by-system.patch # Set a substitute-path in rust-gdb for standard library sources. @@ -514,6 +514,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Wed Aug 07 2024 wangkai <13474090681@163.com> - 1.80.0-1 +- Update to 1.80.0 + * Wed Jul 24 2024 wangkai <13474090681@163.com> - 1.79.0-3 - Switch to bootstrap compilation diff --git a/rustc-1.79.0-src.tar.xz.asc b/rustc-1.79.0-src.tar.xz.asc deleted file mode 100644 index 6d416e2684499165d173e3580da45ddab99a74b5..0000000000000000000000000000000000000000 --- a/rustc-1.79.0-src.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -wsFcBAABCgAQBQJmavafCRCFq5bm+hvl/gAAQAMP/joXqs2qXewULS5NmBe/7Fsc -3DkYKLopNOaT/3yaFoVa28ntBcDaknltNZGzmBK2CXmluBp9uFK/+ZkUbrenskmV -SuMbvJsjv93pzWCtouKJ2IbEeFYvEqHybuBgodpYcqq5gi+6rIKmbHC/TIADIoVw -VsElbOfOFF60qT1f8885oKw4smeH4l0e+9BACDSfe5zLNhNhQywjgGwibwVt3hMI -vWhUNxHe9llaXtI3IlhP+v2Au9tpRssw8A9O6bA38VfQ+C7nUcs21sk+Xx2HX+yx -+Xe9H5oGs06Vzpm6qmjDAzP7H1qMU40C28uFlCGlrngz7R4s2zl36EKc6N/foSwS -ti46epdSVww9BZrYHLPqflDvZY301y+aNaVNK0N9TarGUEV+1XCEzPyb7/GI1Tcy -x0R2ZErbLFDAu39XeTJflLu6ZY1teEKrHXB6Gjaczvn0vpGbPZeKSd26Z/CW6fj+ -ZFGPKUN9jEDsdZA/chSEsBjPuMSgzkHz4C796f8G1lz/QK0vC3va8BHWz7JudX5U -/7hi6/LegkuHfF/TeKm4AP4AItg7ZL+5bR7/81R8dOcmlcxS+7N9sOYc62zulu+B -T5vetP0VKQ+kGVXLO7GlzCRTcrJu8G3gtHY3yjOnGSEvOV+R8+PLR/MSiurVyoZ+ -G9gPU+Y8Q9VFOsIAnSxa -=92Lr ------END PGP SIGNATURE----- diff --git a/rustc-1.79.0-disable-libssh2.patch b/rustc-1.80.0-disable-libssh2.patch similarity index 53% rename from rustc-1.79.0-disable-libssh2.patch rename to rustc-1.80.0-disable-libssh2.patch index 6b3c90cc1b1600914ae3f126a34fede15a2ce714..85061b42fec1bca30976afe63f803a73033442d9 100644 --- a/rustc-1.79.0-disable-libssh2.patch +++ b/rustc-1.80.0-disable-libssh2.patch @@ -1,7 +1,7 @@ -diff -up rustc-1.79.0-src/src/tools/cargo/Cargo.lock.orig rustc-1.79.0-src/src/tools/cargo/Cargo.lock ---- rustc-1.79.0-src/src/tools/cargo/Cargo.lock.orig 2024-06-13 16:37:16.640599290 -0700 -+++ rustc-1.79.0-src/src/tools/cargo/Cargo.lock 2024-06-13 16:37:16.646599231 -0700 -@@ -2150,7 +2150,6 @@ checksum = "ee4126d8b4ee5c9d9ea891dd875c +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-07-05 18:14:51.101370053 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-07-05 18:14:51.104370020 -0700 +@@ -2151,7 +2151,6 @@ checksum = "ee4126d8b4ee5c9d9ea891dd875c dependencies = [ "cc", "libc", @@ -9,7 +9,7 @@ diff -up rustc-1.79.0-src/src/tools/cargo/Cargo.lock.orig rustc-1.79.0-src/src/t "libz-sys", "openssl-sys", "pkg-config", -@@ -2191,20 +2190,6 @@ dependencies = [ +@@ -2192,20 +2191,6 @@ dependencies = [ "pkg-config", "vcpkg", ] @@ -30,13 +30,13 @@ diff -up rustc-1.79.0-src/src/tools/cargo/Cargo.lock.orig rustc-1.79.0-src/src/t [[package]] name = "libz-sys" -diff -up rustc-1.79.0-src/src/tools/cargo/Cargo.toml.orig rustc-1.79.0-src/src/tools/cargo/Cargo.toml ---- rustc-1.79.0-src/src/tools/cargo/Cargo.toml.orig 2024-06-13 16:37:16.646599231 -0700 -+++ rustc-1.79.0-src/src/tools/cargo/Cargo.toml 2024-06-13 16:39:06.040526596 -0700 +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-07-05 18:14:51.104370020 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-07-05 18:15:36.584867840 -0700 @@ -44,7 +44,7 @@ curl = "0.4.46" curl-sys = "0.4.72" filetime = "0.2.23" - flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] } + flate2 = { version = "1.0.30", default-features = false, features = ["zlib"] } -git2 = "0.18.3" +git2 = { version = "0.18.3", default-features = false, features = ["https"] } git2-curl = "0.19.0" diff --git a/rustc-1.79.0-src.tar.xz b/rustc-1.80.0-src.tar.xz similarity index 100% rename from rustc-1.79.0-src.tar.xz rename to rustc-1.80.0-src.tar.xz diff --git a/rustc-1.80.0-src.tar.xz.asc b/rustc-1.80.0-src.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..d17f365700fb095fe2e612e14ae5e82c6c154b80 --- /dev/null +++ b/rustc-1.80.0-src.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +wsFcBAABCgAQBQJmojj9CRCFq5bm+hvl/gAAbkUQAIW8jreyzqoDkufBTEXoqdls +MX4UY4YVQD3wQezC3nTJGN85FU8WjpuaJomYNkKDGQKb9BI1+V+krBuIXgFEbHyl +lcEvK4FNaxmYSaYwOhQE117bAKFFIdQsWe8tQ1kDE5hs6BhiHwsLbpPiSgplQqS3 +0LwRUQrGIE3zS6q/yhC0TQdOlUb+VWbYvDbsSYi2uOFQaezqwwrHHOP/P0jR/G+h +MHs2bRI14DDu55hrmIWoxdQUtIBoN4qCnkWX3HS1+TBu6n3kdvjKTq9kxfcFuXWq +BA/ztQaJb7ip8RKlxPIWc5m1tqyAkhoOLwy5Wg0Sug47YZZdgDb847ingHIImRBr +ks+ESJ4lej2jXPdCigNGO/1zRzPuJaWhl8URDgYPpdDFXclUzeNSJl/Bw1qUhe4a +iiepiiI2/o3mDs3zxp7uoCCTLc4z5gb+eOmTTWKb4bT8p8b1pTlD3Ly9Ty3lLPMK +M2BYSymUjb0FlQD2UA31/BZj5hvC1mRvb7//oz3y8NmqV2ca9lZIiv4w+AIkGj9g +1AK6iUQSfnBSFYt/Bdli7WKpKL529r75vT+9OlNSozH4gtMxIC1qpZMR8sczLI2z +2HfeVgQKkY9BowfdswlAGUskZ6zC/LvFvqbfNCwT7yf8WgfsGczAivg0ScJ3zFEo +EIUfUQY5tpv4ynBo6TYH +=xmER +-----END PGP SIGNATURE-----