Enable profiler_builtins for EPEL7

This reverts commit 93ecbc5a13,
reintroducing the workaround for rust#40717, now rust#68714.

.gitignore

@@ -33,6 +33,8 @@
 /rustc-1.14.0-powerpc64-unknown-linux-gnu.tar.gz
 /rustc-1.14.0-s390x-unknown-linux-gnu.tar.gz
 /rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz
+/rustc-1.15.0-powerpc64-unknown-linux-gnu.tar.gz
+/rustc-1.15.0-powerpc64le-unknown-linux-gnu.tar.gz
 /rust-1.15.1-aarch64-unknown-linux-gnu.tar.gz
 /rust-1.15.1-armv7-unknown-linux-gnueabihf.tar.gz
 /rust-1.15.1-i686-unknown-linux-gnu.tar.gz
@@ -425,38 +427,3 @@
 /rustc-1.72.0-src.tar.xz
 /wasi-libc-7018e24d8fe248596819d2e884761676f3542a04.tar.gz
 /rustc-1.72.1-src.tar.xz
-/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz
-/rustc-1.73.0-src.tar.xz
-/rustc-1.74.0-src.tar.xz
-/rustc-1.74.1-src.tar.xz
-/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
-/rustc-1.77.2-src.tar.xz
-/rustc-1.78.0-src.tar.xz
-/rustc-1.79.0-src.tar.xz
-/wasi-libc-wasi-sdk-22.tar.gz
-/rustc-1.80.0-src.tar.xz
-/rustc-1.80.1-src.tar.xz
-/wasi-libc-3f43ea9abb24ed8d24d760989e1d87ea385f8eaa.tar.gz
-/rustc-1.81.0-src.tar.xz
-/wasi-libc-b9ef79d7dbd47c6c5bafdae760823467c2f60b70.tar.gz
-/rustc-1.82.0-src.tar.xz
-/wasi-libc-wasi-sdk-24.tar.gz
-/rustc-1.83.0-src.tar.xz
-/rustc-1.84.0-src.tar.xz
-/wasi-libc-wasi-sdk-25.tar.gz
-/rustc-1.84.1-src.tar.xz
-/rustc-1.85.0-src.tar.xz
-/rustc-1.85.1-src.tar.xz
-/rustc-1.86.0-src.tar.xz
-/wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz
-/rustc-1.87.0-src.tar.xz
-/rustc-1.88.0-src.tar.xz
-/wasi-libc-wasi-sdk-27.tar.gz
-/rustc-1.89.0-src.tar.xz
-/rustc-1.90.0-src.tar.xz
-/rustc-1.91.0-src.tar.xz
-/rustc-1.91.1-src.tar.xz
-/rustc-1.92.0-src.tar.xz

0001-Allow-using-external-builds-of-the-compiler-rt-profi.patch

