开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

_service:tar_scm:rust.spec Changed

@@ -1,42 +1,37 @@
-%global bootstrap_rust 1.71.0
-%global bootstrap_cargo 1.71.0
-%global bootstrap_channel 1.71.0
-%global bootstrap_date 2023-07-13
+%global bootstrap_rust 1.74.0
+%global bootstrap_cargo 1.74.0
+%global bootstrap_channel 1.74.0
+%global bootstrap_date 2023-11-16
 %bcond_with llvm_static
 %bcond_with bundled_llvm
 %bcond_without bundled_libgit2
 %bcond_with disabled_libssh2
-%bcond_without curl_http2
 %bcond_without lldb
 %bcond_without analyzer
 
 Name:                rust
-Version:             1.72.0
+Version:             1.75.0
 Release:             1
 Summary:             The Rust Programming Language
-License:             (ASL 2.0 or MIT) and (BSD and MIT)
+License:             Apache-2.0 OR MIT
 URL:                 https://www.rust-lang.org
 Source0:             https://static.rust-lang.org/dist/rustc-%{version}-src.tar.xz
-# SOURCE1-3: use local mirror for speed up
-Source1:             cargo-config
-Source2:             cargo-config.sh
-Source3:             cargo-config.csh
-
-Patch0000:           rustc-1.72.0-disable-libssh2.patch
-Patch0001:           rustc-1.72.0-disable-http2.patch
-Patch0002:           clippy-driver-usage-should-user-friendly.patch
-Patch0003:           cargo-help-clippy-should-have-description-to-user.patch
-Patch0004:           fix-a-println-wrong-format.patch
-# Fix --no-fail-fast
-# https://github.com/rust-lang/rust/pull/113214
-Patch0005:           0001-Don-t-fail-early-if-try_run-returns-an-error.patch
-# The dist-src tarball doesn't include .github/
-# https://github.com/rust-lang/rust/pull/115109
-Patch0006:           0001-Skip-ExpandYamlAnchors-when-the-config-is-missing.patch
-# By default, rust tries to use "rust-lld" as a linker for WebAssembly.
-Patch0007:           0001-Use-lld-provided-by-system-for-wasm.patch
+Source1:             https://static.rust-lang.org/dist/rustc-%{version}-src.tar.xz.asc
+Source2:             https://static.rust-lang.org/rust-key.gpg.ascii
+# SOURCE3-5: use local mirror for speed up
+Source3:             cargo-config
+Source4:             cargo-config.sh
+Source5:             cargo-config.csh
+
+Patch0000:           rustc-1.75.0-disable-libssh2.patch
+Patch0001:           cargo-help-clippy-should-have-description-to-user.patch
+Patch0002:           fix-a-println-wrong-format.patch
+# By default, rust tries to use "rust-lld" as a linker for some targets.
+Patch0003:           0001-Use-lld-provided-by-system.patch
 # Set a substitute-path in rust-gdb for standard library sources.
