Update to 1.70.0.

Apply set_build_flags on rhel
Add rpminspect.yaml config file
2023-06-01 12:46:43 -07:00 · 2023-05-24 08:58:17 -07:00 · 2023-05-08 11:47:54 +00:00 · 2023-05-05 13:28:08 -07:00 · 2023-05-01 10:07:31 -07:00 · 2023-04-20 09:47:54 -07:00
10 changed files with 190 additions and 230 deletions
--- a/.gitignore
+++ b/.gitignore
@ -412,3 +412,11 @@
 /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
--- a/0001-Fix-Async-Generator-ABI.patch
+++ b/0001-Fix-Async-Generator-ABI.patch
@ -1,55 +0,0 @@
-From ecf812777a260e35ec9cd0c7d9dbd17a3f5cf5f9 Mon Sep 17 00:00:00 2001
-From: Arpad Borsos <swatinem@swatinem.de>
-Date: Tue, 29 Nov 2022 23:17:08 +0100
-Subject: [PATCH] Fix Async Generator ABI
-
-This change was missed when making async generators implement `Future` directly.
-It did not cause any problems in codegen so far, as `GeneratorState<(), Output>`
-happens to have the same ABI as `Poll<Output>`.
---
- compiler/rustc_ty_utils/src/abi.rs | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/compiler/rustc_ty_utils/src/abi.rs b/compiler/rustc_ty_utils/src/abi.rs
-index 73c7eb6992f0..d644cbccea11 100644
--- a/compiler/rustc_ty_utils/src/abi.rs
-+++ b/compiler/rustc_ty_utils/src/abi.rs
-@@ -85,7 +85,7 @@ fn fn_sig_for_fn_abi<'tcx>(
-                 bound_vars,
-             )
-         }
-        ty::Generator(_, substs, _) => {
-+        ty::Generator(did, substs, _) => {
-             let sig = substs.as_generator().poly_sig();
- 
-             let bound_vars = tcx.mk_bound_variable_kinds(
-@@ -104,10 +104,22 @@ fn fn_sig_for_fn_abi<'tcx>(
-             let env_ty = tcx.mk_adt(pin_adt_ref, pin_substs);
- 
-             let sig = sig.skip_binder();
-            let state_did = tcx.require_lang_item(LangItem::GeneratorState, None);
-            let state_adt_ref = tcx.adt_def(state_did);
-            let state_substs = tcx.intern_substs(&[sig.yield_ty.into(), sig.return_ty.into()]);
-            let ret_ty = tcx.mk_adt(state_adt_ref, state_substs);
-+            // The `FnSig` and the `ret_ty` here is for a generators main
-+            // `Generator::resume(...) -> GeneratorState` function in case we
-+            // have an ordinary generator, or the `Future::poll(...) -> Poll`
-+            // function in case this is a special generator backing an async construct.
-+            let ret_ty = if tcx.generator_is_async(did) {
-+                let state_did = tcx.require_lang_item(LangItem::Poll, None);
-+                let state_adt_ref = tcx.adt_def(state_did);
-+                let state_substs = tcx.intern_substs(&[sig.return_ty.into()]);
-+                tcx.mk_adt(state_adt_ref, state_substs)
-+            } else {
-+                let state_did = tcx.require_lang_item(LangItem::GeneratorState, None);
-+                let state_adt_ref = tcx.adt_def(state_did);
-+                let state_substs = tcx.intern_substs(&[sig.yield_ty.into(), sig.return_ty.into()]);
-+                tcx.mk_adt(state_adt_ref, state_substs)
-+            };
-+
-             ty::Binder::bind_with_vars(
-                 tcx.mk_fn_sig(
-                     [env_ty, sig.resume_ty].iter(),
-- 
-2.39.1
-
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,8 @@
+---
+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
+
--- a/rust.spec
+++ b/rust.spec
@ -1,6 +1,6 @@
-# Only x86_64 and i686 are Tier 1 platforms at this time.
+# Only x86_64, i686, and aarch64 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
+%global rust_arches x86_64 i686 armv7hl aarch64 ppc64le s390x riscv64

 # 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.66.0
-%global bootstrap_channel 1.66.0
-%global bootstrap_date 2022-12-15
+%global bootstrap_version 1.69.0
+%global bootstrap_channel 1.69.0
+%global bootstrap_date 2023-04-20

 # 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-17
+%global wasi_libc_ref wasi-sdk-20
 %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,16 +44,16 @@
 %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 12.0+.
-%global min_llvm_version 13.0.0
-%global bundled_llvm_version 15.0.6
+# is insufficient.  Rust currently requires LLVM 14.0+.
+%global min_llvm_version 14.0.0
+%global bundled_llvm_version 16.0.2
 %bcond_with bundled_llvm

-# Requires stable libgit2 1.5, and not the next minor soname change.
+# Requires stable libgit2 1.6, and not the next minor soname change.
 # This needs to be consistent with the bindings in vendor/libgit2-sys.
-%global min_libgit2_version 1.5.0
-%global next_libgit2_version 1.6.0~
-%global bundled_libgit2_version 1.5.0
+%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
 %bcond_with bundled_libgit2
 %else
@ -83,7 +83,7 @@
 %endif

 Name:           rust
-Version:        1.67.1
+Version:        1.70.0
 Release:        1%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
@ -104,11 +104,7 @@ 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.61.0-rust-gdb-substitute-path.patch
-
-# Fix Async Generator ABI (rhbz2168622)
-# https://github.com/rust-lang/rust/pull/105082
-Patch3:         0001-Fix-Async-Generator-ABI.patch
+Patch2:         rustc-1.70.0-rust-gdb-substitute-path.patch

 ### RHEL-specific patches below ###

@ -116,16 +112,11 @@ Patch3:         0001-Fix-Async-Generator-ABI.patch
 Source100:      macros.rust-toolset

 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
-Patch100:       rustc-1.65.0-disable-libssh2.patch
+Patch100:       rustc-1.70.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.67.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
-
+Patch101:       rustc-1.70.0-disable-http2.patch

 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
@ -143,7 +134,14 @@ Patch102:       rustc-1.65.0-no-default-pie.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.
@ -219,7 +217,7 @@ Provides:       bundled(llvm) = %{bundled_llvm_version}
 %else
 BuildRequires:  cmake >= 2.8.11
 %if 0%{?epel} == 7
-%global llvm llvm13
+%global llvm llvm14
 %endif
 %if %defined llvm
 %global llvm_root %{_libdir}/%{llvm}
@ -256,7 +254,7 @@ Requires:       %{name}-std-static%{?_isa} = %{version}-%{release}
 Requires:       /usr/bin/cc

 %if 0%{?epel} == 7
-%global devtoolset_name devtoolset-9
+%global devtoolset_name devtoolset-11
 BuildRequires:  %{devtoolset_name}-binutils
 BuildRequires:  %{devtoolset_name}-gcc
 BuildRequires:  %{devtoolset_name}-gcc-c++
@ -321,6 +319,10 @@ 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.
@ -330,8 +332,9 @@ 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.11
+Requires:       glibc-devel%{?_isa} >= 2.17

 %description std-static
 This package includes the standard libraries for building applications
@ -534,26 +537,13 @@ This package includes source files for the Rust standard library.  It may be
 useful as a reference for code completion tools in various editors.


-%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
-Recommends:     %{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
+%if 0%{?rhel}

 %package toolset
 Summary:        Rust Toolset
-Requires:       rust%{?_isa} = %{version}-%{release}
-Requires:       cargo%{?_isa} = %{version}-%{release}
+BuildArch:      noarch
+Requires:       rust = %{version}-%{release}
+Requires:       cargo = %{version}-%{release}

 %description toolset
 This is the metapackage for Rust Toolset, bringing in the Rust compiler,
@ -582,21 +572,16 @@ test -f '%{local_rust_root}/bin/rustc'

 %setup -q -n %{rustc_package}

-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P1 -p1
+%patch -P2 -p1

 %if %with disabled_libssh2
-%patch100 -p1
+%patch -P100 -p1
 %endif

 %if %without curl_http2
-%patch101 -p1
-rm -rf vendor/libnghttp2-sys/
-%endif
-
-%if 0%{?rhel} && 0%{?rhel} < 8
-%patch102 -p1
+%patch -P101 -p1
+rm -rf vendor/libnghttp2-sys*/
 %endif

 # Use our explicit python3 first
@ -611,21 +596,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/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/
+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/

 %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
@ -654,9 +639,32 @@ 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 0%{?cmake_path:1}
+%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
 %global rust_env %{?rust_env} PATH="%{cmake_path}:$PATH"
 %endif
 %if %without disabled_libssh2
@ -665,7 +673,6 @@ 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}

@ -751,7 +758,7 @@ end}
  --set build.install-stage=2 \
  --set build.test-stage=2 \
  --enable-extended \
-  --tools=analysis,cargo,clippy,rls,rust-analyzer,rustfmt,src \
+  --tools=cargo,clippy,rls,rust-analyzer,rustfmt,src \
  --enable-vendor \
  --enable-verbose-tests \
  --dist-compression-formats=gz \
@ -766,6 +773,9 @@ 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
@ -846,13 +856,16 @@ 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} && 0%{?rhel} >= 8
+%if 0%{?rhel}
 # 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.
@ -1029,17 +1042,41 @@ end}
 %{rustlibdir}/src


-%files analysis
-%{rustlibdir}/%{rust_triple}/analysis/
-
-
-%if 0%{?rhel} && 0%{?rhel} >= 8
+%if 0%{?rhel}
 %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.

--- a/rustc-1.61.0-rust-gdb-substitute-path.patch
+++ b/rustc-1.61.0-rust-gdb-substitute-path.patch
@ -1,18 +0,0 @@
--- 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" \
-   "$@"
--- a/rustc-1.65.0-no-default-pie.patch
+++ b/rustc-1.65.0-no-default-pie.patch
@ -1,43 +0,0 @@
--- 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,
--- a/rustc-1.70.0-disable-http2.patch
+++ b/rustc-1.70.0-disable-http2.patch
@ -1,6 +1,6 @@
--- rustc-beta-src/Cargo.lock.orig	2023-01-24 13:25:47.822917185 -0800
-+++ rustc-beta-src/Cargo.lock	2023-01-24 13:25:47.824917142 -0800
-@@ -1062,7 +1062,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
 dependencies = [
  "cc",
  "libc",
@ -8,7 +8,7 @@
  "libz-sys",
  "openssl-sys",
  "pkg-config",
-@@ -2181,16 +2180,6 @@
+@@ -2989,16 +2988,6 @@ source = "registry+https://github.com/ru
 checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
 
 [[package]]
@ -25,20 +25,20 @@
 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-01-24 13:25:47.824917142 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-01-24 13:26:29.209044200 -0800
-@@ -21,7 +21,7 @@
- cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" }
- cargo-util = { path = "crates/cargo-util", version = "0.2.3" }
- crates-io = { path = "crates/crates-io", version = "0.35.0" }
+--- 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.59"
+ curl-sys = "0.4.61"
 env_logger = "0.10.0"
- pretty_env_logger = { version = "0.4", optional = true }
--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2023-01-21 17:17:19.000000000 -0800
-+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2023-01-24 13:25:47.824917142 -0800
-@@ -403,16 +403,9 @@
+ 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> {
         sources: SourceMap<'cfg>,
         config: &'cfg Config,
     ) -> CargoResult<PackageSet<'cfg>> {
@ -58,18 +58,9 @@
 
         Ok(PackageSet {
             packages: package_ids
-@@ -658,7 +651,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 {
-                 warn!("ignoring libcurl {} error: {}", $msg, e);
-             }
--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2023-01-21 17:17:19.000000000 -0800
-+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2023-01-24 13:25:47.824917142 -0800
-@@ -223,16 +223,8 @@
+--- 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;
 
@ -86,5 +77,16 @@
 +        // Multiplexing is disabled because the system libcurl doesn't support it.
 +        self.multiplexing = false;
 
-         self.config
-             .shell()
+         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> {
+ 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 {
+                 warn!("ignoring libcurl {} error: {}", $msg, e);
+             }
--- a/rustc-1.70.0-disable-libssh2.patch
+++ b/rustc-1.70.0-disable-libssh2.patch
@ -1,6 +1,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 @@
+--- 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 @@
 dependencies = [
  "cc",
  "libc",
@ -8,14 +8,14 @@
  "libz-sys",
  "openssl-sys",
  "pkg-config",
-@@ -2004,20 +2003,6 @@
+@@ -3000,20 +2999,6 @@
 ]
 
 [[package]]
 -name = "libssh2-sys"
-version = "0.2.23"
+-version = "0.3.0"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
+-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
 -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	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 @@
+--- 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 @@
 
 [features]
 default = [
--- a/rustc-1.70.0-rust-gdb-substitute-path.patch
+++ b/rustc-1.70.0-rust-gdb-substitute-path.patch
@ -0,0 +1,21 @@
+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" \
+   "$@"
+  
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (rustc-1.67.1-src.tar.xz) = 42d77ee93b168ae139b026138fb48d925624ff436a836aa97ee235f870e61ea11643b0cf7ad20bcafda774c6cd3855a4bc10a2e2ed1c4d82c6f15158963b304d
-SHA512 (wasi-libc-wasi-sdk-17.tar.gz) = 5870f86d4a8431edefaef41163d1fa7eddeabcfa6bc5794c7bf18b4fd320b6ea43c261a7e41966d0da1490a2d96b9742c82cbcca7c56bb404830722664cab376
+SHA512 (rustc-1.70.0-src.tar.xz) = 21b35185fdcc35a059ee5ef6dca2b68f5f1d199e97f425a571cfc318a852c36a57bccf68e7673b4cb7cd83128f30d0b3eb93009a978f3ba3909b7eee50d40631
+SHA512 (wasi-libc-wasi-sdk-20.tar.gz) = e264240dc7dbcf6398c8ca09bc108298f4a8aa955af22de5a3015fbcde81cb09dd83cd48349090082d5de0e8a3dbcf746c7b14657c67657b3f2f1ab28bb9cf05
Author	SHA1	Message	Date
Josh Stone	6fff218b19	Update to 1.70.0.	2023-06-01 12:46:43 -07:00
Josh Stone	ff66501ce9	Apply set_build_flags on rhel	2023-05-24 08:58:17 -07:00
Jesus Checa Hidalgo	8745dbe4c6	Add rpminspect.yaml config file Added suppresion for reduced debuginfo in i386 builds.	2023-05-08 11:47:54 +00:00
Josh Stone	777115da9e	Fix debuginfo with LLVM 16	2023-05-05 13:28:08 -07:00
Josh Stone	41fd9d7898	Build with LLVM 15 on Fedora 38+	2023-05-01 10:07:31 -07:00
Josh Stone	77613da92c	Update to 1.69.0. Obsolete rust-analysis.	2023-04-20 09:47:54 -07:00
Josh Stone	7ac7a42b5e	Update to 1.68.2.	2023-03-28 10:11:01 -07:00
Josh Stone	b4bb093ae0	Update to 1.68.1.	2023-03-23 08:42:27 -07:00
Josh Stone	a07799699f	Update to 1.68.0.	2023-03-09 08:52:34 -08:00
David Michael	b85b429e00	Add a virtual Provides to rust-std-static with the target triple This supports depending on a variable target using something like the following since the other target stdlib subpackages are named by this convention. BuildRequires: rust-std-static-%{cargo_target}	2023-03-07 10:34:35 -08:00
Orion Poplawski	7f5b9608ec	Make rust-toolset noarch	2023-03-06 15:11:28 -08:00
Orion Poplawski	375b75425b	Ship rust-toolset for EPEL7	2023-03-06 15:11:28 -08:00