@@ -0,0 +1,142 @@
+From e276ae1cb702fa830be126cccce4bb9e8676f9fb Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Tue, 25 Jul 2023 13:11:50 -0700
+Subject: [PATCH] Allow using external builds of the compiler-rt profile lib
+
+This changes the bootstrap config `target.*.profiler` from a plain bool
+to also allow a string, which will be used as a path to the pre-built
+profiling runtime for that target. Then `profiler_builtins/build.rs`
+reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
+---
+ config.example.toml                |  6 ++++--
+ library/profiler_builtins/build.rs |  6 ++++++
+ src/bootstrap/compile.rs           |  4 ++++
+ src/bootstrap/config.rs            | 30 ++++++++++++++++++++++++------
+ 4 files changed, 38 insertions(+), 8 deletions(-)
+
+diff --git a/config.example.toml b/config.example.toml
+index 0c65b25fe138..249847013259 100644
+--- a/config.example.toml
++++ b/config.example.toml
+@@ -752,8 +752,10 @@ changelog-seen = 2
+ # This option will override the same option under [build] section.
+ #sanitizers = build.sanitizers (bool)
+ 
+-# Build the profiler runtime for this target(required when compiling with options that depend
+-# on this runtime, such as `-C profile-generate` or `-C instrument-coverage`).
++# When true, build the profiler runtime for this target(required when compiling
++# with options that depend on this runtime, such as `-C profile-generate` or
++# `-C instrument-coverage`). This may also be given a path to an existing build
++# of the profiling runtime library from LLVM's compiler-rt.
+ # This option will override the same option under [build] section.
+ #profiler = build.profiler (bool)
+ 
+diff --git a/library/profiler_builtins/build.rs b/library/profiler_builtins/build.rs
+index 1b1f11798d74..d14d0b82229a 100644
+--- a/library/profiler_builtins/build.rs
++++ b/library/profiler_builtins/build.rs
+@@ -6,6 +6,12 @@
+ use std::path::Path;
+ 
+ fn main() {
++    println!("cargo:rerun-if-env-changed=LLVM_PROFILER_RT_LIB");
++    if let Ok(rt) = env::var("LLVM_PROFILER_RT_LIB") {
++        println!("cargo:rustc-link-lib=static:+verbatim={rt}");
++        return;
++    }
++
+     let target = env::var("TARGET").expect("TARGET was not set");
+     let cfg = &mut cc::Build::new();
+ 
+diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
+index 14c3ef79a78f..64bdcd1a3b97 100644
+--- a/src/bootstrap/compile.rs
++++ b/src/bootstrap/compile.rs
+@@ -336,6 +336,10 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+         cargo.env("MACOSX_DEPLOYMENT_TARGET", target);
+     }
+ 
++    if let Some(path) = builder.config.profiler_path(target) {
++        cargo.env("LLVM_PROFILER_RT_LIB", path);
++    }
++
+     // Determine if we're going to compile in optimized C intrinsics to
+     // the `compiler-builtins` crate. These intrinsics live in LLVM's
+     // `compiler-rt` repository, but our `src/llvm-project` submodule isn't
+diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
+index fe932fd6bd30..45a743082415 100644
+--- a/src/bootstrap/config.rs
++++ b/src/bootstrap/config.rs
+@@ -533,7 +533,7 @@ pub struct Target {
+     pub linker: Option<PathBuf>,
+     pub ndk: Option<PathBuf>,
+     pub sanitizers: Option<bool>,
+-    pub profiler: Option<bool>,
++    pub profiler: Option<StringOrBool>,
+     pub rpath: Option<bool>,
+     pub crt_static: Option<bool>,
+     pub musl_root: Option<PathBuf>,
+@@ -862,9 +862,9 @@ struct Dist {
+     }
+ }
+ 
+-#[derive(Debug, Deserialize)]
++#[derive(Clone, Debug, Deserialize)]
+ #[serde(untagged)]
+-enum StringOrBool {
++pub enum StringOrBool {
+     String(String),
+     Bool(bool),
+ }
+@@ -875,6 +875,12 @@ fn default() -> StringOrBool {
+     }
+ }
+ 
++impl StringOrBool {
++    fn is_string_or_true(&self) -> bool {
++        matches!(self, Self::String(_) | Self::Bool(true))
++    }
++}
++
+ #[derive(Clone, Debug, Deserialize, PartialEq, Eq)]
+ #[serde(untagged)]
+ pub enum RustOptimize {
+@@ -991,7 +997,7 @@ struct TomlTarget {
+         llvm_libunwind: Option<String> = "llvm-libunwind",
+         android_ndk: Option<String> = "android-ndk",
+         sanitizers: Option<bool> = "sanitizers",
+-        profiler: Option<bool> = "profiler",
++        profiler: Option<StringOrBool> = "profiler",
+         rpath: Option<bool> = "rpath",
+         crt_static: Option<bool> = "crt-static",
+         musl_root: Option<String> = "musl-root",
+@@ -1864,12 +1870,24 @@ pub fn any_sanitizers_enabled(&self) -> bool {
+         self.target_config.values().any(|t| t.sanitizers == Some(true)) || self.sanitizers
+     }
+ 
++    pub fn profiler_path(&self, target: TargetSelection) -> Option<&str> {
++        match self.target_config.get(&target)?.profiler.as_ref()? {
++            StringOrBool::String(s) => Some(s),
++            StringOrBool::Bool(_) => None,
++        }
++    }
++
+     pub fn profiler_enabled(&self, target: TargetSelection) -> bool {
+-        self.target_config.get(&target).map(|t| t.profiler).flatten().unwrap_or(self.profiler)
++        self.target_config
++            .get(&target)
++            .and_then(|t| t.profiler.as_ref())
++            .map(StringOrBool::is_string_or_true)
++            .unwrap_or(self.profiler)
+     }
+ 
+     pub fn any_profiler_enabled(&self) -> bool {
+-        self.target_config.values().any(|t| t.profiler == Some(true)) || self.profiler
++        self.target_config.values().any(|t| matches!(&t.profiler, Some(p) if p.is_string_or_true()))
++            || self.profiler
+     }
+ 
+     pub fn rpath_enabled(&self, target: TargetSelection) -> bool {
+-- 
+2.41.0
+

0001-Don-t-fail-early-if-try_run-returns-an-error.patch

@@ -0,0 +1,201 @@
+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<'_> {
+-- 
+2.41.0
+

0001-Let-environment-variables-override-some-default-CPUs.patch

@@ -1,53 +1,53 @@
-From e54c0a4cc8bd8a76b155714b23a61d1d32a8d069 Mon Sep 17 00:00:00 2001
+From 87caaab3681b95fa633aac48b9794364e18c467d Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Fri, 9 Jun 2023 15:23:08 -0700
 Subject: [PATCH] Let environment variables override some default CPUs
 
 ---
- .../src/spec/targets/powerpc64le_unknown_linux_gnu.rs           | 2 +-
- .../rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs    | 2 +-
- .../rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs   | 2 +-
+ compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs | 2 +-
+ compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs       | 2 +-
+ compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs      | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
-index 9e406af53b5..9104903673f 100644
---- a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
-+++ b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
-@@ -4,7 +4,7 @@
+diff --git a/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs
+index fd896e086b54..08d0c43d20b4 100644
+--- a/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs
+@@ -2,7 +2,7 @@
  
- pub(crate) fn target() -> Target {
-     let mut base = base::linux_gnu::opts();
+ pub fn target() -> Target {
+     let mut base = super::linux_gnu_base::opts();
 -    base.cpu = "ppc64le".into();
 +    base.cpu = option_env!("RUSTC_TARGET_CPU_PPC64LE").unwrap_or("ppc64le").into();
      base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
      base.max_atomic_width = Some(64);
      base.stack_probes = StackProbeType::Inline;
-diff --git a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
-index cdcf7d62a3e..02f24274ed2 100644
---- a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
-+++ b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
-@@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
-     let mut base = base::linux_gnu::opts();
+diff --git a/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs
+index f2c722b9a89d..17a14d10b27e 100644
+--- a/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs
+@@ -5,7 +5,7 @@ pub fn target() -> Target {
+     let mut base = super::linux_gnu_base::opts();
      base.endian = Endian::Big;
      // z10 is the oldest CPU supported by LLVM
 -    base.cpu = "z10".into();
 +    base.cpu = option_env!("RUSTC_TARGET_CPU_S390X").unwrap_or("z10").into();
-     base.max_atomic_width = Some(128);
-     base.min_global_align = Some(Align::from_bits(16).unwrap());
-     base.stack_probes = StackProbeType::Inline;
-diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
-index 0c8353fad18..c2515e700bb 100644
---- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
-+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
-@@ -4,7 +4,7 @@
+     // FIXME: The ABI implementation in cabi_s390x.rs is for now hard-coded to assume the no-vector
+     // ABI. Pass the -vector feature string to LLVM to respect this assumption. On LLVM < 16, we
+     // also strip v128 from the data_layout below to match the older LLVM's expectation.
+diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
+index 2f970f87cc64..7ee62cd62a5c 100644
+--- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
+@@ -2,7 +2,7 @@
  
- pub(crate) fn target() -> Target {
-     let mut base = base::linux_gnu::opts();
+ pub fn target() -> Target {
+     let mut base = super::linux_gnu_base::opts();
 -    base.cpu = "x86-64".into();
 +    base.cpu = option_env!("RUSTC_TARGET_CPU_X86_64").unwrap_or("x86-64").into();
      base.plt_by_default = false;
      base.max_atomic_width = Some(64);
      base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
 -- 
-2.49.0
+2.41.0
 

0001-Skip-ExpandYamlAnchors-when-the-config-is-missing.patch

@@ -0,0 +1,32 @@
+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
+

0001-Use-lld-provided-by-system-for-wasm.patch

@@ -0,0 +1,26 @@
+From 37cb177eb53145103ae72b67562884782dde01c3 Mon Sep 17 00:00:00 2001
+From: Ivan Mironov <mironov.ivan@gmail.com>
+Date: Sun, 8 Dec 2019 17:23:08 +0500
+Subject: [PATCH] Use lld provided by system for wasm
+
+---
+ compiler/rustc_target/src/spec/wasm_base.rs | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs
+index 528a84a8b37c..353d742161d1 100644
+--- a/compiler/rustc_target/src/spec/wasm_base.rs
++++ b/compiler/rustc_target/src/spec/wasm_base.rs
+@@ -89,8 +89,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,
+-- 
+2.38.1
+

0001-Use-lld-provided-by-system.patch

@@ -1,80 +0,0 @@
-From e9405caf32dfb31bf17c3da0299df515a3755107 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Fri, 16 Aug 2024 10:12:58 -0700
-Subject: [PATCH] Use lld provided by system
-
----
- compiler/rustc_target/src/spec/base/wasm.rs                    | 3 +--
- .../src/spec/targets/aarch64_unknown_none_softfloat.rs         | 2 +-
- compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs | 1 +
- compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs  | 2 +-
- compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs  | 1 +
- 5 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
-index 7ede45766ea..b22362227bb 100644
---- a/compiler/rustc_target/src/spec/base/wasm.rs
-+++ b/compiler/rustc_target/src/spec/base/wasm.rs
-@@ -81,8 +81,7 @@ macro_rules! args {
-         // threaded model which will legalize atomics to normal operations.
-         singlethread: true,
- 
--        // 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/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
-index 35a4dd72b86..a9c8fc5edb8 100644
---- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
-+++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
-@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target {
-     let opts = TargetOptions {
-         abi: "softfloat".into(),
-         linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
--        linker: Some("rust-lld".into()),
-+        linker: Some("lld".into()),
-         features: "+v8a,+strict-align,-neon,-fp-armv8".into(),
-         relocation_model: RelocModel::Static,
-         disable_redzone: true,
-diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
-index 327b52389b9..17313d7e8b3 100644
---- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
-+++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
-@@ -9,6 +9,7 @@ pub(crate) fn target() -> Target {
-     base.max_atomic_width = Some(128);
-     base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &["/machine:arm64"]);
-     base.features = "+v8a".into();
-+    base.linker = Some("lld".into());
- 
-     Target {
-         llvm_target: "aarch64-unknown-windows".into(),
-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 1a6343595f5..8015b082cd1 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
-@@ -19,7 +19,7 @@ pub(crate) 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()),
-         rustc_abi: Some(RustcAbi::X86Softfloat),
-         features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(),
-         supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS,
-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 0cf6a879462..3677fc662de 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
-@@ -15,6 +15,7 @@ pub(crate) fn target() -> Target {
-     base.plt_by_default = false;
-     base.max_atomic_width = Some(64);
-     base.entry_abi = CanonAbi::X86(X86Call::Win64);
-+    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.51.0
-

0001-bootstrap-allow-disabling-target-self-contained.patch

@@ -1,112 +0,0 @@
-From 8364de4cb8edab85efcb895824ce06f4a95bd26f Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Mon, 18 Aug 2025 17:11:07 -0700
-Subject: [PATCH] bootstrap: allow disabling target self-contained
-
----
- bootstrap.example.toml                        | 5 +++++
- src/bootstrap/src/core/build_steps/compile.rs | 4 ++++
- src/bootstrap/src/core/config/config.rs       | 4 ++++
- src/bootstrap/src/core/config/toml/target.rs  | 5 +++++
- src/bootstrap/src/lib.rs                      | 5 +++++
- 5 files changed, 23 insertions(+)
-
-diff --git a/bootstrap.example.toml b/bootstrap.example.toml
-index 6f37e51a47d..ee21bc06bea 100644
---- a/bootstrap.example.toml
-+++ b/bootstrap.example.toml
-@@ -1077,3 +1077,8 @@
- # pass `off`:
- # - x86_64-unknown-linux-gnu
- #default-linker-linux-override = "off" (for most targets)
-+
-+# Copy libc and CRT objects into the target lib/self-contained/ directory.
-+# Enabled by default on `musl`, `wasi`, and `windows-gnu` targets. Other
-+# targets may ignore this setting if they have nothing to be contained.
-+#self-contained = <platform-specific> (bool)
-diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index 6857a40ada8..9a98323a704 100644
---- a/src/bootstrap/src/core/build_steps/compile.rs
-+++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -368,6 +368,10 @@ fn copy_self_contained_objects(
-     compiler: &Compiler,
-     target: TargetSelection,
- ) -> Vec<(PathBuf, DependencyType)> {
-+    if builder.self_contained(target) != Some(true) {
-+        return vec![];
-+    }
-+
-     let libdir_self_contained =
-         builder.sysroot_target_libdir(*compiler, target).join("self-contained");
-     t!(fs::create_dir_all(&libdir_self_contained));
-diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
-index 4b7ae6df360..6bab269a33c 100644
---- a/src/bootstrap/src/core/config/config.rs
-+++ b/src/bootstrap/src/core/config/config.rs
-@@ -864,6 +864,7 @@ pub(crate) fn parse_inner(
-                     runner: target_runner,
-                     optimized_compiler_builtins: target_optimized_compiler_builtins,
-                     jemalloc: target_jemalloc,
-+                    self_contained: target_self_contained
-                 } = cfg;
- 
-                 let mut target = Target::from_triple(&triple);
-@@ -921,6 +922,9 @@ pub(crate) fn parse_inner(
-                 if let Some(s) = target_no_std {
-                     target.no_std = s;
-                 }
-+                if let Some(s) = target_self_contained {
-+                    target.self_contained = s;
-+                }
-                 target.cc = target_cc.map(PathBuf::from);
-                 target.cxx = target_cxx.map(PathBuf::from);
-                 target.ar = target_ar.map(PathBuf::from);
-diff --git a/src/bootstrap/src/core/config/toml/target.rs b/src/bootstrap/src/core/config/toml/target.rs
-index 4c7afa50b96..83b8a1b50ca 100644
---- a/src/bootstrap/src/core/config/toml/target.rs
-+++ b/src/bootstrap/src/core/config/toml/target.rs
-@@ -47,6 +47,7 @@ struct TomlTarget {
-         runner: Option<String> = "runner",
-         optimized_compiler_builtins: Option<CompilerBuiltins> = "optimized-compiler-builtins",
-         jemalloc: Option<bool> = "jemalloc",
-+        self_contained: Option<bool> = "self-contained",
-     }
- }
- 
-@@ -80,6 +81,7 @@ pub struct Target {
-     pub codegen_backends: Option<Vec<CodegenBackendKind>>,
-     pub optimized_compiler_builtins: Option<CompilerBuiltins>,
-     pub jemalloc: Option<bool>,
-+    pub self_contained: bool,
- }
- 
- impl Target {
-@@ -91,6 +93,9 @@ pub fn from_triple(triple: &str) -> Self {
-         if triple.contains("emscripten") {
-             target.runner = Some("node".into());
-         }
-+        if triple.contains("-musl") || triple.contains("-wasi") || triple.contains("-windows-gnu") {
-+            target.self_contained = true;
-+        }
-         target
-     }
- }
-diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index dd30f05b728..cc89a84071e 100644
---- a/src/bootstrap/src/lib.rs
-+++ b/src/bootstrap/src/lib.rs
-@@ -1441,6 +1441,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
-         self.config.target_config.get(&target).map(|t| t.no_std)
-     }
- 
-+    /// Returns `true` if this is a self-contained `target`, if defined
-+    fn self_contained(&self, target: TargetSelection) -> Option<bool> {
-+        self.config.target_config.get(&target).map(|t| t.self_contained)
-+    }
-+
-     /// Returns `true` if the target will be tested using the `remote-test-client`
-     /// and `remote-test-server` binaries.
-     fn remote_tested(&self, target: TargetSelection) -> bool {
--- 
-2.51.0
-

0001-only-copy-rustlib-into-stage0-sysroot.patch

@@ -1,28 +0,0 @@
-From 7d83bae4e2577ffa2afaf2fddb6948c1756a403c Mon Sep 17 00:00:00 2001
-From: Paul Murphy <paumurph@redhat.com>
-Date: Thu, 10 Jul 2025 09:06:22 -0500
-Subject: [PATCH] only copy rustlib into stage0 sysroot
-
-Otherwise, much more is copied, and doing so likely runs into
-permissions errors if the bootstrap toolchain lives in the host's
-sysroot.
----
- src/bootstrap/src/core/build_steps/compile.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index 4d0ae54e1ef..4ef70dd9b97 100644
---- a/src/bootstrap/src/core/build_steps/compile.rs
-+++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -811,7 +811,7 @@ fn run(self, builder: &Builder<'_>) {
-                 let _ = fs::remove_dir_all(sysroot.join("lib/rustlib/src/rust"));
-             }
- 
--            builder.cp_link_r(&builder.initial_sysroot.join("lib"), &sysroot.join("lib"));
-+            builder.cp_link_r(&builder.initial_sysroot.join("lib/rustlib"), &sysroot.join("lib/rustlib"));
-         } else {
-             if builder.download_rustc() {
-                 // Ensure there are no CI-rustc std artifacts.
--- 
-2.49.0
-

0002-set-an-external-library-path-for-wasm32-wasi.patch

@@ -1,112 +0,0 @@
-From 862d09fe2e8b0f5ce8fe7bfc592cda66a1d74c08 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Mon, 18 Aug 2025 17:13:28 -0700
-Subject: [PATCH 2/2] set an external library path for wasm32-wasi
-
----
- compiler/rustc_codegen_ssa/src/back/link.rs            | 10 ++++++++++
- compiler/rustc_target/src/spec/json.rs                 |  4 ++++
- compiler/rustc_target/src/spec/mod.rs                  |  2 ++
- .../rustc_target/src/spec/targets/wasm32_wasip1.rs     |  7 ++++---
- 4 files changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
-index 48b01ea2df19..59b87396fed2 100644
---- a/compiler/rustc_codegen_ssa/src/back/link.rs
-+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
-@@ -1559,6 +1559,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
-             return file_path;
-         }
-     }
-+    if let Some(lib_path) = &sess.target.options.external_lib_path {
-+        let file_path = Path::new(lib_path.as_ref()).join(name);
-+        if file_path.exists() {
-+            return file_path;
-+        }
-+    }
-     for search_path in sess.target_filesearch().search_paths(PathKind::Native) {
-         let file_path = search_path.dir.join(name);
-         if file_path.exists() {
-@@ -2140,6 +2146,10 @@ fn add_library_search_dirs(
-         }
-         ControlFlow::<()>::Continue(())
-     });
-+
-+    if let Some(lib_path) = &sess.target.options.external_lib_path {
-+        cmd.include_path(Path::new(lib_path.as_ref()));
-+    }
- }
- 
- /// Add options making relocation sections in the produced ELF files read-only
-diff --git a/compiler/rustc_target/src/spec/json.rs b/compiler/rustc_target/src/spec/json.rs
-index f236be92b3b6..eea6e0c203d2 100644
---- a/compiler/rustc_target/src/spec/json.rs
-+++ b/compiler/rustc_target/src/spec/json.rs
-@@ -81,6 +81,7 @@ macro_rules! forward_opt {
-         forward!(linker_is_gnu_json);
-         forward!(pre_link_objects);
-         forward!(post_link_objects);
-+        forward_opt!(external_lib_path);
-         forward!(pre_link_objects_self_contained);
-         forward!(post_link_objects_self_contained);
- 
-@@ -301,6 +302,7 @@ macro_rules! target_option_val {
-         target_option_val!(linker_is_gnu_json, "linker-is-gnu");
-         target_option_val!(pre_link_objects);
-         target_option_val!(post_link_objects);
-+        target_option_val!(external_lib_path);
-         target_option_val!(pre_link_objects_self_contained, "pre-link-objects-fallback");
-         target_option_val!(post_link_objects_self_contained, "post-link-objects-fallback");
-         target_option_val!(link_args - pre_link_args_json, "pre-link-args");
-@@ -511,6 +513,8 @@ struct TargetSpecJson {
-     pre_link_objects: Option<CrtObjects>,
-     #[serde(rename = "post-link-objects")]
-     post_link_objects: Option<CrtObjects>,
-+    #[serde(rename = "external-lib-path")]
-+    external_lib_path: Option<StaticCow<str>>,
-     #[serde(rename = "pre-link-objects-fallback")]
-     pre_link_objects_self_contained: Option<CrtObjects>,
-     #[serde(rename = "post-link-objects-fallback")]
-diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 07fb1ce63f7c..c076c2836f84 100644
---- a/compiler/rustc_target/src/spec/mod.rs
-+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1992,6 +1992,7 @@ pub struct TargetOptions {
-     /// Objects to link before and after all other object code.
-     pub pre_link_objects: CrtObjects,
-     pub post_link_objects: CrtObjects,
-+    pub external_lib_path: Option<StaticCow<str>>,
-     /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled.
-     pub pre_link_objects_self_contained: CrtObjects,
-     pub post_link_objects_self_contained: CrtObjects,
-@@ -2518,6 +2519,7 @@ fn default() -> TargetOptions {
-             relro_level: RelroLevel::None,
-             pre_link_objects: Default::default(),
-             post_link_objects: Default::default(),
-+            external_lib_path: None,
-             pre_link_objects_self_contained: Default::default(),
-             post_link_objects_self_contained: Default::default(),
-             link_self_contained: LinkSelfContainedDefault::False,
-diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-index 26add451ed25..3eaf050e6823 100644
---- a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-+++ b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-@@ -21,11 +21,12 @@ pub(crate) fn target() -> Target {
-     options.env = "p1".into();
-     options.add_pre_link_args(LinkerFlavor::WasmLld(Cc::Yes), &["--target=wasm32-wasip1"]);
- 
--    options.pre_link_objects_self_contained = crt_objects::pre_wasi_self_contained();
--    options.post_link_objects_self_contained = crt_objects::post_wasi_self_contained();
-+    options.pre_link_objects = crt_objects::pre_wasi_self_contained();
-+    options.post_link_objects = crt_objects::post_wasi_self_contained();
- 
-     // FIXME: Figure out cases in which WASM needs to link with a native toolchain.
--    options.link_self_contained = LinkSelfContainedDefault::True;
-+    options.link_self_contained = LinkSelfContainedDefault::False;
-+    options.external_lib_path = Some("/usr/wasm32-wasi/lib/wasm32-wasi".into());
- 
-     // Right now this is a bit of a workaround but we're currently saying that
-     // the target by default has a static crt which we're taking as a signal
--- 
-2.51.0
-

cargo_vendor.attr

@@ -1,2 +0,0 @@
-%__cargo_vendor_path     ^%{_defaultlicensedir}(/[^/]+)+/cargo-vendor.txt$
-%__cargo_vendor_provides %{_rpmconfigdir}/cargo_vendor.prov

cargo_vendor.prov

@@ -1,127 +0,0 @@
-#! /usr/bin/python3 -s
-# Stripped down replacement for cargo2rpm parse-vendor-manifest
-
-import re
-import subprocess
-import sys
-from typing import Optional
-
-
-VERSION_REGEX = re.compile(
-    r"""
-    ^
-    (?P<major>0|[1-9]\d*)
-    \.(?P<minor>0|[1-9]\d*)
-    \.(?P<patch>0|[1-9]\d*)
-    (?:-(?P<pre>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?
-    (?:\+(?P<build>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
-    """,
-    re.VERBOSE,
-)
-
-
-class Version:
-    """
-    Version that adheres to the "semantic versioning" format.
-    """
-
-    def __init__(self, major: int, minor: int, patch: int, pre: Optional[str] = None, build: Optional[str] = None):
-        self.major: int = major
-        self.minor: int = minor
-        self.patch: int = patch
-        self.pre: Optional[str] = pre
-        self.build: Optional[str] = build
-
-    @staticmethod
-    def parse(version: str) -> "Version":
-        """
-        Parses a version string and return a `Version` object.
-        Raises a `ValueError` if the string does not match the expected format.
-        """
-
-        match = VERSION_REGEX.match(version)
-        if not match:
-            raise ValueError(f"Invalid version: {version!r}")
-
-        matches = match.groupdict()
-
-        major_str = matches["major"]
-        minor_str = matches["minor"]
-        patch_str = matches["patch"]
-        pre = matches["pre"]
-        build = matches["build"]
-
-        major = int(major_str)
-        minor = int(minor_str)
-        patch = int(patch_str)
-
-        return Version(major, minor, patch, pre, build)
-
-    def to_rpm(self) -> str:
-        """
-        Formats the `Version` object as an equivalent RPM version string.
-        Characters that are invalid in RPM versions are replaced ("-" -> "_")
-
-        Build metadata (the optional `Version.build` attribute) is dropped, so
-        the conversion is not lossless for versions where this attribute is not
-        `None`. However, build metadata is not intended to be part of the
-        version (and is not even considered when doing version comparison), so
-        dropping it when converting to the RPM version format is correct.
-        """
-
-        s = f"{self.major}.{self.minor}.{self.patch}"
-        if self.pre:
-            s += f"~{self.pre.replace('-', '_')}"
-        return s
-
-
-def break_the_build(error: str):
-    """
-    This function writes a string that is an invalid RPM dependency specifier,
-    which causes dependency generators to fail and break the build. The
-    additional error message is printed to stderr.
-    """
-
-    print("*** FATAL ERROR ***")
-    print(error, file=sys.stderr)
-
- 
-def get_cargo_vendor_txt_paths_from_stdin() -> set[str]:  # pragma nocover
-    """
-    Read lines from standard input and filter out lines that look like paths
-    to `cargo-vendor.txt` files. This is how RPM generators pass lists of files.
-    """
-
-    lines = {line.rstrip("\n") for line in sys.stdin.readlines()}
-    return {line for line in lines if line.endswith("/cargo-vendor.txt")}
-
-
-def action_parse_vendor_manifest():
-    paths = get_cargo_vendor_txt_paths_from_stdin()
-
-    for path in paths:
-        with open(path) as file:
-            manifest = file.read()
-
-        for line in manifest.strip().splitlines():
-            crate, version = line.split(" v")
-            print(f"bundled(crate({crate})) = {Version.parse(version).to_rpm()}")
-
-
-def main():
-    try:
-        action_parse_vendor_manifest()
-        exit(0)
-
-    # print an error message that is not a valid RPM dependency
-    # to cause the generator to break the build
-    except (IOError, ValueError) as exc:
-        break_the_build(str(exc))
-        exit(1)
-
-    break_the_build("Uncaught exception: This should not happen, please report a bug.")
-    exit(1)
-
-
-if __name__ == "__main__":
-    main()

changelog

@@ -1,607 +0,0 @@
-* Fri Apr 05 2024 Josh Stone <jistone@redhat.com> - 1.77.0-3
-- Ensure more consistency in PGO flags -- fixes Cargo tests
-
-* Thu Mar 21 2024 Davide Cavalca <dcavalca@fedoraproject.org> - 1.77.0-2
-- Add build target for aarch64-unknown-none-softfloat
-
-* Thu Mar 21 2024 Nikita Popov <npopov@redhat.com> - 1.77.0-1
-- Update to 1.77.0
-
-* Thu Feb 08 2024 Josh Stone <jistone@redhat.com> - 1.76.0-1
-- Update to 1.76.0.
-
-* Tue Jan 30 2024 Josh Stone <jistone@redhat.com> - 1.75.0-3
-- Consolidate 32-bit build compromises.
-- Update rust-toolset and add rust-srpm-macros for ELN.
-
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.75.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Dec 31 2023 Josh Stone <jistone@redhat.com> - 1.75.0-1
-- Update to 1.75.0.
-
-* Thu Dec 07 2023 Josh Stone <jistone@redhat.com> - 1.74.1-1
-- Update to 1.74.1.
-
-* Thu Nov 16 2023 Josh Stone <jistone@redhat.com> - 1.74.0-1
-- Update to 1.74.0.
-
-* Thu Oct 26 2023 Josh Stone <jistone@redhat.com> - 1.73.0-2
-- Use thin-LTO and PGO for rustc itself.
-
-* Thu Oct 05 2023 Josh Stone <jistone@redhat.com> - 1.73.0-1
-- Update to 1.73.0.
-- Drop el7 conditionals from the spec.
-
-* Fri Sep 29 2023 Josh Stone <jistone@redhat.com> - 1.72.1-3
-- Fix the profiler runtime with compiler-rt-17
-- Switch to unbundled wasi-libc on Fedora
-- Use emmalloc instead of CC0 dlmalloc when bundling wasi-libc
-
-* Mon Sep 25 2023 Josh Stone <jistone@redhat.com> - 1.72.1-2
-- Fix LLVM dependency for ELN
-- Add build target for x86_64-unknown-none
-- Add build target for x86_64-unknown-uefi
-
-* Tue Sep 19 2023 Josh Stone <jistone@redhat.com> - 1.72.1-1
-- Update to 1.72.1.
-- Migrated to SPDX license
-
-* Thu Aug 24 2023 Josh Stone <jistone@redhat.com> - 1.72.0-1
-- Update to 1.72.0.
-
-* Mon Aug 07 2023 Josh Stone <jistone@redhat.com> - 1.71.1-1
-- Update to 1.71.1.
-- Security fix for CVE-2023-38497
-
-* Tue Jul 25 2023 Josh Stone <jistone@redhat.com> - 1.71.0-3
-- Relax the suspicious_double_ref_op lint
-- Enable the profiler runtime for native hosts
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Jul 17 2023 Josh Stone <jistone@redhat.com> - 1.71.0-1
-- Update to 1.71.0.
-
-* Fri Jun 23 2023 Josh Stone <jistone@redhat.com> - 1.70.0-2
-- Override default target CPUs to match distro settings
-
-* Thu Jun 01 2023 Josh Stone <jistone@redhat.com> - 1.70.0-1
-- Update to 1.70.0.
-
-* Fri May 05 2023 Josh Stone <jistone@redhat.com> - 1.69.0-3
-- Fix debuginfo with LLVM 16
-
-* Mon May 01 2023 Josh Stone <jistone@redhat.com> - 1.69.0-2
-- Build with LLVM 15 on Fedora 38+
-
-* Thu Apr 20 2023 Josh Stone <jistone@redhat.com> - 1.69.0-1
-- Update to 1.69.0.
-- Obsolete rust-analysis.
-
-* Tue Mar 28 2023 Josh Stone <jistone@redhat.com> - 1.68.2-1
-- Update to 1.68.2.
-
-* Thu Mar 23 2023 Josh Stone <jistone@redhat.com> - 1.68.1-1
-- Update to 1.68.1.
-
-* Thu Mar 09 2023 Josh Stone <jistone@redhat.com> - 1.68.0-1
-- Update to 1.68.0.
-
-* Tue Mar 07 2023 David Michael <fedora.dm0@gmail.com> - 1.67.1-3
-- Add a virtual Provides to rust-std-static containing the target triple.
-
-* Mon Feb 20 2023 Orion Poplawski <orion@nwra.com> - 1.67.1-2
-- Ship rust-toolset for EPEL7
-
-* Thu Feb 09 2023 Josh Stone <jistone@redhat.com> - 1.67.1-1
-- Update to 1.67.1.
-
-* Fri Feb 03 2023 Josh Stone <jistone@redhat.com> - 1.67.0-3
-- Unbundle libgit2 on Fedora 38.
-
-* Fri Jan 27 2023 Adam Williamson <awilliam@redhat.com> - 1.67.0-2
-- Backport PR #107360 to fix build of mesa
-- Backport 675fa0b3 to fix bootstrapping failure
-
-* Thu Jan 26 2023 Josh Stone <jistone@redhat.com> - 1.67.0-1
-- Update to 1.67.0.
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.66.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Jan 10 2023 Josh Stone <jistone@redhat.com> - 1.66.1-1
-- Update to 1.66.1.
-- Security fix for CVE-2022-46176
-
-* Thu Dec 15 2022 Josh Stone <jistone@redhat.com> - 1.66.0-1
-- Update to 1.66.0.
-
-* Thu Nov 03 2022 Josh Stone <jistone@redhat.com> - 1.65.0-1
-- Update to 1.65.0.
-- rust-analyzer now obsoletes rls.
-
-* Thu Sep 22 2022 Josh Stone <jistone@redhat.com> - 1.64.0-1
-- Update to 1.64.0.
-- Add rust-analyzer.
-
-* Thu Aug 11 2022 Josh Stone <jistone@redhat.com> - 1.63.0-1
-- Update to 1.63.0.
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.62.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jul 19 2022 Josh Stone <jistone@redhat.com> - 1.62.1-1
-- Update to 1.62.1.
-
-* Wed Jul 13 2022 Josh Stone <jistone@redhat.com> - 1.62.0-2
-- Prevent unsound coercions from functions with opaque return types.
-
-* Thu Jun 30 2022 Josh Stone <jistone@redhat.com> - 1.62.0-1
-- Update to 1.62.0.
-
-* Mon May 23 2022 Josh Stone <jistone@redhat.com> - 1.61.0-2
-- Add missing target_feature to the list of well known cfg names
-
-* Thu May 19 2022 Josh Stone <jistone@redhat.com> - 1.61.0-1
-- Update to 1.61.0.
-- Add rust-toolset for ELN.
-
-* Thu Apr 07 2022 Josh Stone <jistone@redhat.com> - 1.60.0-1
-- Update to 1.60.0.
-
-* Fri Mar 25 2022 Josh Stone <jistone@redhat.com> - 1.59.0-4
-- Fix the archive index for wasm32-wasi's libc.a
-
-* Fri Mar 04 2022 Stephen Gallagher <sgallagh@redhat.com> - 1.59.0-3
-- Rebuild against the bootstrapped build
-
-* Fri Mar 04 2022 Stephen Gallagher <sgallagh@redhat.com> - 1.59.0-2.1
-- Bootstrapping for Fedora ELN
-
-* Tue Mar 01 2022 Josh Stone <jistone@redhat.com> - 1.59.0-2
-- Fix s390x hangs, rhbz#2058803
-
-* Thu Feb 24 2022 Josh Stone <jistone@redhat.com> - 1.59.0-1
-- Update to 1.59.0.
-- Revert to libgit2 1.3.x
-
-* Sun Feb 20 2022 Igor Raits <igor.raits@gmail.com> - 1.58.1-2
-- Rebuild for libgit2 1.4.x
-
-* Thu Jan 20 2022 Josh Stone <jistone@redhat.com> - 1.58.1-1
-- Update to 1.58.1.
-
-* Thu Jan 13 2022 Josh Stone <jistone@redhat.com> - 1.58.0-1
-- Update to 1.58.0.
-
-* Wed Jan 05 2022 Josh Stone <jistone@redhat.com> - 1.57.0-2
-- Add rust-std-static-i686-pc-windows-gnu
-- Add rust-std-static-x86_64-pc-windows-gnu
-
-* Thu Dec 02 2021 Josh Stone <jistone@redhat.com> - 1.57.0-1
-- Update to 1.57.0, fixes rhbz#2028675.
-- Backport rust#91070, fixes rhbz#1990657
-- Add rust-std-static-wasm32-wasi
-
-* Sun Nov 28 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.56.1-3
-- De-bootstrap (libgit2)
-
-* Sun Nov 28 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.56.1-2
-- Rebuild for libgit2 1.3.x
-
-* Mon Nov 01 2021 Josh Stone <jistone@redhat.com> - 1.56.1-1
-- Update to 1.56.1.
-
-* Thu Oct 21 2021 Josh Stone <jistone@redhat.com> - 1.56.0-1
-- Update to 1.56.0.
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.55.0-2
-- Rebuilt with OpenSSL 3.0.0
-
-* Thu Sep 09 2021 Josh Stone <jistone@redhat.com> - 1.55.0-1
-- Update to 1.55.0.
-- Use llvm-ranlib for wasm rlibs; Fixes rhbz#2002612
-
-* Tue Aug 24 2021 Josh Stone <jistone@redhat.com> - 1.54.0-2
-- Build with LLVM 12 on Fedora 35+
-
-* Thu Jul 29 2021 Josh Stone <jistone@redhat.com> - 1.54.0-1
-- Update to 1.54.0.
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.53.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jul 08 2021 Josh Stone <jistone@redhat.com> - 1.53.0-2
-- Exclude wasm on s390x for lack of lld
-
-* Thu Jun 17 2021 Josh Stone <jistone@redhat.com> - 1.53.0-1
-- Update to 1.53.0.
-
-* Wed Jun 02 2021 Josh Stone <jistone@redhat.com> - 1.52.1-2
-- Set rust.codegen-units-std=1 for all targets again.
-- Add rust-std-static-wasm32-unknown-unknown.
-- Rebuild f34 with LLVM 12.
-
-* Mon May 10 2021 Josh Stone <jistone@redhat.com> - 1.52.1-1
-- Update to 1.52.1.
-
-* Thu May 06 2021 Josh Stone <jistone@redhat.com> - 1.52.0-1
-- Update to 1.52.0.
-
-* Fri Apr 16 2021 Josh Stone <jistone@redhat.com> - 1.51.0-3
-- Security fixes for CVE-2020-36323, CVE-2021-31162
-
-* Wed Apr 14 2021 Josh Stone <jistone@redhat.com> - 1.51.0-2
-- Security fixes for CVE-2021-28876, CVE-2021-28878, CVE-2021-28879
-- Fix bootstrap for stage0 rust 1.51
-
-* Thu Mar 25 2021 Josh Stone <jistone@redhat.com> - 1.51.0-1
-- Update to 1.51.0.
-
-* Thu Feb 11 2021 Josh Stone <jistone@redhat.com> - 1.50.0-1
-- Update to 1.50.0.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.49.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jan 05 2021 Josh Stone <jistone@redhat.com> - 1.49.0-1
-- Update to 1.49.0.
-
-* Tue Dec 29 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.48.0-3
-- De-bootstrap
-
-* Mon Dec 28 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.48.0-2
-- Rebuild for libgit2 1.1.x
-
-* Thu Nov 19 2020 Josh Stone <jistone@redhat.com> - 1.48.0-1
-- Update to 1.48.0.
-
-* Sat Oct 10 2020 Jeff Law <law@redhat.com> - 1.47.0-2
-- Re-enable LTO
-
-* Thu Oct 08 2020 Josh Stone <jistone@redhat.com> - 1.47.0-1
-- Update to 1.47.0.
-
-* Fri Aug 28 2020 Fabio Valentini <decathorpe@gmail.com> - 1.46.0-2
-- Fix LTO with doctests (backported cargo PR#8657).
-
-* Thu Aug 27 2020 Josh Stone <jistone@redhat.com> - 1.46.0-1
-- Update to 1.46.0.
-
-* Mon Aug 03 2020 Josh Stone <jistone@redhat.com> - 1.45.2-1
-- Update to 1.45.2.
-
-* Thu Jul 30 2020 Josh Stone <jistone@redhat.com> - 1.45.1-1
-- Update to 1.45.1.
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.45.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 16 2020 Josh Stone <jistone@redhat.com> - 1.45.0-1
-- Update to 1.45.0.
-
-* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 1.44.1-2
-- Disable LTO
-
-* Thu Jun 18 2020 Josh Stone <jistone@redhat.com> - 1.44.1-1
-- Update to 1.44.1.
-
-* Thu Jun 04 2020 Josh Stone <jistone@redhat.com> - 1.44.0-1
-- Update to 1.44.0.
-
-* Thu May 07 2020 Josh Stone <jistone@redhat.com> - 1.43.1-1
-- Update to 1.43.1.
-
-* Thu Apr 23 2020 Josh Stone <jistone@redhat.com> - 1.43.0-1
-- Update to 1.43.0.
-
-* Thu Mar 12 2020 Josh Stone <jistone@redhat.com> - 1.42.0-1
-- Update to 1.42.0.
-
-* Thu Feb 27 2020 Josh Stone <jistone@redhat.com> - 1.41.1-1
-- Update to 1.41.1.
-
-* Thu Feb 20 2020 Josh Stone <jistone@redhat.com> - 1.41.0-2
-- Rebuild with llvm9.0
-
-* Thu Jan 30 2020 Josh Stone <jistone@redhat.com> - 1.41.0-1
-- Update to 1.41.0.
-
-* Thu Jan 16 2020 Josh Stone <jistone@redhat.com> - 1.40.0-3
-- Build compiletest with in-tree libtest
-
-* Tue Jan 07 2020 Josh Stone <jistone@redhat.com> - 1.40.0-2
-- Fix compiletest with newer (local-rebuild) libtest
-- Fix ARM EHABI unwinding
-
-* Thu Dec 19 2019 Josh Stone <jistone@redhat.com> - 1.40.0-1
-- Update to 1.40.0.
-
-* Tue Nov 12 2019 Josh Stone <jistone@redhat.com> - 1.39.0-2
-- Fix a couple build and test issues with rustdoc.
-
-* Thu Nov 07 2019 Josh Stone <jistone@redhat.com> - 1.39.0-1
-- Update to 1.39.0.
-
-* Fri Sep 27 2019 Josh Stone <jistone@redhat.com> - 1.38.0-2
-- Filter the libraries included in rust-std (rhbz1756487)
-
-* Thu Sep 26 2019 Josh Stone <jistone@redhat.com> - 1.38.0-1
-- Update to 1.38.0.
-
-* Thu Aug 15 2019 Josh Stone <jistone@redhat.com> - 1.37.0-1
-- Update to 1.37.0.
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.36.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jul 04 2019 Josh Stone <jistone@redhat.com> - 1.36.0-1
-- Update to 1.36.0.
-
-* Wed May 29 2019 Josh Stone <jistone@redhat.com> - 1.35.0-2
-- Fix compiletest for rebuild testing.
-
-* Thu May 23 2019 Josh Stone <jistone@redhat.com> - 1.35.0-1
-- Update to 1.35.0.
-
-* Tue May 14 2019 Josh Stone <jistone@redhat.com> - 1.34.2-1
-- Update to 1.34.2 -- fixes CVE-2019-12083.
-
-* Tue Apr 30 2019 Josh Stone <jistone@redhat.com> - 1.34.1-3
-- Set rust.codegen-units-std=1
-
-* Fri Apr 26 2019 Josh Stone <jistone@redhat.com> - 1.34.1-2
-- Remove the ThinLTO workaround.
-
-* Thu Apr 25 2019 Josh Stone <jistone@redhat.com> - 1.34.1-1
-- Update to 1.34.1.
-- Add a ThinLTO fix for rhbz1701339.
-
-* Thu Apr 11 2019 Josh Stone <jistone@redhat.com> - 1.34.0-1
-- Update to 1.34.0.
-
-* Fri Mar 01 2019 Josh Stone <jistone@redhat.com> - 1.33.0-2
-- Fix deprecations for self-rebuild
-
-* Thu Feb 28 2019 Josh Stone <jistone@redhat.com> - 1.33.0-1
-- Update to 1.33.0.
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.32.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jan 17 2019 Josh Stone <jistone@redhat.com> - 1.32.0-1
-- Update to 1.32.0.
-
-* Mon Jan 07 2019 Josh Stone <jistone@redhat.com> - 1.31.1-9
-- Update to 1.31.1 for RLS fixes.
-
-* Thu Dec 06 2018 Josh Stone <jistone@redhat.com> - 1.31.0-8
-- Update to 1.31.0 -- Rust 2018!
-- clippy/rls/rustfmt are no longer -preview
-
-* Thu Nov 08 2018 Josh Stone <jistone@redhat.com> - 1.30.1-7
-- Update to 1.30.1.
-
-* Thu Oct 25 2018 Josh Stone <jistone@redhat.com> - 1.30.0-6
-- Update to 1.30.0.
-
-* Mon Oct 22 2018 Josh Stone <jistone@redhat.com> - 1.29.2-5
-- Rebuild without bootstrap binaries.
-
-* Sat Oct 20 2018 Josh Stone <jistone@redhat.com> - 1.29.2-4
-- Re-bootstrap armv7hl due to rhbz#1639485
-
-* Fri Oct 12 2018 Josh Stone <jistone@redhat.com> - 1.29.2-3
-- Update to 1.29.2.
-
-* Tue Sep 25 2018 Josh Stone <jistone@redhat.com> - 1.29.1-2
-- Update to 1.29.1.
-- Security fix for str::repeat (pending CVE).
-
-* Thu Sep 13 2018 Josh Stone <jistone@redhat.com> - 1.29.0-1
-- Update to 1.29.0.
-- Add a clippy-preview subpackage
-
-* Mon Aug 13 2018 Josh Stone <jistone@redhat.com> - 1.28.0-3
-- Use llvm6.0 instead of llvm-7 for now
-
-* Tue Aug 07 2018 Josh Stone <jistone@redhat.com> - 1.28.0-2
-- Rebuild for LLVM ppc64/s390x fixes
-
-* Thu Aug 02 2018 Josh Stone <jistone@redhat.com> - 1.28.0-1
-- Update to 1.28.0.
-
-* Tue Jul 24 2018 Josh Stone <jistone@redhat.com> - 1.27.2-4
-- Update to 1.27.2.
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.27.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Josh Stone <jistone@redhat.com> - 1.27.1-2
-- Update to 1.27.1.
-- Security fix for CVE-2018-1000622
-
-* Thu Jun 21 2018 Josh Stone <jistone@redhat.com> - 1.27.0-1
-- Update to 1.27.0.
-
-* Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-4
-- Rebuild without bootstrap binaries.
-
-* Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-3
-- Update to 1.26.2.
-- Re-bootstrap to deal with LLVM symbol changes.
-
-* Tue May 29 2018 Josh Stone <jistone@redhat.com> - 1.26.1-2
-- Update to 1.26.1.
-
-* Thu May 10 2018 Josh Stone <jistone@redhat.com> - 1.26.0-1
-- Update to 1.26.0.
-
-* Mon Apr 16 2018 Dan Callaghan <dcallagh@redhat.com> - 1.25.0-3
-- Add cargo, rls, and analysis
-
-* Tue Apr 10 2018 Josh Stone <jistone@redhat.com> - 1.25.0-2
-- Filter codegen-backends from Provides too.
-
-* Thu Mar 29 2018 Josh Stone <jistone@redhat.com> - 1.25.0-1
-- Update to 1.25.0.
-
-* Thu Mar 01 2018 Josh Stone <jistone@redhat.com> - 1.24.1-1
-- Update to 1.24.1.
-
-* Wed Feb 21 2018 Josh Stone <jistone@redhat.com> - 1.24.0-3
-- Backport a rebuild fix for rust#48308.
-
-* Mon Feb 19 2018 Josh Stone <jistone@redhat.com> - 1.24.0-2
-- rhbz1546541: drop full-bootstrap; cmp libs before symlinking.
-- Backport pr46592 to fix local_rebuild bootstrapping.
-- Backport pr48362 to fix relative/absolute libdir.
-
-* Thu Feb 15 2018 Josh Stone <jistone@redhat.com> - 1.24.0-1
-- Update to 1.24.0.
-
-* Mon Feb 12 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.23.0-4
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Tue Feb 06 2018 Josh Stone <jistone@redhat.com> - 1.23.0-3
-- Use full-bootstrap to work around a rebuild issue.
-- Patch binaryen for GCC 8
-
-* Thu Feb 01 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.23.0-2
-- Switch to %%ldconfig_scriptlets
-
-* Mon Jan 08 2018 Josh Stone <jistone@redhat.com> - 1.23.0-1
-- Update to 1.23.0.
-
-* Thu Nov 23 2017 Josh Stone <jistone@redhat.com> - 1.22.1-1
-- Update to 1.22.1.
-
-* Thu Oct 12 2017 Josh Stone <jistone@redhat.com> - 1.21.0-1
-- Update to 1.21.0.
-
-* Mon Sep 11 2017 Josh Stone <jistone@redhat.com> - 1.20.0-2
-- ABI fixes for ppc64 and s390x.
-
-* Thu Aug 31 2017 Josh Stone <jistone@redhat.com> - 1.20.0-1
-- Update to 1.20.0.
-- Add a rust-src subpackage.
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jul 24 2017 Josh Stone <jistone@redhat.com> - 1.19.0-2
-- Use find-debuginfo.sh --keep-section .rustc
-
-* Thu Jul 20 2017 Josh Stone <jistone@redhat.com> - 1.19.0-1
-- Update to 1.19.0.
-
-* Thu Jun 08 2017 Josh Stone <jistone@redhat.com> - 1.18.0-1
-- Update to 1.18.0.
-
-* Mon May 08 2017 Josh Stone <jistone@redhat.com> - 1.17.0-2
-- Move shared libraries back to libdir and symlink in rustlib
-
-* Thu Apr 27 2017 Josh Stone <jistone@redhat.com> - 1.17.0-1
-- Update to 1.17.0.
-
-* Mon Mar 20 2017 Josh Stone <jistone@redhat.com> - 1.16.0-3
-- Make rust-lldb arch-specific to deal with lldb deps
-
-* Fri Mar 17 2017 Josh Stone <jistone@redhat.com> - 1.16.0-2
-- Limit rust-lldb arches
-
-* Thu Mar 16 2017 Josh Stone <jistone@redhat.com> - 1.16.0-1
-- Update to 1.16.0.
-- Use rustbuild instead of the old makefiles.
-- Update bootstrapping to include rust-std and cargo.
-- Add a rust-lldb subpackage.
-
-* Thu Feb 09 2017 Josh Stone <jistone@redhat.com> - 1.15.1-1
-- Update to 1.15.1.
-- Require rust-rpm-macros for new crate packaging.
-- Keep shared libraries under rustlib/, only debug-stripped.
-- Merge and clean up conditionals for epel7.
-
-* Fri Dec 23 2016 Josh Stone <jistone@redhat.com> - 1.14.0-2
-- Rebuild without bootstrap binaries.
-
-* Thu Dec 22 2016 Josh Stone <jistone@redhat.com> - 1.14.0-1
-- Update to 1.14.0.
-- Rewrite bootstrap logic to target specific arches.
-- Bootstrap ppc64, ppc64le, s390x. (thanks to Sinny Kumari for testing!)
-
-* Thu Nov 10 2016 Josh Stone <jistone@redhat.com> - 1.13.0-1
-- Update to 1.13.0.
-- Use hardening flags for linking.
-- Split the standard library into its own package
-- Centralize rustlib/ under /usr/lib/ for multilib integration.
-
-* Thu Oct 20 2016 Josh Stone <jistone@redhat.com> - 1.12.1-1
-- Update to 1.12.1.
-
-* Fri Oct 14 2016 Josh Stone <jistone@redhat.com> - 1.12.0-7
-- Rebuild with LLVM 3.9.
-- Add ncurses-devel for llvm-config's -ltinfo.
-
-* Thu Oct 13 2016 Josh Stone <jistone@redhat.com> - 1.12.0-6
-- Rebuild with llvm-static, preparing for 3.9
-
-* Fri Oct 07 2016 Josh Stone <jistone@redhat.com> - 1.12.0-5
-- Rebuild with fixed eu-strip (rhbz1380961)
-
-* Fri Oct 07 2016 Josh Stone <jistone@redhat.com> - 1.12.0-4
-- Rebuild without bootstrap binaries.
-
-* Thu Oct 06 2016 Josh Stone <jistone@redhat.com> - 1.12.0-3
-- Bootstrap aarch64.
-- Use jemalloc's MALLOC_CONF to work around #36944.
-- Apply pr36933 to really disable armv7hl NEON.
-
-* Sat Oct 01 2016 Josh Stone <jistone@redhat.com> - 1.12.0-2
-- Protect .rustc from rpm stripping.
-
-* Fri Sep 30 2016 Josh Stone <jistone@redhat.com> - 1.12.0-1
-- Update to 1.12.0.
-- Always use --local-rust-root, even for bootstrap binaries.
-- Remove the rebuild conditional - the build system now figures it out.
-- Let minidebuginfo do its thing, since metadata is no longer a note.
-- Let rust build its own compiler-rt builtins again.
-
-* Sat Sep 03 2016 Josh Stone <jistone@redhat.com> - 1.11.0-3
-- Rebuild without bootstrap binaries.
-
-* Fri Sep 02 2016 Josh Stone <jistone@redhat.com> - 1.11.0-2
-- Bootstrap armv7hl, with backported no-neon patch.
-
-* Wed Aug 24 2016 Josh Stone <jistone@redhat.com> - 1.11.0-1
-- Update to 1.11.0.
-- Drop the backported patches.
-- Patch get-stage0.py to trust existing bootstrap binaries.
-- Use libclang_rt.builtins from compiler-rt, dodging llvm-static issues.
-- Use --local-rust-root to make sure the right bootstrap is used.
-
-* Sat Aug 13 2016 Josh Stone <jistone@redhat.com> 1.10.0-4
-- Rebuild without bootstrap binaries.
-
-* Fri Aug 12 2016 Josh Stone <jistone@redhat.com> - 1.10.0-3
-- Initial import into Fedora (#1356907), bootstrapped
-- Format license text as suggested in review.
-- Note how the tests already run in parallel.
-- Undefine _include_minidebuginfo, because it duplicates ".note.rustc".
-- Don't let checks fail the whole build.
-- Note that -doc can't be noarch, as rpmdiff doesn't allow variations.
-
-* Tue Jul 26 2016 Josh Stone <jistone@redhat.com> - 1.10.0-2
-- Update -doc directory ownership, and mark its licenses.
-- Package and declare licenses for libbacktrace and hoedown.
-- Set bootstrap_base as a global.
-- Explicitly require python2.
-
-* Thu Jul 14 2016 Josh Stone <jistone@fedoraproject.org> - 1.10.0-1
-- Initial package, bootstrapped

macros.rust-srpm

@@ -1,62 +0,0 @@
-# rust_arches: list of architectures where building Rust is supported
-#
-# Since RPM itself now depends on Rust code (via its GPG backend, rpm-sequoia),
-# this list will probably always be a superset of all architectures that are
-# supported by Fedora, which is why it is no longer required to set
-# "ExclusiveArch: rust_arches" for Rust packages in Fedora.
-%rust_arches x86_64 %{ix86} armv7hl aarch64 ppc64 ppc64le riscv64 s390x
-
-# version_no_tilde: lua macro for reconstructing the original crate version
-#       from the RPM version (i.e. replace any "~" characters with "-")
-%version_no_tilde() %{lua:
-    local sep = rpm.expand('%1')
-    local ver = rpm.expand('%2')
-\
-    if sep == '%1' then
-        sep = '-'
-    end
-\
-    if ver == '%2' then
-        ver = rpm.expand('%version')
-    end
-    ver = ver:gsub('~', sep)
-\
-    print(ver)
-}
-
-# __crates_url: default API endpoint for downloading .crate files from crates.io
-%__crates_url https://crates.io/api/v1/crates/
-
-# crates_source: lua macro for constructing the Source URL for a crate
-%crates_source() %{lua:
-    local crate = rpm.expand('%1')
-    local version = rpm.expand('%2')
-    local url = rpm.expand('%__crates_url')
-\
-    -- first argument missing: fall back to %crate
-    if crate == '%1' then
-        crate = rpm.expand('%crate')
-    end
-    -- %crate macro not defined: fall back to %name
-    if crate == '%crate' then
-        crate = rpm.expand('%name')
-    end
-\
-    -- second argument missing: fall back to %crate_version
-    if version == '%2' then
-        version = rpm.expand('%crate_version')
-    end
-    -- %crate_version macro not defined: fall back to %version
-    if version == '%crate_version' then
-        version = rpm.expand('%version')
-    end
-    -- replace '~' with '-' for backwards compatibility
-    -- can be removed in the future
-    version = version:gsub('~', '-')
-\
-    print(url .. crate .. '/' .. version .. '/download#/' .. crate .. '-' .. version .. '.crate')
-}
-
-# __cargo_skip_build: unused macro, set to 0 for backwards compatibility
-%__cargo_skip_build 0
-

macros.rust-toolset

@@ -1,100 +1,29 @@
-# __rustc: path to the default rustc executable
-%__rustc /usr/bin/rustc
+# Explicitly use bindir tools, in case others are in the PATH,
+# like the rustup shims in a user's ~/.cargo/bin/.
+#
+# Since cargo 1.31, install only uses $CARGO_HOME/config, ignoring $PWD.
+#   https://github.com/rust-lang/cargo/issues/6397
+# But we can set CARGO_HOME locally, which is a good idea anyway to make sure
+# it never writes to ~/.cargo during rpmbuild.
+%__cargo %{_bindir}/env CARGO_HOME=.cargo %{_bindir}/cargo
+%__rustc %{_bindir}/rustc
+%__rustdoc %{_bindir}/rustdoc
 
-# __rustdoc: path to the default rustdoc executable
-%__rustdoc /usr/bin/rustdoc
+# Enable optimization, debuginfo, and link hardening.
+%__global_rustflags -Copt-level=3 -Cdebuginfo=2 -Clink-arg=-Wl,-z,relro,-z,now
 
-# rustflags_opt_level: default optimization level
-#
-# It corresponds to the "-Copt-level" rustc command line option.
-%rustflags_opt_level 3
+%__global_rustflags_toml [%{lua:
+    for arg in string.gmatch(rpm.expand("%{__global_rustflags}"), "%S+") do
+        print('"' .. arg .. '", ')
+    end}]
 
-# rustflags_debuginfo: default verbosity of debug information
-#
-# It corresponds to the "-Cdebuginfo" rustc command line option.
-# In some cases, it might be required to override this macro with "1" or even
-# "0", if memory usage gets too high during builds on some resource-constrained
-# architectures (most likely on 32-bit architectures), which will however
-# reduce the quality of the produced debug symbols.
-%rustflags_debuginfo 2
-
-# rustflags_codegen_units: default number of parallel code generation units
-#
-# The default value of "1" results in generation of better code, but comes at
-# the cost of longer build times.
-%rustflags_codegen_units 1
-
-# build_rustflags: default compiler flags for rustc (RUSTFLAGS)
-#
-# -Copt-level: set optimization level (default: highest optimization level)
-# -Cdebuginfo: set debuginfo verbosity (default: full debug information)
-# -Ccodegen-units: set number of parallel code generation units (default: 1)
-# -Cforce-frame-pointers: force inclusion of frame pointers (default: enabled
-#       on x86_64 and aarch64 on Fedora 37+)
-#
-# Additionally, some linker flags are set which correspond to the default
-# Fedora compiler flags for hardening and for embedding package versions into
-# compiled binaries.
-#
-# ref. https://doc.rust-lang.org/rustc/codegen-options/index.html
-%build_rustflags %{shrink:
-  -Copt-level=%rustflags_opt_level
-  -Cdebuginfo=%rustflags_debuginfo
-  -Ccodegen-units=%rustflags_codegen_units
-  -Cstrip=none
-  %{expr:0%{?_include_frame_pointers} && ("%{_arch}" != "ppc64le" && "%{_arch}" != "s390x" && "%{_arch}" != "i386") ? "-Cforce-frame-pointers=yes" : ""}
-  %[0%{?_package_note_status} ? "-Clink-arg=%_package_note_flags" : ""]
-}
-
-# __cargo: cargo command with environment variables
-#
-# CARGO_HOME: This ensures cargo reads configuration file from .cargo/config.toml,
-#       and prevents writing any files to $HOME during RPM builds.
-%__cargo /usr/bin/env CARGO_HOME=.cargo RUSTFLAGS='%{build_rustflags}' /usr/bin/cargo
-
-# __cargo_common_opts: common command line flags for cargo
-#
-# _smp_mflags: run builds and tests in parallel
-%__cargo_common_opts %{?_smp_mflags}
-
-# cargo_prep: macro to set up build environment for cargo projects
-#
-# This involves four steps:
-# - create the ".cargo" directory if it doesn't exist yet
-# - dump custom cargo configuration into ".cargo/config.toml"
-# - remove "Cargo.lock" if it exists (it breaks builds with custom cargo config)
-# - remove "Cargo.toml.orig" if it exists (it breaks running "cargo package")
-#
-# Options:
-#   -V <number>    - unpack and use vendored sources from Source<number> tarball
-#                    (deprecated; use -v instead)
-#   -v <directory> - use vendored sources from <directory>
-#   -N             - Don't set up any registry. Only set up the build configuration.
-%cargo_prep(V:v:N)\
-%{-v:%{-V:%{error:-v and -V are mutually exclusive!}}}\
-%{-v:%{-N:%{error:-v and -N are mutually exclusive!}}}\
-(\
-set -euo pipefail\
-%{__mkdir} -p target/rpm\
-/usr/bin/ln -s rpm target/release\
-%{__rm} -rf .cargo/\
-%{__mkdir} -p .cargo\
-cat > .cargo/config.toml << EOF\
+%cargo_prep(V:) (\
+%{__mkdir} -p .cargo \
+cat > .cargo/config << EOF \
 [build]\
 rustc = "%{__rustc}"\
 rustdoc = "%{__rustdoc}"\
-\
-[profile.rpm]\
-inherits = "release"\
-opt-level = %{rustflags_opt_level}\
-codegen-units = %{rustflags_codegen_units}\
-debug = %{rustflags_debuginfo}\
-strip = "none"\
-\
-[env]\
-CFLAGS = "%{build_cflags}"\
-CXXFLAGS = "%{build_cxxflags}"\
-LDFLAGS = "%{build_ldflags}"\
+rustflags = %{__global_rustflags_toml}\
 \
 [install]\
 root = "%{buildroot}%{_prefix}"\
@@ -102,155 +31,21 @@ root = "%{buildroot}%{_prefix}"\
 [term]\
 verbose = true\
 EOF\
-%{-V:%{__tar} -xoaf %{S:%{-V*}}}\
-%{!?-N:\
-cat >> .cargo/config.toml << EOF\
-[source.vendored-sources]\
-directory = "%{-v*}%{-V:./vendor}"\
+%if 0%{-V:1}\
+%{__tar} -xoaf %{S:%{-V*}}\
+cat >> .cargo/config << EOF \
 \
 [source.crates-io]\
-registry = "https://crates.io"\
 replace-with = "vendored-sources"\
-EOF}\
-%{__rm} -f Cargo.toml.orig\
+\
+[source.vendored-sources]\
+directory = "./vendor"\
+EOF\
+%endif\
 )
 
-# __cargo_parse_opts: function-like macro which parses common flags into the
-#       equivalent command-line flags for cargo
-%__cargo_parse_opts(naf:) %{shrink:\
-    %{-n:%{-a:%{error:Can't specify both -n and -a}}}           \
-    %{-f:%{-a:%{error:Can't specify both -f(%{-f*}) and -a}}}   \
-    %{-n:--no-default-features}                                 \
-    %{-a:--all-features}                                        \
-    %{-f:--features %{-f*}}                                     \
-    %{nil}                                                      \
-}
+%cargo_build %__cargo build --release %{?_smp_mflags}
 
-# cargo_build: builds the crate with cargo with the specified feature flags
-%cargo_build(naf:)\
-%{shrink:                                               \
-    %{__cargo} build                                    \
-    %{__cargo_common_opts}                              \
-    --profile rpm                                       \
-    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}    \
-    %*                                                  \
-}
-
-# cargo_test: runs the test suite with cargo with the specified feature flags
-#
-# To pass command-line arguments to the cargo test runners directly (for
-# example, to skip certain tests during package builds), both the cargo_test
-# macro argument parsing and "cargo test" argument parsing need to be bypassed,
-# i.e. "%%cargo_test -- -- --skip foo" for skipping all tests with names that
-# match "foo".
-%cargo_test(naf:)\
-%{shrink:                                               \
-    %{__cargo} test                                     \
-    %{__cargo_common_opts}                              \
-    --profile rpm                                       \
-    --no-fail-fast                                      \
-    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}    \
-    %*                                                  \
-}
-
-# cargo_install: install files into the buildroot
-#
-# For "binary" crates, this macro installs all "bin" build targets to _bindir
-# inside the buildroot. The "--no-track" option prevents the creation of the
-# "$CARGO_HOME/.crates.toml" file, which is used to keep track of which version
-# of a specific binary has been installed, but which conflicts between builds
-# of different Rust applications and is not needed when building RPM packages.
-%cargo_install(t:naf:)\
-(\
-set -euo pipefail                                                   \
-  %{shrink:                                                         \
-    %{__cargo} install                                              \
-      %{__cargo_common_opts}                                        \
-      --profile rpm                                                 \
-      --no-track                                                    \
-      --path .                                                      \
-      %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}              \
-      %*                                                            \
-  }                                                                 \
-)
-
-# cargo_license: print license information for all crate dependencies
-#
-# The "no-build,no-dev,no-proc-macro" argument results in only crates which are
-# linked into the final binary to be considered.
-#
-# Additionally, deprecated SPDX syntax ("/" instead of "OR") is normalized
-# before sorting the results to ensure reproducible output of this macro.
-#
-# This macro must be called with the same feature flags as other cargo macros,
-# in particular, "cargo_build", otherwise its output will be incomplete.
-#
-# The "cargo tree" command called by this macro will fail if there are missing
-# (optional) dependencies.
-%cargo_license(naf:)\
-(\
-set -euo pipefail\
-%{shrink:                                                           \
-    %{__cargo} tree                                                 \
-    --workspace                                                     \
-    --offline                                                       \
-    --edges no-build,no-dev,no-proc-macro                           \
-    --no-dedupe                                                     \
-    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}                \
-    --prefix none                                                   \
-    --format "{l}: {p}"                                             \
-    | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "s:/: OR :g"   \
-    | sort -u                                                       \
-}\
-)
-
-# cargo_license_summary: print license summary for all crate dependencies
-#
-# This macro works in the same way as cargo_license, except that it only prints
-# a list of licenses, and not the complete license information for every crate
-# in the dependency tree. This is useful for determining the correct License
-# tag for packages that contain compiled Rust binaries.
-%cargo_license_summary(naf:)\
-(\
-set -euo pipefail\
-%{shrink:                                                           \
-    %{__cargo} tree                                                 \
-    --workspace                                                     \
-    --offline                                                       \
-    --edges no-build,no-dev,no-proc-macro                           \
-    --no-dedupe                                                     \
-    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}                \
-    --prefix none                                                   \
-    --format "# {l}"                                                \
-    | sed -e "s: / :/:g" -e "s:/: OR :g"                            \
-    | sort -u                                                       \
-}\
-)
-
-# cargo_vendor_manifest: write list of vendored crates and their versions
-#
-# The arguments for the internal "cargo tree" call emulate the logic
-# that determines which crates are included when running "cargo vendor".
-# The results are written to "cargo-vendor.txt".
-#
-# TODO: --all-features may be overly broad; this should be modified to
-# use %%__cargo_parse_opts to handle feature flags.
-%cargo_vendor_manifest()\
-(\
-set -euo pipefail\
-%{shrink:                                                           \
-    %{__cargo} tree                                                 \
-    --workspace                                                     \
-    --offline                                                       \
-    --edges normal,build                                            \
-    --no-dedupe                                                     \
-    --all-features                                                  \
-    --prefix none                                                   \
-    --format "{p}"                                                  \
-    | grep -v "$(pwd)"                                              \
-    | sed -e "s: (proc-macro)::"                                    \
-    | sort -u                                                       \
-    > cargo-vendor.txt                                              \
-}\
-)
+%cargo_test %__cargo test --release %{?_smp_mflags} --no-fail-fast
 
+%cargo_install %__cargo install --no-track --path .

plans/ci.fmf

@@ -1,6 +1,5 @@
 summary: CI Gating Plan
 discover:
     how: fmf
-    url: https://src.fedoraproject.org/tests/rust.git
 execute:
     how: tmt

rpminspect.yaml

@@ -6,22 +6,3 @@ debuginfo:
         # https://github.com/rust-lang/rust/issues/45854
         - /usr/lib/debug/usr/bin/rustc-*.i386.debug
 
-unicode:
-    ignore:
-        # These files are known to contain forbidden unicode chars as
-        # they are tests for those.
-        - rustc-*-src/tests/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
-        - rustc-*-src/tests/ui/parser/unicode-control-codepoints.rs
-        - rustc-*-src/tests/ui/parser/macro/unicode-control-codepoints-macros.rs
-        - rustc-*-src/tests/ui/parser/macro/auxiliary/unicode-control.rs
-        - rustc-*-src/compiler/rustc_lint/src/hidden_unicode_codepoints.rs
-        - rustc-*-src/compiler/rustc_lint_defs/src/builtin.rs
-        - rustc-*-src/vendor/idna/tests/IdnaTestV2.txt
-        - rustc-*-src/vendor/idna-*/tests/IdnaTestV2.txt
-        - rustc-*-src/vendor/mdbook*/tests/testsuite/search/reasonable_search_index/expected_index.js
-        - rustc-*-src/vendor/mdbook*/tests/testsuite/search/reasonable_search_index/src/first/unicode.md
-        - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-string?.wat
-        - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-block-comment?.wat
-        - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-line-comment?.wat
-        - rustc-*-src/src/llvm-project/clang-tools-extra/docs/clang-tidy/checks/misc/misleading-bidirectional.rst
-        - rustc-*-src/src/gcc/gcc/testsuite/c-c++-common/*Wbidi*.c

rustc-1.72.0-disable-http2.patch

@@ -0,0 +1,92 @@
+--- 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);
+             }

rustc-1.72.0-disable-libssh2.patch

@@ -0,0 +1,42 @@
+--- 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 @@
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -2022,20 +2021,6 @@
+ ]
+ 
+ [[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"
+ 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-1.92.0-disable-libssh2.patch

@@ -1,44 +0,0 @@
-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	2025-08-16 15:47:14.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-08-18 17:31:39.554771554 -0700
-@@ -2800,7 +2800,6 @@ checksum = "1c42fe03df2bd3c53a3a9c7317ad
- dependencies = [
-  "cc",
-  "libc",
-- "libssh2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -2847,20 +2846,6 @@ dependencies = [
-  "pkg-config",
-  "vcpkg",
- ]
--
--[[package]]
--name = "libssh2-sys"
--version = "0.3.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9"
--dependencies = [
-- "cc",
-- "libc",
-- "libz-sys",
-- "openssl-sys",
-- "pkg-config",
-- "vcpkg",
--]
- 
- [[package]]
- name = "libz-rs-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	2025-08-16 15:47:14.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-08-18 17:33:02.401743230 -0700
-@@ -46,7 +46,7 @@ curl = "0.4.48"
- curl-sys = "0.4.83"
- filetime = "0.2.26"
- flate2 = { version = "1.1.2", default-features = false, features = ["zlib-rs"] }
--git2 = "0.20.2"
-+git2 = { version = "0.20.2", default-features = false, features = ["https"] }
- git2-curl = "0.21.0"
- # When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail.
- gix = { version = "0.73.0", default-features = false, features = ["progress-tree", "parallel", "dirwalk", "status"] }

rustc-1.92.0-unbundle-sqlite.patch

@@ -1,23 +0,0 @@
-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	2025-11-07 13:31:19.003737886 +0100
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-11-07 13:14:41.637982893 +0100
-@@ -2835,7 +2835,6 @@ version = "0.35.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f"
- 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	2025-11-07 13:31:28.338643618 +0100
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-11-07 13:15:00.266505214 +0100
-@@ -81,7 +81,7 @@ proptest = "1.8.0"
- pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] }
- rand = "0.9.2"
- regex = "1.11.3"
--rusqlite = { version = "0.37.0", features = ["bundled"] }
-+rusqlite = { version = "0.37.0", features = [] }
- rustc-hash = "2.1.1"
- rustc-stable-hash = "0.1.2"
- rustfix = { version = "0.9.2", path = "crates/rustfix" }

sources

@@ -1,2 +1,2 @@
-SHA512 (rustc-1.92.0-src.tar.xz) = a2c0b127933595b9bc2063d7b7c88d9af512c4664b18f29d44c9a6e2c68d194b87a3071717e8f1b7c858ae940baca888e10be95cd31e0201916d0bfc312a3b15
-SHA512 (wasi-libc-wasi-sdk-27.tar.gz) = dfc2c36fabf32f465fc833ed0b10efffc9a35c68162ecc3e8d656d1d684d170b734d55e790614d12d925d17f49d60f0d2d01c46cecac941cf62d68eda84df13e
+SHA512 (rustc-1.72.1-src.tar.xz) = 08232b5bf36f82a995d67f3d03d5e35b7d8914d31fb4491d4c37b72a830bc438e9d18d9e138d398b1b6ae4aa09f7f8e1e9b68da6273ab74bdae4c6123586a21b
+SHA512 (wasi-libc-7018e24d8fe248596819d2e884761676f3542a04.tar.gz) = a2a4a952c3d9795792be8f055387057befaebe0675ad2464a478cb1f2c45d65f233e0ee4c4dbcaa137bf9649882ff6c6acf2f2bec07b2ad89f63ff980d972e6b

tests/Sanity/basic-smoke/Makefile

@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/rust/Sanity/basic-smoke
+#   Description: basic-smoke
+#   Author: Martin Cermak <mcermak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2017 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/rust/Sanity/basic-smoke
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Martin Cermak <mcermak@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     basic-smoke" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        10m" >> $(METADATA)
+	@echo "RunFor:          rust" >> $(METADATA)
+	@echo "Requires:        rust" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/Sanity/basic-smoke/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /tools/rust/Sanity/basic-smoke
+Description: basic-smoke
+Author: Martin Cermak <mcermak@redhat.com>

tests/Sanity/basic-smoke/main.fmf

@@ -0,0 +1,13 @@
+summary: basic-smoke
+description: ''
+contact:
+  - Jesus Checa Hidalgo <jcheca@redhat.com>
+component:
+  - rust
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - rust
+duration: 10m
+extra-summary: /tools/rust/Sanity/basic-smoke
+extra-task: /tools/rust/Sanity/basic-smoke

tests/Sanity/basic-smoke/runtest.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/rust/Sanity/basic-smoke
+#   Description: basic-smoke
+#   Author: Martin Cermak <mcermak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2017 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="$(rpm -qf $(which rustc))"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        HELLO_SRC=$( mktemp )
+        HELLO_BIN=$( mktemp )
+        echo 'fn main() { println!("hello"); }' > $HELLO_SRC
+        rlRun "which rustc"
+        rlRun "rustc -V"
+        rlRun "rustc -o $HELLO_BIN $HELLO_SRC"
+        rlRun "$HELLO_BIN"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd

tests/Sanity/build-stratisd/Makefile

@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/rust/Sanity/build-stratisd
+#   Description: rpmbuild stratisd
+#   Author: Edjunior Machado <emachado@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/rust/Sanity/build-stratisd
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Edjunior Machado <emachado@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     rpmbuild stratisd" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        1h" >> $(METADATA)
+	@echo "RunFor:          rust" >> $(METADATA)
+	@echo "Requires:        rust rpm-build yum-utils stratisd" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        RHEL8 RHEL9" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/Sanity/build-stratisd/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /tools/rust/Sanity/build-stratisd
+Description: rpmbuild stratisd
+Author: Edjunior Machado <emachado@redhat.com>

tests/Sanity/build-stratisd/main.fmf

@@ -0,0 +1,17 @@
+summary: rpmbuild stratisd
+description:
+  - 'Ensure that rust does not break stratisd rpmbuild'
+contact:
+  - Jesus Checa Hidalgo <jcheca@redhat.com>
+component:
+  - rust
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - rust
+  - rpm-build
+  - yum-utils
+  - stratisd
+duration: 1h
+extra-summary: /tools/rust/Sanity/build-stratisd
+extra-task: /tools/rust/Sanity/build-stratisd

tests/Sanity/build-stratisd/runtest.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/rust/Sanity/build-stratisd
+#   Description: rpmbuild stratisd
+#   Author: Edjunior Machado <emachado@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="$(rpm -qf $(which rustc))"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE || rlDie "rustc not found. Aborting testcase..."
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    PKG_TO_BUILD=stratisd
+    rlPhaseStart FAIL ${PKG_TO_BUILD}FetchSrcAndInstallBuildDeps
+        if ! rlCheckRpm $PKG_TO_BUILD; then
+            rlRun "yum install -y $PKG_TO_BUILD"
+            rlAssertRpm $PKG_TO_BUILD
+        fi
+        rlFetchSrcForInstalled $PKG_TO_BUILD
+        rlRun SRPM=$(ls -1 ${PKG_TO_BUILD}*src.rpm)
+        rlRun "rpm -ivh $SRPM"
+        rlRun SPECDIR="$(rpm -E '%{_specdir}')"
+
+        rlRun "yum-builddep -y ${SRPM}"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        set -o pipefail
+        rlRun "rpmbuild -bb ${SPECDIR}/${PKG_TO_BUILD}.spec |& tee ${SRPM}_rpmbuild.log"
+        rlFileSubmit "${SRPM}_rpmbuild.log"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd

tests/Sanity/rpmbuild-librsvg2/Makefile

@@ -0,0 +1,65 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/rust/Sanity/rpmbuild-librsvg2
+#   Description: rpmbuild librsvg2
+#   Author: Edjunior Machado <emachado@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/rust/Sanity/rpmbuild-librsvg2
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Edjunior Machado <emachado@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     rpmbuild librsvg2" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        1h" >> $(METADATA)
+	@echo "RunFor:          rust" >> $(METADATA)
+	# Due to bz1980717 librsvg2 requires git to build the srpm, but it's missing
+	# from the BuildRequires
+	@echo "Requires:        rust rpm-build yum-utils librsvg2 git" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        RHEL8 RHEL9" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/Sanity/rpmbuild-librsvg2/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /tools/rust/Sanity/rpmbuild-librsvg2
+Description: rpmbuild librsvg2
+Author: Edjunior Machado <emachado@redhat.com>

tests/Sanity/rpmbuild-librsvg2/main.fmf

@@ -0,0 +1,18 @@
+summary: rpmbuild librsvg2
+description:
+  - 'Ensure that rust does not break librsvg2 rpmbuild'
+contact:
+  - Jesus Checa Hidalgo <jcheca@redhat.com>
+component:
+  - rust
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - rust
+  - rpm-build
+  - yum-utils
+  - librsvg2
+  - git
+duration: 1h
+extra-summary: /tools/rust/Sanity/rpmbuild-librsvg2
+extra-task: /tools/rust/Sanity/rpmbuild-librsvg2

tests/Sanity/rpmbuild-librsvg2/runtest.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/rust/Sanity/rpmbuild-librsvg2
+#   Description: rpmbuild librsvg2
+#   Author: Edjunior Machado <emachado@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="$(rpm -qf $(which rustc))"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE || rlDie "rustc not found. Aborting testcase..."
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    PKG_TO_BUILD=librsvg2
+    rlPhaseStart FAIL ${PKG_TO_BUILD}FetchSrcAndInstallBuildDeps
+        if ! rlCheckRpm $PKG_TO_BUILD; then
+            rlRun "yum install -y $PKG_TO_BUILD ${YUM_SWITCHES}"
+            rlAssertRpm $PKG_TO_BUILD
+        fi
+        rlFetchSrcForInstalled $PKG_TO_BUILD
+        rlRun SRPM=$(ls -1 ${PKG_TO_BUILD}*src.rpm)
+        rlRun "rpm -ivh $SRPM"
+        rlRun SPECDIR="$(rpm -E '%{_specdir}')"
+
+        # librsvg2 contains dynamic dependencies. builddep needs to be run
+        # from the srpm (not the spec file) to be able to generate them:
+        # https://fedoraproject.org/wiki/Changes/DynamicBuildRequires#rpmbuild
+        rlRun "yum-builddep -y ${SRPM} ${YUM_SWITCHES}"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        set -o pipefail
+        rlRun "rpmbuild -bb ${SPECDIR}/${PKG_TO_BUILD}.spec |& tee ${SRPM}_rpmbuild.log"
+        rlFileSubmit "${SRPM}_rpmbuild.log"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd

tests/Sanity/rust-wasm-smoke-test/Makefile

@@ -0,0 +1,64 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/rust/Sanity/rust-wasm-smoke-test
+#   Description: Test that the rust wasm target is enabled and can compile correctly
+#   Author: Jesus Checa <jcheca@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2021 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/rust/Sanity/rust-wasm-smoke-test
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE lib.rs test.js
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Jesus Checa <jcheca@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Test that the rust wasm target is enabled and can compile correctly" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          rust" >> $(METADATA)
+	@echo "Requires:        rust rust-std-static-wasm32-unknown-unknown nodejs" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5 -RHEL7" >> $(METADATA)
+	@echo "Architectures:   aarch64 ppc64le x86_64" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/Sanity/rust-wasm-smoke-test/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /tools/rust/Sanity/rust-wasm-smoke-test
+Description: Test that the rust wasm target is enabled and can compile correctly
+Author: Jesus Checa <jcheca@redhat.com>

tests/Sanity/rust-wasm-smoke-test/lib.rs

@@ -0,0 +1,12 @@
+#[no_mangle]
+pub fn fib(index: u32) -> u32 {
+    let mut nminus2;
+    let mut nminus1 = 1;
+    let mut n = 0;
+    for _ in 0..index {
+        nminus2 = nminus1;
+        nminus1 = n;
+        n = nminus2 + nminus1;
+    }
+    n
+}

tests/Sanity/rust-wasm-smoke-test/main.fmf

@@ -0,0 +1,15 @@
+summary: Test that the rust wasm target is enabled and can compile correctly
+description: ''
+contact:
+  - Jesus Checa <jcheca@redhat.com>
+component:
+  - rust
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - rust
+  - rust-std-static-wasm32-unknown-unknown
+  - nodejs
+duration: 5m
+extra-summary: /tools/rust/Sanity/rust-wasm-smoke-test
+extra-task: /tools/rust/Sanity/rust-wasm-smoke-test

tests/Sanity/rust-wasm-smoke-test/runtest.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/rust/Sanity/rust-wasm-smoke-test
+#   Description: Test that the rust wasm target is enabled and can compile correctly
+#   Author: Jesus Checa <jcheca@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2021 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGES="$(rpm -qf $(which rustc)) rust-std-static-wasm32-unknown-unknown"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm --all
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "cp lib.rs $TmpDir"
+        rlRun "cp test.js $TmpDir"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun "rustc --target wasm32-unknown-unknown --crate-type=cdylib lib.rs -o fib.wasm" 0 "Building WASM binary"
+        rlRun "node test.js" 0 "Testing WASM binary"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
+

tests/Sanity/rust-wasm-smoke-test/test.js

@@ -0,0 +1,28 @@
+function js_fibonacci(index) {
+    let nminus2 = 0;
+    let nminus1 = 1;
+    let n = 0;
+    for(let i = 0; i < index; ++i) {
+        nminus2 = nminus1;
+        nminus1 = n;
+        n = nminus1 + nminus2;
+    }
+    return n;
+}
+
+const fs = require('fs');
+const buf = fs.readFileSync('./fib.wasm');
+const lib = WebAssembly.instantiate(new Uint8Array(buf)).
+    then(res => {
+        var fib = res.instance.exports.fib;
+        for (var i=1; i<=10; i++) {
+            if(fib(i) != js_fibonacci(i)){
+                console.log("Mismatch between wasm and JS functions");
+                process.exit(1);
+            }
+        }
+    }).catch(e => {
+        console.log(e);
+        process.exit(1);
+    }
+);