-Patch0008:           rustc-1.70.0-rust-gdb-substitute-path.patch
+Patch0004:           rustc-1.70.0-rust-gdb-substitute-path.patch
+# https://github.com/rust-lang/rust/pull/117982
+Patch0005:           0001-bootstrap-only-show-PGO-warnings-when-verbose.patch
 
 %{lua: function rust_triple(arch)
   local abi = "gnu"
@@ -96,12 +91,12 @@
 %global local_rust_root %{_prefix}
 %endif
 BuildRequires:       make gcc gcc-c++ ncurses-devel curl curl-devel musl-libc-static musl-gcc pkgconfig(libcurl) pkgconfig(liblzma)
-BuildRequires:       pkgconfig(openssl) pkgconfig(zlib) pkgconfig(libssh2) >= 1.6.0
+BuildRequires:       pkgconfig(openssl) pkgconfig(zlib) pkgconfig(libssh2) >= 1.6.0 gnupg2
 %global python python3
 BuildRequires:       %{python}
 %if %with bundled_llvm
 BuildRequires:       cmake3 >= 3.13.4
-Provides:            bundled(llvm) = 16.0.5
+Provides:            bundled(llvm) = 17.0.4
 %else
 BuildRequires:       cmake >= 2.8.11
 %if %defined llvm
@@ -112,8 +107,8 @@
 %global llvm_root %{_prefix}
 %endif
 # rust currently requires llvm 14.0+
-BuildRequires:       %{llvm} >= 14.0.0
-BuildRequires:       %{llvm}-devel >= 14.0.0
+BuildRequires:       %{llvm} >= 15.0.0
+BuildRequires:       %{llvm}-devel >= 15.0.0
 %if %with llvm_static
 BuildRequires:       %{llvm}-static libffi-devel
 %endif
@@ -193,6 +188,8 @@
 %package -n rustfmt
 Summary:             Tool to find and fix Rust formatting issues
 Requires:            cargo
+# /usr/bin/rustfmt is dynamically linked against internal rustc libs
+Requires:            %{name}%{?_isa} = %{version}-%{release}
 Obsoletes:           rustfmt-preview < 1.0.0
 Provides:            rustfmt-preview = %{version}-%{release}
 Conflicts:           rustfmt-preview < 1.0.0
@@ -240,6 +237,8 @@
 Man pages and other related help documents for rust.
 
 %prep
+gpg --import %{SOURCE2}
+gpg --verify %{SOURCE1} %{SOURCE0}
 %ifarch %{bootstrap_arches}
 %setup -q -n %{bootstrap_root} -T -b %{bootstrap_source}
 ./install.sh --components=cargo,rustc,rust-std-%{rust_triple} \
@@ -251,20 +250,14 @@
 %if %with disabled_libssh2
 %patch -P 0000 -p1
 %endif
-%if %without curl_http2
-%patch -P 0001 -p1
-rm -rf vendor/libnghttp2-sys*/
-%endif
 %if "%{python}" != "python3"
 sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure
 %endif
+%patch -P 0001 -p1
 %patch -P 0002 -p1
 %patch -P 0003 -p1
 %patch -P 0004 -p1
 %patch -P 0005 -p1
-%patch -P 0006 -p1
-%patch -P 0007 -p1
-%patch -P 0008 -p1
 rm -rf vendor/curl-sys*/curl/
 rm -rf vendor/jemalloc-sys/jemalloc/
 rm -rf vendor/libffi-sys*/libffi/
@@ -278,7 +271,10 @@
 %if %with disabled_libssh2
 rm -rf vendor/libssh2-sys*/
 %endif
-sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/tool.rs
+
+# This only affects the transient rust-installer, but let it use our dynamic xz-libs
+sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/src/core/build_steps/tool.rs
+
 %if %{without bundled_llvm} && %{with llvm_static}
 sed -i.ffi -e '$a #link(name = "ffi") extern {}' \
   src/librustc_llvm/lib.rs
@@ -374,9 +370,9 @@
 ln -sT ../rust/html/cargo/ %{buildroot}%{_docdir}/cargo/html
 
 # install default config for cargo mirror
-install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/skel/.cargo/config.toml
-install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/cargo-config.sh
-install -m 0644 -D -p %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/cargo-config.csh
+install -m 0644 -D -p %{SOURCE3} %{buildroot}%{_sysconfdir}/skel/.cargo/config.toml
+install -m 0644 -D -p %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/cargo-config.sh
+install -m 0644 -D -p %{SOURCE5} %{buildroot}%{_sysconfdir}/profile.d/cargo-config.csh
 
 %if %{with analyzer}
 # The rls stub doesn't have an install target, but we can just copy it.
@@ -451,7 +447,6 @@
 %config(noreplace) %{_sysconfdir}/skel/.cargo/config.toml
 %{_sysconfdir}/profile.d/cargo-config.*
 %{_bindir}/cargo
-%{_libexecdir}/cargo*
 %{_sysconfdir}/bash_completion.d/cargo
 %{_datadir}/zsh/site-functions/_cargo
 %dir %{_datadir}/cargo
@@ -493,6 +488,19 @@
 %{_mandir}/man1/cargo*.1*
 
 %changelog
+* Wed Jan 10 2024 wangkai <13474090681@163.com> - 1.75.0-1
+- Update to 1.75.0
+
+* Fri Nov 24 2023 wangkai <13474090681@163.com> - 1.74.0-1
+- Update to 1.74.0
+
+* Mon Nov 13 2023 wangkai <13474090681@163.com> - 1.73.0-2
+- Remove git lfs tar and change to user-repo
+- Add gpg verification to Source0
+
+* Mon Oct 09 2023 wangkai <13474090681@163.com> - 1.73.0-1
+- Update to 1.73.0
+
 * Mon Aug 28 2023 jchzhou <zhoujiacheng@iscas.ac.cn> - 1.72.0-1
 - Update to 1.72.0

_service:tar_scm:0001-Don-t-fail-early-if-try_run-returns-an-error.patch Deleted

@@ -1,201 +0,0 @@
-From 98336f8f6e701ea99275f32d6e2127a621041994 Mon Sep 17 00:00:00 2001
-From: Guillaume Gomez <guillaume.gomez@huawei.com>
-Date: Tue, 11 Jul 2023 17:01:35 +0200
-Subject: PATCH Don't fail early if `try_run` returns an error
-
----
- src/bootstrap/download.rs |  2 +-
- src/bootstrap/run.rs      | 11 +++++------
- src/bootstrap/test.rs     | 36 ++++++++++++++++--------------------
- 3 files changed, 22 insertions(+), 27 deletions(-)
-
-diff --git a/src/bootstrap/download.rs b/src/bootstrap/download.rs
-index cb40521dda76..9478ac7d9cea 100644
---- a/src/bootstrap/download.rs
-+++ b/src/bootstrap/download.rs
-@@ -188,7 +188,7 @@ fn fix_bin_or_dylib(&self, fname: &Path) {
-             patchelf.args(&"--set-interpreter", dynamic_linker.trim_end());
-         }
- 
--        self.try_run(patchelf.arg(fname)).unwrap();
-+        let _ = self.try_run(patchelf.arg(fname));
-     }
- 
-     fn download_file(&self, url: &str, dest_path: &Path, help_on_error: &str) {
-diff --git a/src/bootstrap/run.rs b/src/bootstrap/run.rs
-index c97b75927371..70b917000433 100644
---- a/src/bootstrap/run.rs
-+++ b/src/bootstrap/run.rs
-@@ -27,8 +27,7 @@ fn run(self, builder: &Builder<'_>) {
-         try_run(
-             builder,
-             &mut builder.tool_cmd(Tool::ExpandYamlAnchors).arg("generate").arg(&builder.src),
--        )
--        .unwrap();
-+        );
-     }
- 
-     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-@@ -40,17 +39,17 @@ fn make_run(run: RunConfig<'_>) {
-     }
- }
- 
--fn try_run(builder: &Builder<'_>, cmd: &mut Command) -> Result<(), ()> {
-+fn try_run(builder: &Builder<'_>, cmd: &mut Command) -> bool {
-     if !builder.fail_fast {
--        if let Err(e) = builder.try_run(cmd) {
-+        if builder.try_run(cmd).is_err() {
-             let mut failures = builder.delayed_failures.borrow_mut();
-             failures.push(format!("{:?}", cmd));
--            return Err(e);
-+            return false;
-         }
-     } else {
-         builder.run(cmd);
-     }
--    Ok(())
-+    true
- }
- 
- #derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)
-diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index 0907291b54da..13576aa787b6 100644
---- a/src/bootstrap/test.rs
-+++ b/src/bootstrap/test.rs
-@@ -48,17 +48,17 @@
-     // build for, so there is no entry for "aarch64-apple-darwin" here.
- ;
- 
--fn try_run(builder: &Builder<'_>, cmd: &mut Command) -> Result<(), ()> {
-+fn try_run(builder: &Builder<'_>, cmd: &mut Command) -> bool {
-     if !builder.fail_fast {
--        if let Err(e) = builder.try_run(cmd) {
-+        if builder.try_run(cmd).is_err() {
-             let mut failures = builder.delayed_failures.borrow_mut();
-             failures.push(format!("{:?}", cmd));
--            return Err(e);
-+            return false;
-         }
-     } else {
-         builder.run(cmd);
-     }
--    Ok(())
-+    true
- }
- 
- fn try_run_quiet(builder: &Builder<'_>, cmd: &mut Command) -> bool {
-@@ -187,8 +187,7 @@ fn run(self, builder: &Builder<'_>) {
-         try_run(
-             builder,
-             builder.tool_cmd(Tool::Linkchecker).arg(builder.out.join(host.triple).join("doc")),
--        )
--        .unwrap();
-+        );
-     }
- 
-     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-@@ -241,8 +240,7 @@ fn run(self, builder: &Builder<'_>) {
-         builder.default_doc(&);
-         builder.ensure(crate::doc::Rustc::new(builder.top_stage, self.target, builder));
- 
--        try_run(builder, builder.tool_cmd(Tool::HtmlChecker).arg(builder.doc_out(self.target)))
--            .unwrap();
-+        try_run(builder, builder.tool_cmd(Tool::HtmlChecker).arg(builder.doc_out(self.target)));
-     }
- }
- 
-@@ -288,8 +286,7 @@ fn run(self, builder: &Builder<'_>) {
-                 .args(builder.config.test_args())
-                 .env("RUSTC", builder.rustc(compiler))
-                 .env("RUSTDOC", builder.rustdoc(compiler)),
--        )
--        .unwrap();
-+        );
-     }
- }
- 
-@@ -855,7 +852,7 @@ fn run(self, builder: &Builder<'_>) {
-                 util::lld_flag_no_threads(self.compiler.host.contains("windows")),
-             );
-         }
--        try_run(builder, &mut cmd).unwrap();
-+        try_run(builder, &mut cmd);
-     }
- }
- 
-@@ -1106,7 +1103,7 @@ fn run(self, builder: &Builder<'_>) {
-         }
- 
-         builder.info("tidy check");
--        try_run(builder, &mut cmd).unwrap();
-+        try_run(builder, &mut cmd);
- 
-         builder.ensure(ExpandYamlAnchors);
- 
-@@ -1154,8 +1151,7 @@ fn run(self, builder: &Builder<'_>) {
-         try_run(
-             builder,
-             &mut builder.tool_cmd(Tool::ExpandYamlAnchors).arg("check").arg(&builder.src),
--        )
--        .unwrap();
-+        );
-     }
- 
-     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-@@ -1948,7 +1944,7 @@ fn run_ext_doc(self, builder: &Builder<'_>) {
-             compiler.host,
-         );
-         let _time = util::timeit(&builder);
--        let toolstate = if try_run(builder, &mut rustbook_cmd).is_ok() {
-+        let toolstate = if try_run(builder, &mut rustbook_cmd) {
-             ToolState::TestPass
-         } else {
-             ToolState::TestFail
-@@ -2106,7 +2102,7 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) ->
-     cmd.arg("--test-args").arg(test_args);
- 
-     if builder.config.verbose_tests {
--        try_run(builder, &mut cmd).is_ok()
-+        try_run(builder, &mut cmd)
-     } else {
-         try_run_quiet(builder, &mut cmd)
-     }
-@@ -2134,7 +2130,7 @@ fn run(self, builder: &Builder<'_>) {
- 
-         let src = builder.src.join(relative_path);
-         let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
--        let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)).is_ok() {
-+        let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) {
-             ToolState::TestPass
-         } else {
-             ToolState::TestFail
-@@ -2684,7 +2680,7 @@ fn run(self, builder: &Builder<'_>) {
-             .current_dir(builder.src.join("src/bootstrap/"));
-         // NOTE: we intentionally don't pass test_args here because the args for unittest and cargo test are mutually incompatible.
-         // Use `python -m unittest` manually if you want to pass arguments.
--        try_run(builder, &mut check_bootstrap).unwrap();
-+        try_run(builder, &mut check_bootstrap);
- 
-         let host = builder.config.build;
-         let compiler = builder.compiler(0, host);
-@@ -2756,7 +2752,7 @@ fn run(self, builder: &Builder<'_>) {
-         }
- 
-         builder.info("platform support check");
--        try_run(builder, &mut cargo.into()).unwrap();
-+        try_run(builder, &mut cargo.into());
-     }
- }
- 
-@@ -2836,7 +2832,7 @@ fn run(self, builder: &Builder<'_>) {
-         cmd.env("CARGO", &builder.initial_cargo);
-         cmd.env("RUSTC", &builder.initial_rustc);
-         cmd.env("TMP_DIR", &tmpdir);
--        try_run(builder, &mut cmd).unwrap();
-+        try_run(builder, &mut cmd);
-     }
- 
-     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
---

