[PR PATCH] Rust 1.74

[PR PATCH] Rust 1.74

[tranzystorekk]

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

There is a new pull request by tranzystorekk against master on the void-packages repository

https://github.com/tranzystorekk/void-packages rust
https://github.com/void-linux/void-packages/pull/47268

Rust 1.74
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/47268.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-47268.patch --]
[-- Type: text/x-diff, Size: 15385 bytes --]

From 663fb4936859a9b427949774effc7727193e2492 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 16 Nov 2023 17:30:48 +0100
Subject: [PATCH 1/4] rust-bootstrap: update to 1.74.0

---
 srcpkgs/rust-bootstrap/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index e0d3dc98c235f..7bec4cd59d373 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-bootstrap'
 pkgname=rust-bootstrap
-version=1.73.0
+version=1.74.0
 revision=1
 short_desc="Rust programming language bootstrap toolchain"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -31,24 +31,24 @@ case "$XBPS_TARGET_MACHINE" in
 		 ${_bootstrap_url}/rustc-${version}-i686-unknown-linux-gnu.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-i686-unknown-linux-gnu.tar.xz"
 		checksum="
-		 3d98a27c50ae79de7c7956506d649e169312e76b4fc2314a975b45ebd1dea5b9
-		 c46936bf3c921c90593b6ea77a08b1ec8b240c8184b287fd89fea636ac437b25"
+		 7a2bc1bf7e51942d32e82f461eacebe7f929c3eec210dcb7dc6624efd997d7da
+		 69757b72def9c433753e8bb575c817fc1ba389cf1a9c25276db1491ec025e495"
 		;;
 	x86_64)
 		distfiles="
 		 ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz"
 		checksum="
-		 14f383eb4d6e65ce01cc99f2c5cf5a78744239f29704f72fe84f11095af779f5
-		 96efb163a57b400152c357be0ea3a0dd902b56cc0df662b9ac951403c7c7b15b"
+		 7d464be2ae0d6ce69f056d1ea9a8ce2b3b1d537418caea216fdd303903972181
+		 548413213012e2f62b08ed8a913a51210ae7402619027224580176031f2789ea"
 		;;
 	x86_64-musl)
 		distfiles="
 		 ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz"
 		checksum="
-		 e885398a10f5f4697dfb2b4e399bf9a0805ee8c11b9f9365ba4d803fef34d779
-		 c89f5164edffbda4a21212c1e74260021634bda43fbe6d5e4fe9f7e85a79320c"
+		 ea527c377782513c57ba78717db81e4923e51348bbc098d57bd89b7fdca17ae7
+		 b9e825568ab975c792d691675cb43c9f32431178b3e0ecb7ed47fce5e6fedf1a"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From c835459ee08ffc2b8c7ca21d8d12bb1925dafee5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 16 Nov 2023 17:32:12 +0100
Subject: [PATCH 2/4] cargo-bootstrap: update to 1.74.0

---
 srcpkgs/cargo-bootstrap/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 8dfbfda30a9e0..cdc8fa178f222 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-bootstrap'
 pkgname=cargo-bootstrap
-version=1.73.0
+version=1.74.0
 revision=1
 short_desc="Bootstrap binaries of Rust package manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -24,15 +24,15 @@ esac
 case "$XBPS_TARGET_MACHINE" in
 	i686)
 		distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
-		checksum="8780f10eb3565b47f2616ccc1616c1a491a12a055976a25de551cb29e7f50390"
+		checksum="9f5b5226a69f95950a381ec5bb15dde7a90865a6df8aa0b470082a40d42d9f38"
 		;;
 	x86_64)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
-		checksum="7c3ce5738d570eaea97dd3d213ea73c8beda4f0c61e7486f95e497b7b10c4e2d"
+		checksum="f219386d4569c40b660518e99267afff428c13bf980bda7a614c8d4038d013f6"
 		;;
 	x86_64-musl)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
