.gitignore

@@ -407,16 +407,3 @@
 /rustc-1.64.0-src.tar.xz
 /rustc-1.65.0-src.tar.xz
 /wasi-libc-wasi-sdk-16.tar.gz
-/rustc-1.66.0-src.tar.xz
-/wasi-libc-wasi-sdk-17.tar.gz
-/rustc-1.66.1-src.tar.xz
-/rustc-1.67.0-src.tar.xz
-/rustc-1.67.1-src.tar.xz
-/rustc-1.68.0-src.tar.xz
-/wasi-libc-wasi-sdk-19.tar.gz
-/rustc-1.68.1-src.tar.xz
-/rustc-1.68.2-src.tar.xz
-/rustc-1.69.0-src.tar.xz
-/wasi-libc-1dfe5c302d1c5ab621f7abf04620fae92700fd22.tar.gz
-/rustc-1.70.0-src.tar.xz
-/wasi-libc-wasi-sdk-20.tar.gz

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

@@ -1,4 +1,4 @@
-From 37cb177eb53145103ae72b67562884782dde01c3 Mon Sep 17 00:00:00 2001
+From b521511174b1a08dddfac243604d649b71cc7386 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
@@ -8,19 +8,19 @@ Subject: [PATCH] Use lld provided by system for wasm
  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