_service:tar_scm:0001-Skip-ExpandYamlAnchors-when-the-config-is-missing.patch Deleted

@@ -1,32 +0,0 @@
-From ab9c5148956c2b7d177cc94533370d6a01a8d15f Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Tue, 22 Aug 2023 10:42:12 -0700
-Subject: PATCH Skip ExpandYamlAnchors when the config is missing
-
-The dist-src tarball does not include `.github/` at all, so we can't
-check whether it needs to be regenerated.
-
-(cherry picked from commit 35187c7e6474d346eea3113c4ae34d26d6b18756)
----
- src/bootstrap/test.rs | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index eed7a584b603..d41850783c6d 100644
---- a/src/bootstrap/test.rs
-+++ b/src/bootstrap/test.rs
-@@ -1150,6 +1150,11 @@ impl Step for ExpandYamlAnchors {
-     /// appropriate configuration for all our CI providers. This step ensures the tool was called
-     /// by the user before committing CI changes.
-     fn run(self, builder: &Builder<'_>) {
-+        // Note: `.github/` is not included in dist-src tarballs
-+        if !builder.src.join(".github/workflows/ci.yml").exists() {
-+            builder.info("Skipping YAML anchors check: GitHub Actions config not found");
-+            return;
-+        }
-         builder.info("Ensuring the YAML anchors in the GitHub Actions config were expanded");
-         try_run(
-             builder,
--- 
-2.41.0
-

_service:tar_scm:0001-Use-lld-provided-by-system-for-wasm.patch Deleted

_service:tar_scm:0001-Use-lld-provided-by-system.patch Added

@@ -0,0 +1,53 @@
+From 61b5cc96337da2121221dd1bcdb63fd36551d065 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Wed, 1 Nov 2023 15:21:15 -0700
+Subject: PATCH Use lld provided by system
+
+---
+ compiler/rustc_target/src/spec/base/wasm.rs                   | 3 +--
+ compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs | 2 +-
+ compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs | 1 +
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
+index 87ade9e58cf4..2ddff95febab 100644
+--- a/compiler/rustc_target/src/spec/base/wasm.rs
++++ b/compiler/rustc_target/src/spec/base/wasm.rs
+@@ -91,8 +91,7 @@ macro_rules! args {
+         // arguments just yet
+         limit_rdylib_exports: false,
+ 
+-        // we use the LLD shipped with the Rust toolchain by default
+-        linker: Some("rust-lld".into()),
++        linker: Some("lld".into()),
+         linker_flavor: LinkerFlavor::WasmLld(Cc::No),
+ 
+         pre_link_args,
+diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
+index 9aa95a35f8e5..a9172f9441b7 100644
+--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
++++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
+@@ -17,7 +17,7 @@ pub fn target() -> Target {
+         static_position_independent_executables: true,
+         relro_level: RelroLevel::Full,
+         linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
+-        linker: Some("rust-lld".into()),
++        linker: Some("lld".into()),
+         features:
+             "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float"
+                 .into(),
+diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
+index 5abfb8162f70..13cb43bda1a4 100644
+--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
++++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
+@@ -16,6 +16,7 @@ pub fn target() -> Target {
+     base.plt_by_default = false;
+     base.max_atomic_width = Some(64);
+     base.entry_abi = Conv::X86_64Win64;
++    base.linker = Some("lld".into());
+ 
+     // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to
+     // enable these CPU features explicitly before their first use, otherwise their instructions
+-- 
+2.41.0
+

_service:tar_scm:0001-bootstrap-only-show-PGO-warnings-when-verbose.patch Added

@@ -0,0 +1,33 @@
+From 776146e9ebb6bbe17a37bfad955f3dac95317275 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Thu, 16 Nov 2023 10:42:23 -0800
+Subject: PATCH bootstrap: only show PGO warnings when verbose
+
+Building rustc with `--rust-profile-use` is currently dumping a lot of
+warnings of "no profile data available for function" from `rustc_smir`
+and `stable_mir`. These simply aren't exercised by the current profile-
+gathering steps, but that's to be expected for new or experimental
+functionality. I think for most people, these warnings will be just
+noise, so it makes sense to only have them in verbose builds.
+---
+ src/bootstrap/src/core/build_steps/compile.rs | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
+index af69860df1c5..51e4195827fc 100644
+--- a/src/bootstrap/src/core/build_steps/compile.rs
++++ b/src/bootstrap/src/core/build_steps/compile.rs
+@@ -887,7 +887,9 @@ fn run(self, builder: &Builder<'_>) {
+         } else if let Some(path) = &builder.config.rust_profile_use {
+             if compiler.stage == 1 {
+                 cargo.rustflag(&format!("-Cprofile-use={path}"));
+-                cargo.rustflag("-Cllvm-args=-pgo-warn-missing-function");
++                if builder.is_verbose() {
++                    cargo.rustflag("-Cllvm-args=-pgo-warn-missing-function");
++                }
+                 true
+             } else {
+                 false
+-- 
+2.43.0
+

_service:tar_scm:rustc-1.72.0-disable-http2.patch Deleted

@@ -1,92 +0,0 @@
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-08-21 11:00:15.341608892 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-08-21 11:00:46.074984901 -0700
-@@ -743,7 +743,6 @@
- dependencies = 
-  "cc",
-  "libc",
-- "libnghttp2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -2011,16 +2010,6 @@
- checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
- 
- package
--name = "libnghttp2-sys"
--version = "0.1.7+1.45.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f"
--dependencies = 
-- "cc",
-- "libc",
--
--
--package
- name = "libz-sys"
- version = "1.1.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-08-21 11:00:15.341608892 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-08-21 11:00:15.342608871 -0700
-@@ -118,7 +118,7 @@
- cargo-util.workspace = true
- clap = { workspace = true, features = "wrap_help" }
- crates-io.workspace = true
--curl = { workspace = true, features = "http2" }
-+curl = { workspace = true, features =  }
- curl-sys.workspace = true
- env_logger.workspace = true
- filetime.workspace = true
---- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2023-08-17 20:58:39.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2023-08-21 11:00:15.343608851 -0700
-@@ -408,16 +408,9 @@
-         sources: SourceMap<'cfg>,
-         config: &'cfg Config,
-     ) -> CargoResult<PackageSet<'cfg>> {
--        // We've enabled the `http2` feature of `curl` in Cargo, so treat
--        // failures here as fatal as it would indicate a build-time problem.
--        let mut multi = Multi::new();
--        let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
--        multi
--            .pipelining(false, multiplexing)
--            .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
--
--        // let's not flood crates.io with connections
--        multi.set_max_host_connections(2)?;
-+        // Multiplexing is disabled because the system libcurl doesn't support it.
-+        let multi = Multi::new();
-+        let multiplexing = false;
- 
-         Ok(PackageSet {
-             packages: package_ids
---- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2023-08-17 20:58:39.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2023-08-21 11:00:15.343608851 -0700
-@@ -250,16 +250,8 @@
-         }
-         self.fetch_started = true;
- 
--        // We've enabled the `http2` feature of `curl` in Cargo, so treat
--        // failures here as fatal as it would indicate a build-time problem.
--        self.multiplexing = self.config.http_config()?.multiplexing.unwrap_or(true);
--
--        self.multi
--            .pipelining(false, self.multiplexing)
--            .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
--
--        // let's not flood the server with connections
--        self.multi.set_max_host_connections(2)?;
-+        // Multiplexing is disabled because the system libcurl doesn't support it.
-+        self.multiplexing = false;
- 
-         if !self.quiet {
-             self.config
---- rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs.orig	2023-08-21 11:00:15.343608851 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs	2023-08-21 11:02:01.969443986 -0700
-@@ -27,7 +27,7 @@
- macro_rules! try_old_curl {
-     ($e:expr, $msg:expr) => {
-         let result = $e;
--        if cfg!(target_os = "macos") {
-+        if cfg!(any(target_os = "linux", target_os = "macos")) {
-             if let Err(e) = result {
-                 ::log::warn!("ignoring libcurl {} error: {}", $msg, e);
-             }

_service:tar_scm:rustc-1.72.0-disable-libssh2.patch -> _service:tar_scm:rustc-1.75.0-disable-libssh2.patch Changed

@@ -1,6 +1,6 @@
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-08-17 20:58:39.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-08-21 10:52:50.520622927 -0700
-@@ -1999,7 +1999,6 @@
+--- ./rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-11-12 12:24:35.000000000 -0800
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-11-14 17:01:32.010125953 -0800
+@@ -2027,7 +2027,6 @@
  dependencies = 
   "cc",
   "libc",
@@ -8,7 +8,7 @@
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -2022,20 +2021,6 @@
+@@ -2060,20 +2059,6 @@
  
  
  package
@@ -29,14 +29,14 @@
  name = "libz-sys"
  version = "1.1.9"
  source = "registry+https://github.com/rust-lang/crates.io-index"
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-08-21 10:49:34.852578202 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-08-21 10:52:11.858404449 -0700
-@@ -31,7 +31,7 @@
- filetime = "0.2.9"
- flate2 = { version = "1.0.3", default-features = false, features = "zlib" }
- fwdansi = "1.1.0"
--git2 = "0.17.1"
-+git2 = { version = "0.17.1", default-features = false, features = "https" }
- git2-curl = "0.18.0"
- gix = { version = "0.45.1", default-features = false, features = "blocking-http-transport-curl", "progress-tree" }
- gix-features-for-configuration-only = { version = "0.30.0", package = "gix-features", features =  "parallel"  }
+--- ./rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-11-14 17:01:32.010125953 -0800
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-11-14 17:02:44.645097701 -0800
+@@ -40,7 +40,7 @@
+ curl-sys = "0.4.68"
+ 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.55.2", 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"  }

_service Changed

_service:tar_scm:rust-key.gpg.ascii Added

@@ -0,0 +1,86 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+Mve696B5tlHyc1KxjHR6w9GRsh4=
+=5FXw
+-----END PGP PUBLIC KEY BLOCK-----

_service:tar_scm:rustc-1.72.0-src.tar.xz Deleted

_service:tar_scm:rustc-1.75.0-src.tar.xz.asc Added