-		checksum="7e17d4e03d5a949e73d02866589e2010e8a070e025ead08a2030d8d8dc002054"
+		checksum="773f9be04a0de37fb6931e9806d3668512d5ce76062434da24a2c7f71426d244"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From 94b9fbfd1f868d2f6c57786a95304cadd0f5d4f7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 16 Nov 2023 17:33:26 +0100
Subject: [PATCH 3/4] rust: update to 1.74.0

---
 ...dlib-and-musl_root-from-musl-targets.patch | 40 +++++++++----------
 srcpkgs/rust/template                         |  4 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
index 093afb15cbab3..9248d6756544f 100644
--- a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
@@ -60,10 +60,10 @@ index 61553e71b..88f807a58 100644
      base
  }
 diff --git a/config.example.toml b/config.example.toml
-index 5c4bee875..bccf81b0a 100644
+index f3c2366d6..fa2b7726e 100644
 --- a/config.example.toml
 +++ b/config.example.toml
-@@ -573,14 +573,6 @@ changelog-seen = 2
+@@ -574,14 +574,6 @@ changelog-seen = 2
  # behavior -- this may lead to miscompilations or other bugs.
  #description = ""
  
@@ -136,7 +136,7 @@ index 2496c2a9d..9aff56181 100644
      }
  }
 diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index 9c68e5a78..09fb6a721 100644