+index de7b7374af31..eebbe616e9b6 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 {
+@@ -99,8 +99,7 @@ pub fn options() -> TargetOptions {
          // 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),
+         lld_flavor: LldFlavor::Wasm,
+         linker_is_gnu: false,
  
-         pre_link_args,
 -- 
-2.38.1
+2.35.1
 

0001-compiletest-set-the-dylib-path-when-gathering-target.patch

@@ -0,0 +1,182 @@
+From 92b0b20e4119241aaeabb4b91189a9fca8ff8b5d Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Fri, 14 Oct 2022 16:11:28 -0700
+Subject: [PATCH] compiletest: set the dylib path when gathering target cfg
+
+If the compiler is built with `rpath = false`, then it won't find its
+own libraries unless the library search path is set. We already do that
+while running the actual compiletests, but #100260 added another rustc
+command for getting the target cfg.
+
+    Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
+    thread 'main' panicked at 'error: failed to get cfg info from "[...]/build/x86_64-unknown-linux-gnu/stage1/bin/rustc"
+    --- stdout
+
+    --- stderr
+    [...]/build/x86_64-unknown-linux-gnu/stage1/bin/rustc: error while loading shared libraries: librustc_driver-a2a76dc626cd02d2.so: cannot open shared object file: No such file or directory
+    ', src/tools/compiletest/src/common.rs:476:13
+
+Now the library path is set here as well, so it works without rpath.
+
+(cherry picked from commit 97c3608326d123f5462e3504409a3a069611c0fb)
+---
+ src/tools/compiletest/src/common.rs  | 17 ++++++++++-------
+ src/tools/compiletest/src/runtest.rs | 27 +++------------------------
+ src/tools/compiletest/src/util.rs    | 23 +++++++++++++++++++++++
+ 3 files changed, 36 insertions(+), 31 deletions(-)
+
+diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
+index 64df76e27720..53b64e7d1fc3 100644
+--- a/src/tools/compiletest/src/common.rs
++++ b/src/tools/compiletest/src/common.rs
+@@ -2,11 +2,12 @@
+ 
+ use std::ffi::OsString;
+ use std::fmt;
++use std::iter;
+ use std::path::{Path, PathBuf};
+ use std::process::Command;
+ use std::str::FromStr;
+ 
+-use crate::util::PathBufExt;
++use crate::util::{add_dylib_path, PathBufExt};
+ use lazycell::LazyCell;
+ use test::ColorConfig;
+ 
+@@ -389,7 +390,7 @@ pub fn run_enabled(&self) -> bool {
+     }
+ 
+     fn target_cfg(&self) -> &TargetCfg {
+-        self.target_cfg.borrow_with(|| TargetCfg::new(&self.rustc_path, &self.target))
++        self.target_cfg.borrow_with(|| TargetCfg::new(self))
+     }
+ 
+     pub fn matches_arch(&self, arch: &str) -> bool {
+@@ -455,20 +456,22 @@ pub enum Endian {
+ }
+ 
+ impl TargetCfg {
+-    fn new(rustc_path: &Path, target: &str) -> TargetCfg {
+-        let output = match Command::new(rustc_path)
++    fn new(config: &Config) -> TargetCfg {
++        let mut command = Command::new(&config.rustc_path);
++        add_dylib_path(&mut command, iter::once(&config.compile_lib_path));
++        let output = match command
+             .arg("--print=cfg")
+             .arg("--target")
+-            .arg(target)
++            .arg(&config.target)
+             .output()
+         {
+             Ok(output) => output,
+-            Err(e) => panic!("error: failed to get cfg info from {:?}: {e}", rustc_path),
++            Err(e) => panic!("error: failed to get cfg info from {:?}: {e}", config.rustc_path),
+         };
+         if !output.status.success() {
+             panic!(
+                 "error: failed to get cfg info from {:?}\n--- stdout\n{}\n--- stderr\n{}",
+-                rustc_path,
++                config.rustc_path,
+                 String::from_utf8(output.stdout).unwrap(),
+                 String::from_utf8(output.stderr).unwrap(),
+             );
+diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
+index 8f289876f730..eb467170249d 100644
+--- a/src/tools/compiletest/src/runtest.rs
++++ b/src/tools/compiletest/src/runtest.rs
+@@ -13,7 +13,7 @@
+ use crate::header::TestProps;
+ use crate::json;
+ use crate::read2::read2_abbreviated;
+-use crate::util::{logv, PathBufExt};
++use crate::util::{add_dylib_path, dylib_env_var, logv, PathBufExt};
+ use crate::ColorConfig;
+ use regex::{Captures, Regex};
+ use rustfix::{apply_suggestions, get_suggestions_from_json, Filter};
+@@ -26,6 +26,7 @@
+ use std::hash::{Hash, Hasher};
+ use std::io::prelude::*;
+ use std::io::{self, BufReader};
++use std::iter;
+ use std::path::{Path, PathBuf};
+ use std::process::{Child, Command, ExitStatus, Output, Stdio};
+ use std::str;
+@@ -72,19 +73,6 @@ fn disable_error_reporting<F: FnOnce() -> R, R>(f: F) -> R {
+     f()
+ }
+ 
+-/// The name of the environment variable that holds dynamic library locations.
+-pub fn dylib_env_var() -> &'static str {
+-    if cfg!(windows) {
+-        "PATH"
+-    } else if cfg!(target_os = "macos") {
+-        "DYLD_LIBRARY_PATH"
+-    } else if cfg!(target_os = "haiku") {
+-        "LIBRARY_PATH"
+-    } else {
+-        "LD_LIBRARY_PATH"
+-    }
+-}
+-
+ /// The platform-specific library name
+ pub fn get_lib_name(lib: &str, dylib: bool) -> String {
+     // In some casess (e.g. MUSL), we build a static
+@@ -1826,16 +1814,7 @@ fn compose_and_run(
+ 
+         // Need to be sure to put both the lib_path and the aux path in the dylib
+         // search path for the child.
+-        let mut path =
+-            env::split_paths(&env::var_os(dylib_env_var()).unwrap_or_default()).collect::<Vec<_>>();
+-        if let Some(p) = aux_path {
+-            path.insert(0, PathBuf::from(p))
+-        }
+-        path.insert(0, PathBuf::from(lib_path));
+-
+-        // Add the new dylib search path var
+-        let newpath = env::join_paths(&path).unwrap();
+-        command.env(dylib_env_var(), newpath);
++        add_dylib_path(&mut command, iter::once(lib_path).chain(aux_path));
+ 
+         let mut child = disable_error_reporting(|| command.spawn())
+             .unwrap_or_else(|_| panic!("failed to exec `{:?}`", &command));
+diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs
+index 9d047b63c859..4b73be0fbb90 100644
+--- a/src/tools/compiletest/src/util.rs
++++ b/src/tools/compiletest/src/util.rs
+@@ -2,6 +2,7 @@
+ use std::env;
+ use std::ffi::OsStr;
+ use std::path::PathBuf;
++use std::process::Command;
+ 
+ use tracing::*;
+ 
+@@ -105,3 +106,25 @@ fn with_extra_extension<S: AsRef<OsStr>>(&self, extension: S) -> PathBuf {
+         }
+     }
+ }
++
++/// The name of the environment variable that holds dynamic library locations.
++pub fn dylib_env_var() -> &'static str {
++    if cfg!(windows) {
++        "PATH"
++    } else if cfg!(target_os = "macos") {
++        "DYLD_LIBRARY_PATH"
++    } else if cfg!(target_os = "haiku") {
++        "LIBRARY_PATH"
++    } else {
++        "LD_LIBRARY_PATH"
++    }
++}
++
++/// Adds a list of lookup paths to `cmd`'s dynamic library lookup path.
++/// If the dylib_path_var is already set for this cmd, the old value will be overwritten!
++pub fn add_dylib_path(cmd: &mut Command, paths: impl Iterator<Item = impl Into<PathBuf>>) {
++    let path_env = env::var_os(dylib_env_var());
++    let old_paths = path_env.as_ref().map(env::split_paths);
++    let new_paths = paths.map(Into::into).chain(old_paths.into_iter().flatten());
++    cmd.env(dylib_env_var(), env::join_paths(new_paths).unwrap());
++}
+-- 
+2.37.3
+

0001-rustc_transmute-fix-big-endian-discriminants.patch

@@ -0,0 +1,52 @@
+From a72666ed56ec5f1b6d254c7020cf86143edc6dbd Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Tue, 20 Sep 2022 13:03:43 -0700
+Subject: [PATCH] rustc_transmute: fix big-endian discriminants
+
+---
+ compiler/rustc_transmute/src/layout/tree.rs | 22 +++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/compiler/rustc_transmute/src/layout/tree.rs b/compiler/rustc_transmute/src/layout/tree.rs
+index 211c813b8001..acd4fa63d782 100644
+--- a/compiler/rustc_transmute/src/layout/tree.rs
++++ b/compiler/rustc_transmute/src/layout/tree.rs
+@@ -404,7 +404,7 @@ fn from_repr_c_variant(
+                 .unwrap();
+                 trace!(?discr_layout, "computed discriminant layout");
+                 variant_layout = variant_layout.extend(discr_layout).unwrap().0;
+-                tree = tree.then(Self::from_disr(discr, tcx, layout_summary.discriminant_size));
++                tree = tree.then(Self::from_discr(discr, tcx, layout_summary.discriminant_size));
+             }
+ 
+             // Next come fields.
+@@ -444,11 +444,21 @@ fn from_repr_c_variant(
+             Ok(tree)
+         }
+ 
+-        pub fn from_disr(discr: Discr<'tcx>, tcx: TyCtxt<'tcx>, size: usize) -> Self {
+-            // FIXME(@jswrenn): I'm certain this is missing needed endian nuance.
+-            let bytes = discr.val.to_ne_bytes();
+-            let bytes = &bytes[..size];
+-            Self::Seq(bytes.into_iter().copied().map(|b| Self::from_bits(b)).collect())
++        pub fn from_discr(discr: Discr<'tcx>, tcx: TyCtxt<'tcx>, size: usize) -> Self {
++            use rustc_target::abi::Endian;
++
++            let bytes: [u8; 16];
++            let bytes = match tcx.data_layout.endian {
++                Endian::Little => {
++                    bytes = discr.val.to_le_bytes();
++                    &bytes[..size]
++                }
++                Endian::Big => {
++                    bytes = discr.val.to_be_bytes();
++                    &bytes[bytes.len() - size..]
++                }
++            };
++            Self::Seq(bytes.iter().map(|&b| Self::from_bits(b)).collect())
+         }
+     }
+ 
+-- 
+2.37.3
+

plans/ci.fmf

@@ -1,5 +1,6 @@
 summary: CI Gating Plan
 discover:
     how: fmf
+    directory: tests
 execute:
-    how: tmt
+    how: beakerlib

rpminspect.yaml

@@ -1,8 +0,0 @@
----
-debuginfo:
-    ignore:
-        # i686 has limited debuginfo. From rust.spec
-        # full debuginfo is exhausting memory; just do libstd for now
-        # https://github.com/rust-lang/rust/issues/45854
-        - /usr/lib/debug/usr/bin/rustc-*.i386.debug
-

rust.spec

@@ -1,6 +1,6 @@
-# Only x86_64, i686, and aarch64 are Tier 1 platforms at this time.
+# Only x86_64 and i686 are Tier 1 platforms at this time.
 # https://doc.rust-lang.org/nightly/rustc/platform-support.html
-%global rust_arches x86_64 i686 armv7hl aarch64 ppc64le s390x riscv64
+%global rust_arches x86_64 i686 armv7hl aarch64 ppc64le s390x
 
 # The channel can be stable, beta, or nightly
 %{!?channel: %global channel stable}
@@ -8,9 +8,9 @@
 # To bootstrap from scratch, set the channel and date from src/stage0.json
 # e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_version 1.69.0
-%global bootstrap_channel 1.69.0
-%global bootstrap_date 2023-04-20
+%global bootstrap_version 1.64.0
+%global bootstrap_channel 1.64.0
+%global bootstrap_date 2022-09-22
 
 # Only the specified arches will use bootstrap binaries.
 # NOTE: Those binaries used to be uploaded with every new release, but that was
@@ -35,7 +35,7 @@
 # src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh
 # (updated per https://github.com/rust-lang/rust/pull/96907)
 %global wasi_libc_url https://github.com/WebAssembly/wasi-libc
-%global wasi_libc_ref wasi-sdk-20
+%global wasi_libc_ref wasi-sdk-16
 %global wasi_libc_name wasi-libc-%{wasi_libc_ref}
 %global wasi_libc_source %{wasi_libc_url}/archive/%{wasi_libc_ref}/%{wasi_libc_name}.tar.gz
 %global wasi_libc_dir %{_builddir}/%{wasi_libc_name}
@@ -44,17 +44,17 @@
 %bcond_with llvm_static
 
 # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
-# is insufficient.  Rust currently requires LLVM 14.0+.
-%global min_llvm_version 14.0.0
-%global bundled_llvm_version 16.0.2
+# is insufficient.  Rust currently requires LLVM 12.0+.
+%global min_llvm_version 13.0.0
+%global bundled_llvm_version 15.0.0
 %bcond_with bundled_llvm
 
-# Requires stable libgit2 1.6, and not the next minor soname change.
+# Requires stable libgit2 1.5, and not the next minor soname change.
 # This needs to be consistent with the bindings in vendor/libgit2-sys.
-%global min_libgit2_version 1.6.0
-%global next_libgit2_version 1.7.0~
-%global bundled_libgit2_version 1.6.3
-%if 0%{?fedora} >= 38
+%global min_libgit2_version 1.5.0
+%global next_libgit2_version 1.6.0~
+%global bundled_libgit2_version 1.5.0
+%if 0%{?fedora} >= 99
 %bcond_with bundled_libgit2
 %else
 %bcond_without bundled_libgit2
@@ -83,7 +83,7 @@
 %endif
 
 Name:           rust
-Version:        1.70.0
+Version:        1.65.0
 Release:        1%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
@@ -104,7 +104,13 @@ Source1:        %{wasi_libc_source}
 Patch1:         0001-Use-lld-provided-by-system-for-wasm.patch
 
 # Set a substitute-path in rust-gdb for standard library sources.
-Patch2:         rustc-1.70.0-rust-gdb-substitute-path.patch
+Patch2:         rustc-1.61.0-rust-gdb-substitute-path.patch
+
+# https://github.com/rust-lang/rust/pull/102076
+Patch3:         0001-rustc_transmute-fix-big-endian-discriminants.patch
+
+# https://github.com/rust-lang/rust/pull/103072
+Patch4:         0001-compiletest-set-the-dylib-path-when-gathering-target.patch
 
 ### RHEL-specific patches below ###
 
@@ -112,11 +118,16 @@ Patch2:         rustc-1.70.0-rust-gdb-substitute-path.patch
 Source100:      macros.rust-toolset
 
 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
-Patch100:       rustc-1.70.0-disable-libssh2.patch
+Patch100:       rustc-1.65.0-disable-libssh2.patch
 
 # libcurl on RHEL7 doesn't have http2, but since cargo requests it, curl-sys
 # will try to build it statically -- instead we turn off the feature.
-Patch101:       rustc-1.70.0-disable-http2.patch
+Patch101:       rustc-1.65.0-disable-http2.patch
+
+# kernel rh1410097 causes too-small stacks for PIE.
+# (affects RHEL6 kernels when building for RHEL7)
+Patch102:       rustc-1.65.0-no-default-pie.patch
+
 
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
@@ -134,14 +145,7 @@ Patch101:       rustc-1.70.0-disable-http2.patch
   return arch.."-unknown-linux-"..abi
 end}
 
-# Get the environment form of a Rust triple
-%{lua: function rust_triple_env(triple)
-  local sub = string.gsub(triple, "-", "_")
-  return string.upper(sub)
-end}
-
 %global rust_triple %{lua: print(rust_triple(rpm.expand("%{_target_cpu}")))}
-%global rust_triple_env %{lua: print(rust_triple_env(rpm.expand("%{rust_triple}")))}
 
 %if %defined bootstrap_arches
 # For each bootstrap arch, add an additional binary Source.
@@ -217,7 +221,7 @@ Provides:       bundled(llvm) = %{bundled_llvm_version}
 %else
 BuildRequires:  cmake >= 2.8.11
 %if 0%{?epel} == 7
-%global llvm llvm14
+%global llvm llvm13
 %endif
 %if %defined llvm
 %global llvm_root %{_libdir}/%{llvm}
@@ -254,7 +258,7 @@ Requires:       %{name}-std-static%{?_isa} = %{version}-%{release}
 Requires:       /usr/bin/cc
 
 %if 0%{?epel} == 7
-%global devtoolset_name devtoolset-11
+%global devtoolset_name devtoolset-9
 BuildRequires:  %{devtoolset_name}-binutils
 BuildRequires:  %{devtoolset_name}-gcc
 BuildRequires:  %{devtoolset_name}-gcc-c++
@@ -319,10 +323,6 @@ find '%{buildroot}%{rustlibdir}'/wasm*/lib -type f -regex '.*\\.\\(a\\|rlib\\)'
 %{nil}
 %endif
 
-# This component was removed as of Rust 1.69.0.
-# https://github.com/rust-lang/rust/pull/101841
-Obsoletes:      %{name}-analysis < 1.69.0~
-
 %description
 Rust is a systems programming language that runs blazingly fast, prevents
 segfaults, and guarantees thread safety.
@@ -332,9 +332,8 @@ This package includes the Rust compiler and documentation generator.
 
 %package std-static
 Summary:        Standard library for Rust
-Provides:       %{name}-std-static-%{rust_triple} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
-Requires:       glibc-devel%{?_isa} >= 2.17
+Requires:       glibc-devel%{?_isa} >= 2.11
 
 %description std-static
 This package includes the standard libraries for building applications
@@ -529,7 +528,7 @@ BuildArch:      noarch
 %if 0%{?rhel} && 0%{?rhel} < 8
 Requires:       %{name}-std-static = %{version}-%{release}
 %else
-Recommends:     %{name}-std-static = %{version}-%{release}
+Supplements:    %{name}-std-static = %{version}-%{release}
 %endif
 
 %description src
@@ -537,13 +536,26 @@ This package includes source files for the Rust standard library.  It may be
 useful as a reference for code completion tools in various editors.
 
 
-%if 0%{?rhel}
+%package analysis
+Summary:        Compiler analysis data for the Rust standard library
+%if 0%{?rhel} && 0%{?rhel} < 8
+Requires:       %{name}-std-static%{?_isa} = %{version}-%{release}
+%else
+Supplements:    %{name}-std-static%{?_isa} = %{version}-%{release}
+%endif
+
+%description analysis
+This package contains analysis data files produced with rustc's -Zsave-analysis
+feature for the Rust standard library. The RLS (Rust Language Server) uses this
+data to provide information about the Rust standard library.
+
+
+%if 0%{?rhel} && 0%{?rhel} >= 8
 
 %package toolset
 Summary:        Rust Toolset
-BuildArch:      noarch
-Requires:       rust = %{version}-%{release}
-Requires:       cargo = %{version}-%{release}
+Requires:       rust%{?_isa} = %{version}-%{release}
+Requires:       cargo%{?_isa} = %{version}-%{release}
 
 %description toolset
 This is the metapackage for Rust Toolset, bringing in the Rust compiler,
@@ -572,16 +584,22 @@ test -f '%{local_rust_root}/bin/rustc'
 
 %setup -q -n %{rustc_package}
 
-%patch -P1 -p1
-%patch -P2 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %if %with disabled_libssh2
-%patch -P100 -p1
+%patch100 -p1
 %endif
 
 %if %without curl_http2
-%patch -P101 -p1
-rm -rf vendor/libnghttp2-sys*/
+%patch101 -p1
+rm -rf vendor/libnghttp2-sys/
+%endif
+
+%if 0%{?rhel} && 0%{?rhel} < 8
+%patch102 -p1
 %endif
 
 # Use our explicit python3 first
@@ -596,21 +614,21 @@ mkdir -p src/llvm-project/libunwind/
 %endif
 
 # Remove other unused vendored libraries
-rm -rf vendor/curl-sys*/curl/
+rm -rf vendor/curl-sys/curl/
 rm -rf vendor/*jemalloc-sys*/jemalloc/
-rm -rf vendor/libffi-sys*/libffi/
-rm -rf vendor/libmimalloc-sys*/c_src/mimalloc/
-rm -rf vendor/libssh2-sys*/libssh2/
-rm -rf vendor/libz-sys*/src/zlib{,-ng}/
-rm -rf vendor/lzma-sys*/xz-*/
-rm -rf vendor/openssl-src*/openssl/
+rm -rf vendor/libmimalloc-sys/c_src/mimalloc/
+rm -rf vendor/libssh2-sys/libssh2/
+rm -rf vendor/libz-sys/src/zlib/
+rm -rf vendor/libz-sys/src/zlib-ng/
+rm -rf vendor/lzma-sys/xz-*/
+rm -rf vendor/openssl-src/openssl/
 
 %if %without bundled_libgit2
-rm -rf vendor/libgit2-sys*/libgit2/
+rm -rf vendor/libgit2-sys/libgit2/
 %endif
 
 %if %with disabled_libssh2
-rm -rf vendor/libssh2-sys*/
+rm -rf vendor/libssh2-sys/
 %endif
 
 # This only affects the transient rust-installer, but let it use our dynamic xz-libs
@@ -639,32 +657,9 @@ find vendor -name .cargo-checksum.json \
 # it's a shebang and make them executable. Then brp-mangle-shebangs gets upset...
 find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
 
-# The distro flags are only appropriate for the host, not our cross-targets,
-# and they're not as fine-grained as the settings we choose for std vs rustc.
-%if %defined build_rustflags
-%global build_rustflags %{nil}
-%endif
-
-# These are similar to __cflags_arch_* in /usr/lib/rpm/redhat/macros
-%if 0%{?fedora} || 0%{?rhel} >= 9
-%ifarch x86_64
-%global rust_target_cpu %[0%{?rhel} >= 10 ? "x86-64-v3" : ""]
-%global rust_target_cpu %[0%{?rhel} == 9 ? "x86-64-v2" : "%{rust_target_cpu}"]
-%endif
-%ifarch s390x
-%global rust_target_cpu %[0%{?rhel} >= 9 ? "z14" : "zEC12"]
-%endif
-%ifarch ppc64le
-%global rust_target_cpu %[0%{?rhel} >= 9 ? "pwr9" : "pwr8"]
-%endif
-%endif
-
 # Set up shared environment variables for build/install/check
 %global rust_env %{?rustflags:RUSTFLAGS="%{rustflags}"}
-%if "%{?rust_target_cpu}" != ""
-%global rust_env %{?rust_env} CARGO_TARGET_%{rust_triple_env}_RUSTFLAGS=-Ctarget-cpu=%{rust_target_cpu}
-%endif
-%if %defined cmake_path
+%if 0%{?cmake_path:1}
 %global rust_env %{?rust_env} PATH="%{cmake_path}:$PATH"
 %endif
 %if %without disabled_libssh2
@@ -673,6 +668,7 @@ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
 %endif
 %global export_rust_env %{?rust_env:export %{rust_env}}
 
+
 %build
 %{export_rust_env}
 
@@ -758,7 +754,7 @@ end}
   --set build.install-stage=2 \
   --set build.test-stage=2 \
   --enable-extended \
-  --tools=cargo,clippy,rls,rust-analyzer,rustfmt,src \
+  --tools=analysis,cargo,clippy,rls,rust-analyzer,rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
   --dist-compression-formats=gz \
@@ -773,9 +769,6 @@ for triple in %{?mingw_targets} %{?wasm_targets}; do
 done
 
 %install
-%if 0%{?rhel} && 0%{?rhel} <= 9
-%{?set_build_flags}
-%endif
 %{export_rust_env}
 
 DESTDIR=%{buildroot} %{__python3} ./x.py install
@@ -856,16 +849,13 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*
 # We don't want Rust copies of LLVM tools (rust-lld, rust-llvm-dwp)
 rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll*
 
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} >= 8
 # This allows users to build packages using Rust Toolset.
 %{__install} -D -m 644 %{S:100} %{buildroot}%{rpmmacrodir}/macros.rust-toolset
 %endif
 
 
 %check
-%if 0%{?rhel} && 0%{?rhel} <= 9
-%{?set_build_flags}
-%endif
 %{export_rust_env}
 
 # Sanity-check the installed binaries, debuginfo-stripped and all.
@@ -997,7 +987,16 @@ end}
 %files doc
 %docdir %{_docdir}/%{name}
 %dir %{_docdir}/%{name}
-%{_docdir}/%{name}/html
+%dir %{_docdir}/%{name}/html
+%{_docdir}/%{name}/html/*/
+%{_docdir}/%{name}/html/*.html
+%{_docdir}/%{name}/html/*.css
+%{_docdir}/%{name}/html/*.js
+%{_docdir}/%{name}/html/*.png
+%{_docdir}/%{name}/html/*.svg
+%{_docdir}/%{name}/html/*.woff2
+%license %{_docdir}/%{name}/html/*.txt
+%license %{_docdir}/%{name}/html/*.md
 # former cargo-doc
 %docdir %{_docdir}/cargo
 %dir %{_docdir}/cargo
@@ -1042,64 +1041,17 @@ end}
 %{rustlibdir}/src
 
 
-%if 0%{?rhel}
+%files analysis
+%{rustlibdir}/%{rust_triple}/analysis/
+
+
+%if 0%{?rhel} && 0%{?rhel} >= 8
 %files toolset
 %{rpmmacrodir}/macros.rust-toolset
 %endif
 
 
 %changelog
-* 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.

rustc-1.61.0-rust-gdb-substitute-path.patch

@@ -0,0 +1,18 @@
+--- rustc-1.61.0-src/src/etc/rust-gdb.orig	2022-05-17 18:29:36.000000000 -0700
++++ rustc-1.61.0-src/src/etc/rust-gdb	2022-05-18 11:18:13.732709661 -0700
+@@ -14,6 +14,9 @@ fi
+ RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
+ GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
+ 
++RUST_STD_BUILD="@BUILDDIR@/library/"
++RUST_STD_SRC="$RUSTC_SYSROOT/lib/rustlib/src/rust/library/"
++
+ # Run GDB with the additional arguments that load the pretty printers
+ # Set the environment variable `RUST_GDB` to overwrite the call to a
+ # different/specific command (defaults to `gdb`).
+@@ -21,4 +24,5 @@ RUST_GDB="${RUST_GDB:-gdb}"
+ PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
+   --directory="$GDB_PYTHON_MODULE_DIRECTORY" \
+   -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
++  -iex "set substitute-path $RUST_STD_BUILD $RUST_STD_SRC" \
+   "$@"

rustc-1.65.0-disable-http2.patch

@@ -1,6 +1,6 @@
---- rustc-beta-src/Cargo.lock.orig	2023-05-24 16:49:05.242510531 -0700
-+++ rustc-beta-src/Cargo.lock	2023-05-24 16:51:11.741865603 -0700
-@@ -1197,7 +1197,6 @@ checksum = "14d05c10f541ae6f3bc5b3d923c2
+--- rustc-beta-src/Cargo.lock.orig	2022-10-04 10:55:48.797517289 -0700
++++ rustc-beta-src/Cargo.lock	2022-10-04 10:55:48.799517248 -0700
+@@ -1026,7 +1026,6 @@
  dependencies = [
   "cc",
   "libc",
@@ -8,7 +8,7 @@
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -2989,16 +2988,6 @@ source = "registry+https://github.com/ru
+@@ -1993,16 +1992,6 @@
  checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
  
  [[package]]
@@ -25,20 +25,41 @@
  name = "libz-sys"
  version = "1.1.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-05-24 16:49:05.244510489 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-05-24 16:51:04.683013189 -0700
-@@ -23,7 +23,7 @@ cargo-platform = { path = "crates/cargo-
- cargo-util = { path = "crates/cargo-util", version = "0.2.4" }
- clap = "4.2.0"
- crates-io = { path = "crates/crates-io", version = "0.36.0" }
--curl = { version = "0.4.44", features = ["http2"] }
-+curl = { version = "0.4.44", features = [] }
- curl-sys = "0.4.61"
- env_logger = "0.10.0"
- filetime = "0.2.9"
---- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2023-05-19 19:05:42.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2023-05-24 16:49:05.244510489 -0700
-@@ -407,16 +407,9 @@ impl<'cfg> PackageSet<'cfg> {
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2022-10-04 10:55:48.799517248 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2022-10-04 11:00:55.057162743 -0700
+@@ -21,7 +21,7 @@
+ cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" }
+ cargo-util = { path = "crates/cargo-util", version = "0.2.1" }
+ crates-io = { path = "crates/crates-io", version = "0.34.0" }
+-curl = { version = "0.4.43", features = ["http2"] }
++curl = { version = "0.4.43", features = [] }
+ curl-sys = "0.4.55"
+ env_logger = "0.9.0"
+ pretty_env_logger = { version = "0.4", optional = true }
+--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2022-09-24 10:23:17.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2022-10-04 10:55:48.799517248 -0700
+@@ -192,16 +192,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;
+ 
+         self.config
+             .shell()
+--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2022-09-24 10:23:17.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2022-10-04 10:55:48.800517227 -0700
+@@ -403,16 +403,9 @@
          sources: SourceMap<'cfg>,
          config: &'cfg Config,
      ) -> CargoResult<PackageSet<'cfg>> {
@@ -58,30 +79,7 @@
  
          Ok(PackageSet {
              packages: package_ids
---- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2023-05-24 16:49:05.245510468 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2023-05-24 16:51:57.916900146 -0700
-@@ -229,16 +229,8 @@ impl<'cfg> HttpRegistry<'cfg> {
-         }
-         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-05-19 19:05:42.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs	2023-05-24 16:49:05.245510468 -0700
-@@ -25,7 +25,7 @@ impl<T> PollExt<T> for Poll<T> {
+@@ -658,7 +651,7 @@
  macro_rules! try_old_curl {
      ($e:expr, $msg:expr) => {
          let result = $e;

rustc-1.65.0-disable-libssh2.patch

@@ -1,6 +1,6 @@
---- rustc-beta-src/Cargo.lock.orig	2023-05-19 19:02:31.000000000 -0700
-+++ rustc-beta-src/Cargo.lock	2023-05-24 16:36:33.312232441 -0700
-@@ -2967,7 +2967,6 @@
+--- rustc-beta-src/Cargo.lock.orig	2022-09-24 10:20:14.000000000 -0700
++++ rustc-beta-src/Cargo.lock	2022-10-04 10:26:35.490270607 -0700
+@@ -1971,7 +1971,6 @@
  dependencies = [
   "cc",
   "libc",
@@ -8,14 +8,14 @@
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -3000,20 +2999,6 @@
+@@ -2004,20 +2003,6 @@
  ]
  
  [[package]]
 -name = "libssh2-sys"
--version = "0.3.0"
+-version = "0.2.23"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
+-checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
 -dependencies = [
 - "cc",
 - "libc",
@@ -29,9 +29,9 @@
  name = "libz-sys"
  version = "1.1.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
---- rustc-beta-src/vendor/git2/Cargo.toml.orig	2023-05-19 21:16:57.000000000 -0700
-+++ rustc-beta-src/vendor/git2/Cargo.toml	2023-05-24 16:33:42.043813439 -0700
-@@ -55,9 +55,7 @@
+--- rustc-beta-src/vendor/git2/Cargo.toml.orig	2022-10-04 10:26:35.490270607 -0700
++++ rustc-beta-src/vendor/git2/Cargo.toml	2022-10-04 10:28:14.002187686 -0700
+@@ -58,9 +58,7 @@
  
  [features]
  default = [

rustc-1.65.0-no-default-pie.patch

@@ -0,0 +1,43 @@
+--- rustc-beta-src/compiler/rustc_codegen_ssa/src/back/link.rs.orig	2022-09-24 10:20:14.000000000 -0700
++++ rustc-beta-src/compiler/rustc_codegen_ssa/src/back/link.rs	2022-10-05 11:24:21.759564185 -0700
+@@ -755,7 +755,7 @@
+             && cmd.get_args().iter().any(|e| e.to_string_lossy() == "-no-pie")
+         {
+             info!("linker output: {:?}", out);
+-            warn!("Linker does not support -no-pie command line option. Retrying without.");
++            info!("Linker does not support -no-pie command line option. Retrying without.");
+             for arg in cmd.take_args() {
+                 if arg.to_string_lossy() != "-no-pie" {
+                     cmd.arg(arg);
+@@ -774,7 +774,7 @@
+             && cmd.get_args().iter().any(|e| e.to_string_lossy() == "-static-pie")
+         {
+             info!("linker output: {:?}", out);
+-            warn!(
++            info!(
+                 "Linker does not support -static-pie command line option. Retrying with -static instead."
+             );
+             // Mirror `add_(pre,post)_link_objects` to replace CRT objects.
+@@ -1520,15 +1520,15 @@
+ }
+ 
+ fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
+-    let kind = match (crate_type, sess.crt_static(Some(crate_type)), sess.relocation_model()) {
++    // Only use PIE if explicitly specified.
++    #[allow(rustc::bad_opt_access)]
++    let explicit_pic =
++        matches!(sess.opts.cg.relocation_model, Some(RelocModel::Pic | RelocModel::Pie));
++    let kind = match (crate_type, sess.crt_static(Some(crate_type)), explicit_pic) {
+         (CrateType::Executable, _, _) if sess.is_wasi_reactor() => LinkOutputKind::WasiReactorExe,
+-        (CrateType::Executable, false, RelocModel::Pic | RelocModel::Pie) => {
+-            LinkOutputKind::DynamicPicExe
+-        }
++        (CrateType::Executable, false, true) => LinkOutputKind::DynamicPicExe,
+         (CrateType::Executable, false, _) => LinkOutputKind::DynamicNoPicExe,
+-        (CrateType::Executable, true, RelocModel::Pic | RelocModel::Pie) => {
+-            LinkOutputKind::StaticPicExe
+-        }
++        (CrateType::Executable, true, true) => LinkOutputKind::StaticPicExe,
+         (CrateType::Executable, true, _) => LinkOutputKind::StaticNoPicExe,
+         (_, true, _) => LinkOutputKind::StaticDylib,
+         (_, false, _) => LinkOutputKind::DynamicDylib,

rustc-1.70.0-rust-gdb-substitute-path.patch

@@ -1,21 +0,0 @@
-diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
-index 9abed30ea6f7..e4bf55df3688 100755
---- a/src/etc/rust-gdb
-+++ b/src/etc/rust-gdb
-@@ -13,8 +13,6 @@ fi
- # Find out where the pretty printer Python module is
- RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
- GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
--# Get the commit hash for path remapping
--RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
- 
- # Run GDB with the additional arguments that load the pretty printers
- # Set the environment variable `RUST_GDB` to overwrite the call to a
-@@ -23,6 +21,6 @@ RUST_GDB="${RUST_GDB:-gdb}"
- PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
-   --directory="$GDB_PYTHON_MODULE_DIRECTORY" \
-   -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
--  -iex "set substitute-path /rustc/$RUSTC_COMMIT_HASH $RUSTC_SYSROOT/lib/rustlib/src/rust" \
-+  -iex "set substitute-path @BUILDDIR@ $RUSTC_SYSROOT/lib/rustlib/src/rust" \
-   "$@"
-  

sources

@@ -1,2 +1,2 @@
-SHA512 (rustc-1.70.0-src.tar.xz) = 21b35185fdcc35a059ee5ef6dca2b68f5f1d199e97f425a571cfc318a852c36a57bccf68e7673b4cb7cd83128f30d0b3eb93009a978f3ba3909b7eee50d40631
-SHA512 (wasi-libc-wasi-sdk-20.tar.gz) = e264240dc7dbcf6398c8ca09bc108298f4a8aa955af22de5a3015fbcde81cb09dd83cd48349090082d5de0e8a3dbcf746c7b14657c67657b3f2f1ab28bb9cf05
+SHA512 (rustc-1.65.0-src.tar.xz) = 3d0369ed3028209c4ecb9b9e7b5f5e3a20be8cc05199675df4f091d62a96c0734bc1dbd7630928fe162792392ec6d0daf9ceed10771531ce022200c7b631e3be
+SHA512 (wasi-libc-wasi-sdk-16.tar.gz) = 4d3d12e233b2b3321e5287c0851a950d744208e05ed2c6d995dd2e7ff51452c7cfe62451589ed6d3ac58065f8cc87fc5c74a1853ed798e108662d1b0d3ad8a0e

tests/Sanity/rpmbuild-librsvg2/runtest.sh

@@ -48,10 +48,7 @@ rlJournalStart
         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}"
+        rlRun "yum-builddep -y ${SPECDIR}/${PKG_TO_BUILD}.spec ${YUM_SWITCHES}"
     rlPhaseEnd
 
     rlPhaseStartTest