The package rpms/rustup.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rustup.git/commit/?id=47782c02ae9....
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 47782c02ae97ef5b2154539b0a891737be0606f1
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Jun 13 14:54:23 2024 +0200
Update to version 1.27.1; Fixes RHBZ#2269302
diff --git a/.gitignore b/.gitignore
index f13364b..c6726c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/rustup-1.26.0.tar.gz
+/rustup-1.27.1.tar.gz
diff --git a/0001-Drop-Windows-specific-dependencies.patch
b/0001-Drop-Windows-specific-dependencies.patch
index 400b24c..0b16a83 100644
--- a/0001-Drop-Windows-specific-dependencies.patch
+++ b/0001-Drop-Windows-specific-dependencies.patch
@@ -1,23 +1,23 @@
-From 50e9805a689adc522b92412525c3676de1b4af49 Mon Sep 17 00:00:00 2001
+From 0e7244fe95067372103b8653a13b0aee9c4157af Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
-Date: Wed, 8 Nov 2023 17:47:31 +0100
-Subject: [PATCH 1/5] Drop Windows-specific dependencies
+Date: Thu, 23 May 2024 17:52:19 +0200
+Subject: [PATCH 1/6] Drop Windows-specific dependencies
---
- Cargo.toml | 30 ------------------------------
- 1 file changed, 30 deletions(-)
+ Cargo.toml | 44 --------------------------------------------
+ 1 file changed, 44 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
-index 406cb37..23eb61a 100644
+index 5807cc1..f764cf7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -85,36 +85,6 @@ version = "1.3.1"
- features = ["rs_tracing"]
- version = "1.1.0"
+@@ -100,50 +100,6 @@ walkdir = { workspace = true, optional = true }
+ xz2 = "0.1.3"
+ zstd = "0.13"
-[target."cfg(windows)".dependencies]
-cc = "1"
--winreg = "0.11"
+-winreg = "0.52"
-
-[target."cfg(windows)".dependencies.winapi]
-features = [
@@ -44,10 +44,24 @@ index 406cb37..23eb61a 100644
- "winuser",
-]
-version = "0.3"
+-
+-[target."cfg(windows)".dependencies.windows-sys]
+-features = [
+- "Win32_Foundation",
+- "Win32_Storage_FileSystem",
+- "Win32_System_SystemServices",
+- "Win32_System_Threading",
+- "Win32_System_WindowsProgramming",
+- "Win32_Security",
+- "Win32_System_Kernel",
+- "Win32_System_IO",
+- "Win32_System_Ioctl",
+-]
+-version = "0.52.0"
-
[dev-dependencies]
- enum-map = "2.4.2"
- once_cell = "1.17.1"
+ enum-map = "2.5.0"
+ proptest.workspace = true
--
-2.43.0
+2.45.1
diff --git a/0002-Drop-feature-for-statically-linking-against-vendored.patch
b/0002-Drop-feature-for-statically-linking-against-vendored.patch
index fbffe08..52fe3e8 100644
--- a/0002-Drop-feature-for-statically-linking-against-vendored.patch
+++ b/0002-Drop-feature-for-statically-linking-against-vendored.patch
@@ -1,7 +1,7 @@
-From 6e62451af518059056dd2e9352081670b0e8fc30 Mon Sep 17 00:00:00 2001
+From 47f9e30352eedbb3cd2ab5a250ef95380146ed89 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed, 8 Nov 2023 17:53:44 +0100
-Subject: [PATCH 2/5] Drop feature for statically linking against vendored
+Subject: [PATCH 2/6] Drop feature for statically linking against vendored
OpenSSL
---
@@ -9,10 +9,10 @@ Subject: [PATCH 2/5] Drop feature for statically linking against
vendored
1 file changed, 1 deletion(-)
diff --git a/Cargo.toml b/Cargo.toml
-index 23eb61a..3e878ac 100644
+index f764cf7..d854a1d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -24,7 +24,6 @@ default = [
+@@ -20,7 +20,6 @@ default = [
]
reqwest-backend = ["download/reqwest-backend"]
@@ -21,5 +21,5 @@ index 23eb61a..3e878ac 100644
reqwest-default-tls = ["download/reqwest-default-tls"]
reqwest-rustls-tls = ["download/reqwest-rustls-tls"]
--
-2.43.0
+2.45.1
diff --git a/0003-Bump-term-dependency-from-0.5.1-to-0.7.patch
b/0003-Bump-term-dependency-from-0.5.1-to-0.7.patch
deleted file mode 100644
index 6b97a7c..0000000
--- a/0003-Bump-term-dependency-from-0.5.1-to-0.7.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 10e8f24e297d66db1c6cce1be94b4a8850f64f73 Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe(a)gmail.com>
-Date: Wed, 8 Nov 2023 17:55:55 +0100
-Subject: [PATCH 3/5] Bump term dependency from =0.5.1 to 0.7
-
----
- Cargo.toml | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 3e878ac..3aec3b1 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -65,8 +65,7 @@ sharded-slab = "0.1.1"
- strsim = "0.10"
- tar = "0.4.26"
- tempfile.workspace = true
--# FIXME(issue #1818, #1826, and friends)
--term = "=0.5.1"
-+term = "0.7"
- thiserror.workspace = true
- threadpool = "1"
- toml = "0.5"
---
-2.43.0
-
diff --git a/0004-Remove-unused-tracing-support.patch
b/0003-Remove-unused-tracing-support.patch
similarity index 72%
rename from 0004-Remove-unused-tracing-support.patch
rename to 0003-Remove-unused-tracing-support.patch
index d7da35b..b357fcd 100644
--- a/0004-Remove-unused-tracing-support.patch
+++ b/0003-Remove-unused-tracing-support.patch
@@ -1,46 +1,46 @@
-From cdc1e26072bf1183a9fd784d33553fe6167e7969 Mon Sep 17 00:00:00 2001
+From 56d13b5358fe97a6fdb7c524d5c094297456f215 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
-Date: Wed, 8 Nov 2023 17:56:26 +0100
-Subject: [PATCH 4/5] Remove unused tracing support
+Date: Thu, 23 May 2024 18:01:37 +0200
+Subject: [PATCH 3/6] Remove unused tracing support
---
- Cargo.toml | 4 ----
- src/bin/rustup-init.rs | 7 -------
- src/diskio/immediate.rs | 3 ---
- src/diskio/mod.rs | 8 --------
- src/lib.rs | 3 ---
+ Cargo.toml | 1 -
+ src/bin/rustup-init.rs | 10 ----------
+ src/diskio/immediate.rs | 3 ---
+ src/diskio/mod.rs | 8 --------
+ src/lib.rs | 3 ---
5 files changed, 25 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
-index 3aec3b1..aae3d01 100644
+index d854a1d..f7eaf10 100644
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -79,10 +79,6 @@ default-features = false
- features = ["random"]
- version = "1.3.1"
-
--[dependencies.rs_tracing]
--features = ["rs_tracing"]
--version = "1.1.0"
--
- [dev-dependencies]
- enum-map = "2.4.2"
- once_cell = "1.17.1"
+@@ -75,7 +75,6 @@ rand = "0.8"
+ regex = "1"
+ remove_dir_all = { version = "0.8.1", features = ["parallel"] }
+ retry = { version = "2", default-features = false, features =
["random"] }
+-rs_tracing = { version = "1.1", features = ["rs_tracing"] }
+ same-file = "1"
+ scopeguard = "1"
+ semver = "1.0"
diff --git a/src/bin/rustup-init.rs b/src/bin/rustup-init.rs
-index 35ed986..22d29b6 100644
+index bd39295..7e2f781 100644
--- a/src/bin/rustup-init.rs
+++ b/src/bin/rustup-init.rs
-@@ -15,7 +15,6 @@
+@@ -15,10 +15,6 @@
use anyhow::{anyhow, Result};
use cfg_if::cfg_if;
--use rs_tracing::*;
+-// Public macros require availability of the internal symbols
+-use rs_tracing::{
+- close_trace_file, close_trace_file_internal, open_trace_file,
trace_to_file_internal,
+-};
use rustup::cli::common;
use rustup::cli::proxy_mode;
-@@ -40,13 +39,7 @@ fn main() {
- }
+@@ -105,13 +101,7 @@ fn maybe_trace_rustup() -> Result<utils::ExitCode> {
+ #[cfg_attr(feature = "otel", tracing::instrument)]
fn run_rustup() -> Result<utils::ExitCode> {
- if let Ok(dir) = process().var("RUSTUP_TRACE_DIR") {
- open_trace_file!(dir)?;
@@ -77,10 +77,10 @@ index 2bc2a5d..5818b58 100644
state.completed_chunks.push(chunk.len());
diff --git a/src/diskio/mod.rs b/src/diskio/mod.rs
-index a5e597c..488be46 100644
+index 156b20b..317d75e 100644
--- a/src/diskio/mod.rs
+++ b/src/diskio/mod.rs
-@@ -373,17 +373,14 @@ pub(crate) fn write_file<P: AsRef<Path>, C:
AsRef<[u8]>>(
+@@ -376,17 +376,14 @@ pub(crate) fn write_file<P: AsRef<Path>, C:
AsRef<[u8]>>(
let path = path.as_ref();
let path_display = format!("{}", path.display());
let mut f = {
@@ -98,7 +98,7 @@ index a5e597c..488be46 100644
drop(f);
}
Ok(())
-@@ -405,7 +402,6 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F:
Fn(usize)>(
+@@ -408,7 +405,6 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F:
Fn(usize)>(
let path = path.as_ref();
let path_display = format!("{}", path.display());
let mut f = {
@@ -106,7 +106,7 @@ index a5e597c..488be46 100644
opts.write(true).create(true).truncate(true).open(path)?
};
if let IncrementalFile::ThreadedReceiver(recv) = content_callback {
-@@ -416,12 +412,10 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F:
Fn(usize)>(
+@@ -419,12 +415,10 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F:
Fn(usize)>(
let len = contents.len();
// Length 0 vector is used for clean EOF signalling.
if len == 0 {
@@ -119,7 +119,7 @@ index a5e597c..488be46 100644
f.write_all(&contents)?;
drop(contents);
chunk_complete_callback(len);
-@@ -431,7 +425,6 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F:
Fn(usize)>(
+@@ -434,7 +428,6 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F:
Fn(usize)>(
unreachable!();
}
{
@@ -127,7 +127,7 @@ index a5e597c..488be46 100644
drop(f);
}
Ok(())
-@@ -440,7 +433,6 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F:
Fn(usize)>(
+@@ -443,7 +436,6 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F:
Fn(usize)>(
pub(crate) fn create_dir<P: AsRef<Path>>(path: P) -> io::Result<()>
{
let path = path.as_ref();
let path_display = format!("{}", path.display());
@@ -136,12 +136,12 @@ index a5e597c..488be46 100644
}
diff --git a/src/lib.rs b/src/lib.rs
-index b4e88fa..c34c6d1 100644
+index b5215ea..9c38a1c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
-@@ -15,9 +15,6 @@ use crate::toolchain::*;
- pub(crate) use crate::utils::toml_utils;
+@@ -18,9 +18,6 @@ pub(crate) use crate::utils::toml_utils;
use anyhow::{anyhow, Result};
+ use itertools::{chain, Itertools};
-#[macro_use]
-extern crate rs_tracing;
@@ -150,5 +150,5 @@ index b4e88fa..c34c6d1 100644
pub static TOOLS: &[&str] = &[
"rustc",
--
-2.43.0
+2.45.1
diff --git a/0005-Remove-unused-git-based-versioning.patch
b/0004-Remove-unused-git-based-versioning.patch
similarity index 59%
rename from 0005-Remove-unused-git-based-versioning.patch
rename to 0004-Remove-unused-git-based-versioning.patch
index 9808bea..c0038e9 100644
--- a/0005-Remove-unused-git-based-versioning.patch
+++ b/0004-Remove-unused-git-based-versioning.patch
@@ -1,96 +1,102 @@
-From 7e7ffd44e6284de55df4e5eb050635ab5bce6ad2 Mon Sep 17 00:00:00 2001
+From d61d29663bfa21d7035ab2c322a931718c2e6382 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
-Date: Wed, 8 Nov 2023 18:08:54 +0100
-Subject: [PATCH 5/5] Remove unused git-based versioning
+Date: Thu, 23 May 2024 18:05:00 +0200
+Subject: [PATCH 4/6] Remove unused git-based versioning
---
Cargo.toml | 1 -
- src/cli/common.rs | 61 +-----------------------------------------
+ src/cli/common.rs | 67 +-----------------------------------------
src/cli/rustup_mode.rs | 1 -
- src/cli/setup_mode.rs | 6 -----
- 4 files changed, 1 insertion(+), 68 deletions(-)
+ src/cli/setup_mode.rs | 6 ----
+ 4 files changed, 1 insertion(+), 74 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
-index aae3d01..f33f4a9 100644
+index f7eaf10..bca0bec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -42,7 +42,6 @@ download = { path = "download", default-features = false }
- effective-limits = "0.5.5"
- enum-map = "2.4.2"
+@@ -54,7 +54,6 @@ enum-map = "2.5.0"
+ enum_dispatch.workspace = true
flate2 = "1"
+ fs_at.workspace = true
-git-testament = "0.2"
home = "0.5.4"
- lazy_static.workspace = true
+ itertools = "0.12"
libc = "0.2"
diff --git a/src/cli/common.rs b/src/cli/common.rs
-index 9a6a68d..3bb0a2c 100644
+index f74e70b..94fd54f 100644
--- a/src/cli/common.rs
+++ b/src/cli/common.rs
-@@ -7,8 +7,6 @@ use std::sync::Arc;
+@@ -9,8 +9,6 @@ use std::sync::Arc;
use std::{cmp, env};
use anyhow::{anyhow, Context, Result};
-use git_testament::{git_testament, render_testament};
--use lazy_static::lazy_static;
- use term2::Terminal;
+-use once_cell::sync::Lazy;
use super::self_update;
-@@ -513,65 +511,8 @@ pub(crate) fn list_overrides(cfg: &Cfg) ->
Result<utils::ExitCode> {
+ use crate::cli::download_tracker::DownloadTracker;
+@@ -559,71 +557,8 @@ pub(crate) fn list_overrides(cfg: &Cfg) ->
Result<utils::ExitCode> {
Ok(utils::ExitCode(0))
}
-git_testament!(TESTAMENT);
-
pub(crate) fn version() -> &'static str {
-- lazy_static! {
-- // Because we trust our `stable` branch given the careful release
-- // process, we mark it trusted here so that our version numbers look
-- // right when built from CI before the tag is pushed
-- static ref RENDERED: String = render_testament!(TESTAMENT, "stable");
-- }
+- // Because we trust our `stable` branch given the careful release
+- // process, we mark it trusted here so that our version numbers look
+- // right when built from CI before the tag is pushed
+- static RENDERED: Lazy<String> = Lazy::new(|| render_testament!(TESTAMENT,
"stable"));
- &RENDERED
-}
-
-pub(crate) fn dump_testament() -> Result<utils::ExitCode> {
- use git_testament::GitModification::*;
- writeln!(
-- process().stdout(),
+- process().stdout().lock(),
- "Rustup version renders as: {}",
- version()
- )?;
- writeln!(
-- process().stdout(),
+- process().stdout().lock(),
- "Current crate version: {}",
- env!("CARGO_PKG_VERSION")
- )?;
- if TESTAMENT.branch_name.is_some() {
- writeln!(
-- process().stdout(),
+- process().stdout().lock(),
- "Built from branch: {}",
- TESTAMENT.branch_name.unwrap()
- )?;
- } else {
-- writeln!(process().stdout(), "Branch information missing")?;
+- writeln!(process().stdout().lock(), "Branch information missing")?;
- }
-- writeln!(process().stdout(), "Commit info: {}", TESTAMENT.commit)?;
+- writeln!(
+- process().stdout().lock(),
+- "Commit info: {}",
+- TESTAMENT.commit
+- )?;
- if TESTAMENT.modifications.is_empty() {
-- writeln!(process().stdout(), "Working tree is clean")?;
+- writeln!(process().stdout().lock(), "Working tree is clean")?;
- } else {
- for fmod in TESTAMENT.modifications {
- match fmod {
-- Added(f) => writeln!(process().stdout(), "Added: {}",
String::from_utf8_lossy(f))?,
+- Added(f) => writeln!(
+- process().stdout().lock(),
+- "Added: {}",
+- String::from_utf8_lossy(f)
+- )?,
- Removed(f) => writeln!(
-- process().stdout(),
+- process().stdout().lock(),
- "Removed: {}",
- String::from_utf8_lossy(f)
- )?,
- Modified(f) => writeln!(
-- process().stdout(),
+- process().stdout().lock(),
- "Modified: {}",
- String::from_utf8_lossy(f)
- )?,
- Untracked(f) => writeln!(
-- process().stdout(),
+- process().stdout().lock(),
- "Untracked: {}",
- String::from_utf8_lossy(f)
- )?,
@@ -98,15 +104,15 @@ index 9a6a68d..3bb0a2c 100644
- }
- }
- Ok(utils::ExitCode(0))
-+ "1.26.0"
++ "1.27.1"
}
fn show_backtrace() -> bool {
diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs
-index 09d1379..06a0af7 100644
+index 5d0096a..9e44272 100644
--- a/src/cli/rustup_mode.rs
+++ b/src/cli/rustup_mode.rs
-@@ -137,7 +137,6 @@ pub fn main() -> Result<utils::ExitCode> {
+@@ -155,7 +155,6 @@ pub fn main() -> Result<utils::ExitCode> {
Ok(match matches.subcommand() {
Some(s) => match s {
@@ -115,10 +121,10 @@ index 09d1379..06a0af7 100644
Some(s) => match s {
("active-toolchain", m) =>
handle_epipe(show_active_toolchain(cfg, m))?,
diff --git a/src/cli/setup_mode.rs b/src/cli/setup_mode.rs
-index 6dd04ec..eaa814b 100644
+index cada019..7f47d78 100644
--- a/src/cli/setup_mode.rs
+++ b/src/cli/setup_mode.rs
-@@ -16,12 +16,6 @@ pub fn main() -> Result<utils::ExitCode> {
+@@ -25,12 +25,6 @@ pub fn main() -> Result<utils::ExitCode> {
return self_update::self_replace();
}
@@ -132,5 +138,5 @@ index 6dd04ec..eaa814b 100644
let cli = Command::new("rustup-init")
.version(common::version())
--
-2.43.0
+2.45.1
diff --git a/0005-Add-powerpc64-and-s390x-to-known-target_arch-values-.patch
b/0005-Add-powerpc64-and-s390x-to-known-target_arch-values-.patch
new file mode 100644
index 0000000..0c168d4
--- /dev/null
+++ b/0005-Add-powerpc64-and-s390x-to-known-target_arch-values-.patch
@@ -0,0 +1,28 @@
+From f361847d994a0cf386633a08c52203eac66c74eb Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Thu, 23 May 2024 18:11:56 +0200
+Subject: [PATCH 5/6] Add powerpc64 and s390x to known target_arch values for
+ tests
+
+---
+ src/test.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/test.rs b/src/test.rs
+index 617b765..784420f 100644
+--- a/src/test.rs
++++ b/src/test.rs
+@@ -140,6 +140,10 @@ pub fn this_host_triple() -> String {
+ "aarch64"
+ } else if cfg!(target_arch = "loongarch64") {
+ "loongarch64"
++ } else if cfg!(target_arch = "powerpc64") && cfg!(target_endian =
"little") {
++ "powerpc64le"
++ } else if cfg!(target_arch = "s390x") {
++ "s390x"
+ } else {
+ unimplemented!()
+ };
+--
+2.45.1
+
diff --git a/0006-temporarily-downgrade-opener-dependency-from-0.7-to-.patch
b/0006-temporarily-downgrade-opener-dependency-from-0.7-to-.patch
new file mode 100644
index 0000000..c7d6ba8
--- /dev/null
+++ b/0006-temporarily-downgrade-opener-dependency-from-0.7-to-.patch
@@ -0,0 +1,25 @@
+From b3c42746fe609aebffa0216509fba36752a006a6 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Fri, 31 May 2024 20:41:16 +0200
+Subject: [PATCH 6/6] temporarily downgrade opener dependency from 0.7 to 0.6
+
+---
+ Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index bca0bec..015d7ed 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -58,7 +58,7 @@ home = "0.5.4"
+ itertools = "0.12"
+ libc = "0.2"
+ once_cell.workspace = true
+-opener = "0.7.0"
++opener = "0.6.0"
+ # `openssl` is used by `curl` or `reqwest` backend although it isn't imported by
rustup: this
+ # allows controlling the vendoring status without exposing the presence of the download
crate.
+ # HACK: We temporarily pin the OpenSSL version due to build issues encountered in
+--
+2.45.1
+
diff --git a/rustup.spec b/rustup.spec
index 3b875d5..def2cf1 100644
--- a/rustup.spec
+++ b/rustup.spec
@@ -2,12 +2,11 @@
%bcond_without check
Name: rustup
-Version: 1.26.0
+Version: 1.27.1
Release: %autorelease
Summary: Manage multiple rust installations with ease
SourceLicense: MIT OR Apache-2.0
-# (Apache-2.0 OR MIT) AND BSD-3-Clause
# (MIT OR Apache-2.0) AND Unicode-DFS-2016
# 0BSD OR MIT OR Apache-2.0
# Apache-2.0
@@ -15,6 +14,7 @@ SourceLicense: MIT OR Apache-2.0
# Apache-2.0 OR ISC OR MIT
# Apache-2.0 OR MIT
# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# BSD-3-Clause
# ISC
# ISC AND MIT AND OpenSSL
# MIT
@@ -34,15 +34,16 @@ Source: %{url}/archive/%{version}/rustup-%{version}.tar.gz
Patch: 0001-Drop-Windows-specific-dependencies.patch
# * drop unavailable "openssl/vendored" feature
Patch: 0002-Drop-feature-for-statically-linking-against-vendored.patch
-# * bump "term" dependency from 0.5.1 to 0.7 (blocked upstream)
-Patch: 0003-Bump-term-dependency-from-0.5.1-to-0.7.patch
# * remove unused tracing support and unnecessary "rs_tracing" dependency
-Patch: 0004-Remove-unused-tracing-support.patch
+Patch: 0003-Remove-unused-tracing-support.patch
# * remove unused git-based versioning and unnecessary "git-testament"
dependency
-Patch: 0005-Remove-unused-git-based-versioning.patch
+Patch: 0004-Remove-unused-git-based-versioning.patch
+# * add powerpc64le and s390x to known target_arch values for tests
+Patch: 0005-Add-powerpc64-and-s390x-to-known-target_arch-values-.patch
+# * temporarily downgrade opener dependency from 0.7 to 0.6 to match cargo
+Patch: 0006-temporarily-downgrade-opener-dependency-from-0.7-to-.patch
-# rustup is only fully functional on Rust "Tier 1" architectures
-ExclusiveArch: x86_64 aarch64
+ExcludeArch: %{ix86}
BuildRequires: cargo-rpm-macros >= 24
@@ -56,7 +57,7 @@ Manage multiple rust installations with ease.}
%cargo_prep
%generate_buildrequires
-%cargo_generate_buildrequires
+%cargo_generate_buildrequires -f test
%build
%cargo_build -f no-self-update
@@ -80,7 +81,7 @@ install -Dpm 0644 _rustup -t %{buildroot}/%{zsh_completions_dir}
%check
# * skip tests that require internet access
# * skip tests for the "rustup" binary that is not built in this package
-%cargo_test -- -- --skip suite::cli_exact::check_updates --skip
suite::cli_ui::rustup_ui_doc_text_tests
+%cargo_test -f test -- -- --skip suite::cli_exact::check_updates --skip
suite::cli_ui::rustup_ui_doc_text_tests
%endif
%files
@@ -88,7 +89,6 @@ install -Dpm 0644 _rustup -t %{buildroot}/%{zsh_completions_dir}
%license LICENSE-MIT
%license LICENSE.dependencies
%doc CHANGELOG.md
-%doc CONTRIBUTING.md
%doc README.md
%{_bindir}/rustup-init
diff --git a/sources b/sources
index f732aa6..f8b58e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rustup-1.26.0.tar.gz) =
bc7cb580640248a601dbafb87c3a9e908b6c687377b4e0f88280576af15527f5837d9463f7831c14b0c274cd3170449e634cd851e0d03ea4ff1d0461d4a941be
+SHA512 (rustup-1.27.1.tar.gz) =
e0494678b7117464665c2aa88165e13baf2dcfb2a33c57dc78f669533111f773724d227ee05967de427845f8633e56fdf8159c7a5b96638413710beacb115075