+index 292ccc578..d1f5ff98a 100644
 --- a/src/bootstrap/compile.rs
 +++ b/src/bootstrap/compile.rs
 @@ -256,39 +256,7 @@ fn copy_self_contained_objects(
@@ -197,7 +197,7 @@ index 9c68e5a78..09fb6a721 100644
              if let Some(p) = builder.wasi_root(target) {
                  let root = format!(
 diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index 4821d20a8..b9743ce8b 100644
+index 836328f94..1d0dc3e98 100644
 --- a/src/bootstrap/config.rs
 +++ b/src/bootstrap/config.rs
 @@ -264,7 +264,6 @@ pub struct Config {
@@ -208,7 +208,7 @@ index 4821d20a8..b9743ce8b 100644
      pub prefix: Option<PathBuf>,
      pub sysconfdir: Option<PathBuf>,
      pub datadir: Option<PathBuf>,
-@@ -537,8 +536,6 @@ pub struct Target {
+@@ -522,8 +521,6 @@ pub struct Target {
      pub profiler: Option<StringOrBool>,
      pub rpath: Option<bool>,
      pub crt_static: Option<bool>,
@@ -217,7 +217,7 @@ index 4821d20a8..b9743ce8b 100644
      pub wasi_root: Option<PathBuf>,
      pub qemu_rootfs: Option<PathBuf>,
      pub no_std: bool,
-@@ -998,7 +995,6 @@ define_config! {
+@@ -979,7 +976,6 @@ define_config! {
          default_linker: Option<String> = "default-linker",
          channel: Option<String> = "channel",
          description: Option<String> = "description",
@@ -225,7 +225,7 @@ index 4821d20a8..b9743ce8b 100644
          rpath: Option<bool> = "rpath",
          verbose_tests: Option<bool> = "verbose-tests",
          optimize_tests: Option<bool> = "optimize-tests",
-@@ -1047,8 +1043,6 @@ define_config! {
+@@ -1028,8 +1024,6 @@ define_config! {
          profiler: Option<StringOrBool> = "profiler",
          rpath: Option<bool> = "rpath",
          crt_static: Option<bool> = "crt-static",
@@ -234,7 +234,7 @@ index 4821d20a8..b9743ce8b 100644
          wasi_root: Option<String> = "wasi-root",
          qemu_rootfs: Option<String> = "qemu-rootfs",
          no_std: Option<bool> = "no-std",
-@@ -1430,7 +1424,6 @@ impl Config {
+@@ -1412,7 +1406,6 @@ impl Config {
              set(&mut config.llvm_tools_enabled, rust.llvm_tools);
              config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
              config.rustc_default_linker = rust.default_linker;
@@ -242,7 +242,7 @@ index 4821d20a8..b9743ce8b 100644
              config.save_toolstates = rust.save_toolstates.map(PathBuf::from);
              set(
                  &mut config.deny_warnings,
-@@ -1615,8 +1608,6 @@ impl Config {
+@@ -1597,8 +1590,6 @@ impl Config {
                  target.ranlib = cfg.ranlib.map(PathBuf::from);
                  target.linker = cfg.linker.map(PathBuf::from);
                  target.crt_static = cfg.crt_static;
@@ -252,10 +252,10 @@ index 4821d20a8..b9743ce8b 100644
                  target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
                  target.sanitizers = cfg.sanitizers;
 diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 15e8c1eb9..7749fc54d 100755
+index f469dbea6..fe2441e2a 100755
 --- a/src/bootstrap/configure.py
 +++ b/src/bootstrap/configure.py
-@@ -110,34 +110,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
+@@ -111,34 +111,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
    "aarch64-linux-android NDK standalone path")
  v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
    "x86_64-linux-android NDK standalone path")
@@ -291,10 +291,10 @@ index 15e8c1eb9..7749fc54d 100755
    "riscv32gc-unknown-linux-musl install directory")
  v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root",
 diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index 4396bbc51..683ba5480 100644
+index 8b8d4b237..06c15d468 100644
 --- a/src/bootstrap/lib.rs
 +++ b/src/bootstrap/lib.rs
-@@ -1289,25 +1289,6 @@ impl Build {
+@@ -1291,25 +1291,6 @@ impl Build {
          }
      }
  
@@ -321,7 +321,7 @@ index 4396bbc51..683ba5480 100644
      fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
          self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p)
 diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
-index 7e83b508e..761e83ddc 100644
+index 0febdf250..c84f31d52 100644
 --- a/src/bootstrap/sanity.rs
 +++ b/src/bootstrap/sanity.rs
 @@ -11,7 +11,6 @@
@@ -332,11 +332,11 @@ index 7e83b508e..761e83ddc 100644
  use std::path::PathBuf;
  use std::process::Command;
  
-@@ -205,28 +204,6 @@ than building it.
-             }
+@@ -215,28 +214,6 @@ than building it.
+             continue;
          }
  
--        // Make sure musl-root is valid
+-        // Make sure musl-root is valid.
 -        if target.contains("musl") && !target.contains("unikraft") {
 -            // If this is a native target (host is also musl) and no musl-root is given,
 -            // fall back to the system toolchain in /usr before giving up
@@ -358,6 +358,6 @@ index 7e83b508e..761e83ddc 100644
 -            }
 -        }
 -
-         // Some environments don't want or need these tools, such as when testing Miri.
-         // FIXME: it would be better to refactor this code to split necessary setup from pure sanity
-         // checks, and have a regular flag for skipping the latter. Also see
+         if need_cmake && target.contains("msvc") {
+             // There are three builds of cmake on windows: MSVC, MinGW, and
+             // Cygwin. The Cygwin build does not have generators for Visual
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 7f560e029a2a6..2c893b20cf35a 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,7 +8,7 @@
 # uploaded to https://repo-default.voidlinux.org/distfiles/
 #
 pkgname=rust
-version=1.73.0
+version=1.74.0
 revision=1
 hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
 makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm15"
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://www.rust-lang.org/"
 distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=96d62e6d1f2d21df7ac8acb3b9882411f9e7c7036173f7f2ede9e1f1f6b1bb3a
+checksum=882b584bc321c5dcfe77cdaa69f277906b936255ef7808fcd5c7492925cf1049
 lib32disabled=yes
 make_check=no # CBA for now
 python_version=3 # needed for python files in rust-src

From c8b37704756cc17b0a4f6096b5a94466b4e68582 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 16 Nov 2023 17:34:14 +0100
Subject: [PATCH 4/4] cargo: update to 1.74.0

---
 srcpkgs/cargo/patches/downgrade-git2.patch | 67 ++++++++++++++++++++++
 srcpkgs/cargo/template                     |  6 +-
 2 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch

diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
new file mode 100644
index 0000000000000..ace10e7702981
--- /dev/null
+++ b/srcpkgs/cargo/patches/downgrade-git2.patch
@@ -0,0 +1,67 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index cc0cb9a..f6de424 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1006,11 +1006,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "git2"
+-version = "0.18.0"
++version = "0.17.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e"
++checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
+ dependencies = [
+- "bitflags 2.3.3",
++ "bitflags 1.3.2",
+  "libc",
+  "libgit2-sys",
+  "log",
+@@ -1021,9 +1021,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "git2-curl"
+-version = "0.19.0"
++version = "0.18.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
++checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
+ dependencies = [
+  "curl",
+  "git2",
+@@ -2003,9 +2003,9 @@ checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
+ 
+ [[package]]
+ name = "libgit2-sys"
+-version = "0.16.1+1.7.1"
++version = "0.15.2+1.6.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
++checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa"
+ dependencies = [
+  "cc",
+  "libc",
+diff --git a/Cargo.toml b/Cargo.toml
+index 4403044..1d50590 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -40,8 +40,8 @@ curl = "0.4.44"
+ curl-sys = "0.4.68"
+ filetime = "0.2.22"
+ flate2 = { version = "1.0.27", default-features = false, features = ["zlib"] }
+-git2 = "0.18.0"
+-git2-curl = "0.19.0"
++git2 = "0.17.2"
++git2-curl = "0.18.0"
+ gix = { version = "0.54.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
+ gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
+ glob = "0.3.1"
+@@ -58,7 +58,7 @@ itertools = "0.10.0"
+ jobserver = "0.1.26"
+ lazycell = "1.3.0"
+ libc = "0.2.148"
+-libgit2-sys = "0.16.1"
++libgit2-sys = "0.15.2"
+ libloading = "0.8.0"
+ memchr = "2.6.2"
+ miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 315a204429f5e..208c18818d570 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,8 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=1.73.0
+version=1.74.0
 revision=1
-_cargo_revision=0.74.0
+_cargo_revision=0.75.0
 build_helper=rust
 hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
 makedepends="rust libcurl-devel openssl-devel"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://crates.io/"
 distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz"
-checksum=a7ed5ec806f2b334f194380584e17538cc173ef18ec3fba4d7967dc5c1bd7565
+checksum=d6b9512bca4b4d692a242188bfe83e1b696c44903007b7b48a56b287d01c063b
 replaces="cargo-tree>=0"
 
 build_options="static bindist"

Re: Rust 1.74

[tranzystorekk]

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/47268#issuecomment-1815878894

Comment:
Results of `build_style=cargo` rebuild on x86_64:

## Failures

- gping: https://0x0.st/HvJx.txt cc @icp1994
- ion: https://0x0.st/HvJY.txt cc @konimex

Re: Rust 1.74

[tranzystorekk]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/47268#issuecomment-1815878894

Comment:
Results of `build_style=cargo` rebuild on x86_64:

## Failures

- gping: https://0x0.st/HvJx.txt cc @icp1994 (stil occurs in #47212)
- ion: https://0x0.st/HvJY.txt cc @konimex

Re: Rust 1.74

[icp1994]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/47268#issuecomment-1816045602

Comment:
It's fixed upstream, but not tagged. I have added the patch for now.

Re: [PR PATCH] [Merged]: Rust 1.74

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1070 bytes --]

There's a merged pull request on the void-packages repository

Rust 1.74
https://github.com/void-linux/void-packages/pull/47268

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->