From 1e2f8a8037fce4cd2d926a51fed1f278942cd0ac Mon Sep 17 00:00:00 2001
From: Havard Eidnes <he@NetBSD.org>
Date: Tue, 11 Oct 2022 22:29:42 +0000
Subject: [PATCH] rust: update to version 1.64.0.

Pkgsrc changes:
 * Add patch to fix vendor/kqueue issue (on 32-bit hosts)
 * Adjust other patches & line numbers
 * Version bumps & checksum changes.

Upstream changes:

Version 1.64.0 (2022-09-22)
===========================

Language
--------
- [Unions with mutable references or tuples of allowed types are
  now allowed](https://github.com/rust-lang/rust/pull/97995/)

- It is now considered valid to deallocate memory pointed to by a
  shared reference `&T` [if every byte in `T` is inside an
  `UnsafeCell`](https://github.com/rust-lang/rust/pull/98017/)

- Unused tuple struct fields are now warned against in an
  allow-by-default lint, [`unused_tuple_struct_fields`]
  (https://github.com/rust-lang/rust/pull/95977/), similar to the
  existing warning for unused struct fields. This lint will become
  warn-by-default in the future.

Compiler
--------
- [Add Nintendo Switch as tier 3 target]
  (https://github.com/rust-lang/rust/pull/88991/)
  - Refer to Rust's [platform support page][platform-support-doc] for more
    information on Rust's tiered platform support.
- [Only compile `#[used]` as llvm.compiler.used for ELF targets]
  (https://github.com/rust-lang/rust/pull/93718/)
- [Add the `--diagnostic-width` compiler flag to define the terminal width.]
  (https://github.com/rust-lang/rust/pull/95635/)
- [Add support for link-flavor `rust-lld` for iOS, tvOS and watchOS]
  (https://github.com/rust-lang/rust/pull/98771/)

Libraries
---------
- [Remove restrictions on compare-exchange memory ordering.]
  (https://github.com/rust-lang/rust/pull/98383/)
- You can now `write!` or `writeln!` into an `OsString`: [Implement
  `fmt::Write` for `OsString`](https://github.com/rust-lang/rust/pull/97915/)
- [Make RwLockReadGuard covariant]
  (https://github.com/rust-lang/rust/pull/96820/)
- [Implement `FusedIterator` for `std::net::[Into]Incoming`]
  (https://github.com/rust-lang/rust/pull/97300/)
- [`impl<T: AsRawFd> AsRawFd for {Arc,Box}<T>`]
  (https://github.com/rust-lang/rust/pull/97437/)
- [`ptr::copy` and `ptr::swap` are doing untyped copies]
  (https://github.com/rust-lang/rust/pull/97712/)
- [Add cgroupv1 support to `available_parallelism`]
  (https://github.com/rust-lang/rust/pull/97925/)
- [Mitigate many incorrect uses of `mem::uninitialized`]
  (https://github.com/rust-lang/rust/pull/99182/)

Stabilized APIs
---------------
- [`future::IntoFuture`]
  (https://doc.rust-lang.org/stable/std/future/trait.IntoFuture.html)
- [`future::poll_fn`]
  (https://doc.rust-lang.org/stable/std/future/fn.poll_fn.html)
- [`task::ready!`]
  (https://doc.rust-lang.org/stable/std/task/macro.ready.html)
- [`num::NonZero*::checked_mul`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_mul)
- [`num::NonZero*::checked_pow`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_pow)
- [`num::NonZero*::saturating_mul`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.saturating_mul)
- [`num::NonZero*::saturating_pow`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.saturating_pow)
- [`num::NonZeroI*::abs`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.abs)
- [`num::NonZeroI*::checked_abs`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.checked_abs)
- [`num::NonZeroI*::overflowing_abs`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.overflowing_abs)
- [`num::NonZeroI*::saturating_abs`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.saturating_abs)
- [`num::NonZeroI*::unsigned_abs`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.unsigned_abs)
- [`num::NonZeroI*::wrapping_abs`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroIsize.html#method.wrapping_abs)
- [`num::NonZeroU*::checked_add`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_add)
- [`num::NonZeroU*::checked_next_power_of_two`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.checked_next_power_of_two)
- [`num::NonZeroU*::saturating_add`]
  (https://doc.rust-lang.org/stable/std/num/struct.NonZeroUsize.html#method.saturating_add)
- [`os::unix::process::CommandExt::process_group`]
  (https://doc.rust-lang.org/stable/std/os/unix/process/trait.CommandExt.html#tymethod.process_group)
- [`os::windows::fs::FileTypeExt::is_symlink_dir`]
  (https://doc.rust-lang.org/stable/std/os/windows/fs/trait.FileTypeExt.html#tymethod.is_symlink_dir)
- [`os::windows::fs::FileTypeExt::is_symlink_file`]
  (https://doc.rust-lang.org/stable/std/os/windows/fs/trait.FileTypeExt.html#tymethod.is_symlink_file)

These types were previously stable in `std::ffi`, but are now also
available in `core` and `alloc`:

- [`core::ffi::CStr`]
  (https://doc.rust-lang.org/stable/core/ffi/struct.CStr.html)
- [`core::ffi::FromBytesWithNulError`]
  (https://doc.rust-lang.org/stable/core/ffi/struct.FromBytesWithNulError.html)
- [`alloc::ffi::CString`]
  (https://doc.rust-lang.org/stable/alloc/ffi/struct.CString.html)
- [`alloc::ffi::FromVecWithNulError`]
  (https://doc.rust-lang.org/stable/alloc/ffi/struct.FromVecWithNulError.html)
- [`alloc::ffi::IntoStringError`]
  (https://doc.rust-lang.org/stable/alloc/ffi/struct.IntoStringError.html)
- [`alloc::ffi::NulError`]
  (https://doc.rust-lang.org/stable/alloc/ffi/struct.NulError.html)

These types were previously stable in `std::os::raw`, but are now also available in `core::ffi` and `std::ffi`:

- [`ffi::c_char`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_char.html)
- [`ffi::c_double`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_double.html)
- [`ffi::c_float`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_float.html)
- [`ffi::c_int`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_int.html)
- [`ffi::c_long`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_long.html)
- [`ffi::c_longlong`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_longlong.html)
- [`ffi::c_schar`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_schar.html)
- [`ffi::c_short`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_short.html)
- [`ffi::c_uchar`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_uchar.html)
- [`ffi::c_uint`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_uint.html)
- [`ffi::c_ulong`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_ulong.html)
- [`ffi::c_ulonglong`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_ulonglong.html)
- [`ffi::c_ushort`]
  (https://doc.rust-lang.org/stable/std/ffi/type.c_ushort.html)

These APIs are now usable in const contexts:

- [`slice::from_raw_parts`]
  (https://doc.rust-lang.org/stable/core/slice/fn.from_raw_parts.html)

Cargo
-----
- [Packages can now inherit settings from the workspace so that
  the settings can be centralized in one place.]
  (https://github.com/rust-lang/cargo/pull/10859) See
  [`workspace.package`](https://doc.rust-lang.org/nightly/cargo/reference/workspaces.html#the-workspacepackage-table)
  and
  [`workspace.dependencies`](https://doc.rust-lang.org/nightly/cargo/reference/workspaces.html#the-workspacedependencies-table)
  for more details on how to define these common settings.
- [Cargo commands can now accept multiple `--target` flags to build
  for multiple targets at once]
  (https://github.com/rust-lang/cargo/pull/10766), and the
  [`build.target`](https://doc.rust-lang.org/nightly/cargo/reference/config.html#buildtarget)
  config option may now take an array of multiple targets.
- [The `--jobs` argument can now take a negative number to count
  backwards from the max CPUs.]
  (https://github.com/rust-lang/cargo/pull/10844)
- [`cargo add` will now update `Cargo.lock`.]
  (https://github.com/rust-lang/cargo/pull/10902)
- [Added](https://github.com/rust-lang/cargo/pull/10838) the
  [`--crate-type`](https://doc.rust-lang.org/nightly/cargo/commands/cargo-rustc.html#option-cargo-rustc---crate-type)
  flag to `cargo rustc` to override the crate type.
- [Significantly improved the performance fetching git dependencies from GitHub
  when using a hash in the `rev` field.]
  (https://github.com/rust-lang/cargo/pull/10079)

Misc
----
- [The `rust-analyzer` rustup component is now available on the stable channel.]
  (https://github.com/rust-lang/rust/pull/98640/)

Compatibility Notes
-------------------
- The minimum required versions for all `-linux-gnu` targets are
  now at least kernel 3.2 and glibc 2.17, for targets that previously
  supported older versions: [Increase the minimum linux-gnu
  versions](https://github.com/rust-lang/rust/pull/95026/)
- [Network primitives are now implemented with the ideal Rust
  layout, not the C system layout]
  (https://github.com/rust-lang/rust/pull/78802/). This can
  cause problems when transmuting the types.
- [Add assertion that `transmute_copy`'s `U` is not larger than `T`]
  (https://github.com/rust-lang/rust/pull/98839/)
- [A soundness bug in `BTreeMap` was fixed]
  (https://github.com/rust-lang/rust/pull/99413/) that allowed data
  it was borrowing to be dropped before the container.
- [The Drop behavior of C-like enums cast to ints has changed]
  (https://github.com/rust-lang/rust/pull/96862/). These are already
  discouraged by a compiler warning.
- [Relate late-bound closure lifetimes to parent fn in NLL]
  (https://github.com/rust-lang/rust/pull/98835/)
- [Errors at const-eval time are now in future incompatibility reports]
  (https://github.com/rust-lang/rust/pull/97743/)
- On the `thumbv6m-none-eabi` target, some incorrect `asm!` statements
  were erroneously accepted if they used the high registers (r8 to
  r14) as an input/output operand. [This is no longer accepted]
  (https://github.com/rust-lang/rust/pull/99155/).
- [`impl Trait` was accidentally accepted as the associated type
  value of return-position `impl Trait`]
  (https://github.com/rust-lang/rust/pull/97346/), without
  fulfilling all the trait bounds of that associated type, as long
  as the hidden type satisfies said bounds. This has been fixed.

Internal Changes
----------------

These changes do not affect any public interfaces of Rust, but they
represent significant improvements to the performance or internals
of rustc and related tools.

- Windows builds now use profile-guided optimization, providing
  10-20% improvements to compiler performance: [Utilize PGO for
  windows x64 rustc dist builds]
  (https://github.com/rust-lang/rust/pull/96978/)
- [Stop keeping metadata in memory before writing it to disk]
  (https://github.com/rust-lang/rust/pull/96544/)
- [compiletest: strip debuginfo by default for mode=ui]
  (https://github.com/rust-lang/rust/pull/98140/)
- Many improvements to generated code for derives, including
  performance improvements:
  - [Don't use match-destructuring for derived ops on structs.]
    (https://github.com/rust-lang/rust/pull/98446/)
  - [Many small deriving cleanups]
    (https://github.com/rust-lang/rust/pull/98741/)
  - [More derive output improvements]
    (https://github.com/rust-lang/rust/pull/98758/)
  - [Clarify deriving code](https://github.com/rust-lang/rust/pull/98915/)
  - [Final derive output improvements]
    (https://github.com/rust-lang/rust/pull/99046/)
  - [Stop injecting `#[allow(unused_qualifications)]` in generated
    `derive` implementations](https://github.com/rust-lang/rust/pull/99485/)
  - [Improve `derive(Debug)`](https://github.com/rust-lang/rust/pull/98190/)
- [Bump to clap 3](https://github.com/rust-lang/rust/pull/98213/)
- [fully move dropck to mir](https://github.com/rust-lang/rust/pull/98641/)
- [Optimize `Vec::insert` for the case where `index == len`.]
  (https://github.com/rust-lang/rust/pull/98755/)
- [Convert rust-analyzer to an in-tree tool]
  (https://github.com/rust-lang/rust/pull/99603/)
---
 rust/Makefile                                 |  56 ++--
 rust/buildlink3.mk                            |   2 +-
 rust/distinfo                                 | 242 +++++++++---------
 rust/do-cross.mk                              |   6 +-
 ...ler_rustc__codegen__ssa_src_back_linker.rs |   2 +-
 .../patch-compiler_rustc__llvm_build.rs       |   2 +-
 ...tch-compiler_rustc__target_src_spec_mod.rs |   2 +-
 .../patch-library_std_src_sys_unix_mod.rs     |   2 +-
 .../patch-library_std_src_sys_unix_thread.rs  |   2 +-
 rust/patches/patch-library_unwind_build.rs    |   2 +-
 rust/patches/patch-src_bootstrap_bootstrap.py |   8 +-
 rust/patches/patch-src_bootstrap_builder.rs   |  16 +-
 rust/patches/patch-src_bootstrap_compile.rs   |   2 +-
 rust/patches/patch-src_bootstrap_lib.rs       |   2 +-
 ...patch-src_llvm-project_llvm_CMakeLists.txt |   2 +-
 ...m-project_llvm_cmake_modules_AddLLVM.cmake |   2 +-
 ...src_tools_cargo_src_cargo_core_profiles.rs |   2 +-
 rust/patches/patch-vendor_cc_src_lib.rs       |   2 +-
 rust/patches/patch-vendor_kqueue_src_time.rs  |  48 ++++
 ....119_src_unix_bsd_netbsdlike_netbsd_mod.rs |  29 ---
 ...libc_src_unix_bsd_netbsdlike_netbsd_mod.rs |   2 +-
 ...patch-vendor_libc_src_unix_solarish_mod.rs |   2 +-
 .../patch-vendor_openssl-src_src_lib.rs       |  12 +-
 ...patch-vendor_target-lexicon_src_targets.rs |   2 +-
 24 files changed, 232 insertions(+), 217 deletions(-)
 create mode 100644 rust/patches/patch-vendor_kqueue_src_time.rs
 delete mode 100644 rust/patches/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs

diff --git a/rust/Makefile b/rust/Makefile
index 60c12986eb8..1bc142e1cf0 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.197 2020/09/29 16:45:16 gdt Exp $
 
-DISTNAME=	rustc-1.63.0-src
+DISTNAME=	rustc-1.64.0-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
@@ -186,49 +186,49 @@ BUILDLINK_TRANSFORM+=	opt:x86_64:arm64
 DISTFILES:=		${DEFAULT_DISTFILES}
 
 .if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.62.1
+RUST_STAGE0_VER=	1.63.0
 RUST_ARCH:=		aarch64-apple-darwin
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.62.1
+RUST_STAGE0_VER=	1.63.0
 RUST_ARCH:=		x86_64-apple-darwin
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.62.1
+RUST_STAGE0_VER=	1.63.0
 RUST_ARCH:=		aarch64-unknown-linux-gnu
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.62.1
+RUST_STAGE0_VER=	1.63.0
 RUST_ARCH:=		arm-unknown-linux-gnueabihf
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.62.1
+RUST_STAGE0_VER=	1.63.0
 RUST_ARCH:=		armv7-unknown-linux-gnueabihf
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.62.1
+RUST_STAGE0_VER=	1.63.0
 RUST_ARCH:=		i686-unknown-linux-gnu
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.62.1
+RUST_STAGE0_VER=	1.63.0
 RUST_ARCH:=		x86_64-unknown-linux-gnu
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -240,7 +240,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 # x86_64-sun-solaris bootstrap and comment out the overrides.
 #
 .if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.62.0
+RUST_STAGE0_VER=	1.63.0
 RUST_ARCH:=		x86_64-unknown-illumos
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 SITES.${RUST_STAGE0}=	https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
@@ -253,14 +253,14 @@ CONFIGURE_ARGS+=	--host=${RUST_ARCH}
 CONFIGURE_ARGS+=	--target=${RUST_ARCH}
 .endif
 .if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.62.1
+RUST_STAGE0_VER=	1.63.0
 RUST_ARCH:=		x86_64-unknown-freebsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.62.1
+RUST_STAGE0_VER=	1.63.0
 RUST_ARCH=		i586-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -280,14 +280,14 @@ pre-build-fix-paxctl:
 	${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.62.1
+RUST_STAGE0_VER=	1.63.0
 RUST_ARCH=		x86_64-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.62.1
+RUST_STAGE0_VER=	1.63.0
 RUST_ARCH=		powerpc-unknown-netbsd
 
 # Cross-built against NetBSD 9.0
@@ -310,7 +310,7 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=		1.62.1
+RUST_STAGE0_VER=		1.63.0
 RUST_ARCH=			aarch64-unknown-netbsd
 RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -319,7 +319,7 @@ SITES.${RUST_STAGE0}=		${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64eb) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=		1.62.1
+RUST_STAGE0_VER=		1.63.0
 RUST_ARCH=			aarch64_be-unknown-netbsd
 RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -328,7 +328,7 @@ SITES.${RUST_STAGE0}=		${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=		1.62.1
+RUST_STAGE0_VER=		1.63.0
 RUST_ARCH=			sparc64-unknown-netbsd
 RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -338,7 +338,7 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
 RUST_ARCH=			armv7-unknown-netbsd-eabihf
-RUST_STAGE0_VER=		1.62.1
+RUST_STAGE0_VER=		1.63.0
 RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 DISTFILES:=			${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -377,13 +377,13 @@ SUBST_VARS.rpath=	PREFIX
 # updating and verification.
 #
 
-CKSUM_CRATES+=	vendor/cc-1.0.69
-CKSUMS+=	6dde684bdcc1bb03a808784ce8ccc0721f53bfdf87b84c607045aada916730ba
-CKSUMS+=	dd09a6ad92c998b3cc15d81b3b56a70544886fe0c22d659406aa25d734fe2fd1
+CKSUM_CRATES+=	vendor/cc
+CKSUMS+=	38970d678de0efb4b5e2978265daa8a613a1db35fc42e669621b03fc56d5b138
+CKSUMS+=	1a5dd77a916141a3398372a99278e05cfa9ec9ff56c99325afca6a6b7375c300
 
 CKSUM_CRATES+=	vendor/libc
-CKSUMS+=	8826303cad14a575fa8189f67c7df52a7e11f8eea0381d7d389ff8206757de9e
-CKSUMS+=	f79ec5ad2156182d51cf70d80401293da6f8277983dbdedfd2e6927133440e42
+CKSUMS+=	cb1560bf8ffcc7b2726a27b433efac90e726292960626f3064bd2c6b7f861a55
+CKSUMS+=	683f56837b31b9f0f5bace3080c5242b86f57f71d1126e352be24af9874ab531
 CKSUMS+=	976b07a13e195840b67c166a62318abfa9ffc8d5ebbb0358f199dd213ec98d1b
 CKSUMS+=	ee760c856bb491d885e9458fb723c53db7988ba775e59ab5b9ee8be438e69cf4
 CKSUMS+=	cb1560bf8ffcc7b2726a27b433efac90e726292960626f3064bd2c6b7f861a55
@@ -393,13 +393,21 @@ CKSUM_CRATES+=	vendor/lzma-sys
 CKSUMS+=	6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
 CKSUMS+=	5e252578b5d266f6a4c8dc9f71ca7a91536ccb8c5c7d7753b82f12ec886459ef
 
+CKSUM_CRATES+=	vendor/cc-1.0.69
+CKSUMS+=	6dde684bdcc1bb03a808784ce8ccc0721f53bfdf87b84c607045aada916730ba
+CKSUMS+=	dd09a6ad92c998b3cc15d81b3b56a70544886fe0c22d659406aa25d734fe2fd1
+
 CKSUM_CRATES+=	vendor/stacker
 CKSUMS+=	cee329550bad2ed1182abb71db9c24558a91b12e1eab8d9a48e23b997bb8f04e
 CKSUMS+=	79915b243d02df1dc698f5c2de3a9356c6c296d2dedb06d9035dbcc2f8972cf4
 
 CKSUM_CRATES+=	vendor/openssl-src
-CKSUMS+=	65a4daf6f0d6ad80a83d63614288c3a9df9adcebe5f3d7ff2ad34dd3d2c75196
-CKSUMS+=	7ff3cb1d807d93defda37c2ec01e01223295bcc3d20d218436c07e89cae80fe2
+CKSUMS+=	40cd1069246b552b04fcdfd13eb77b3a89194192f18c426b77377a78abbfd72f
+CKSUMS+=	e74a32c20fad79380ec9009ac4469bd71d5fec442b66f2b8c547c3e607fd4d77
+
+CKSUM_CRATES+=	vendor/kqueue
+CKSUMS+=	900a966152b8fdccc4e953df94fa27024cb473f57f49df06cd8f2acaac869787
+CKSUMS+=	9bf215b1d26d7f12def8cbc3cdc2f89eabe9249f040911c4a44792fb417cc0fd
 
 SUBST_CLASSES+=		cksum
 SUBST_STAGE.cksum=	pre-configure
diff --git a/rust/buildlink3.mk b/rust/buildlink3.mk
index cdf54a8dc92..1e4c6a9c9d2 100644
--- a/rust/buildlink3.mk
+++ b/rust/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_TREE+=	rust
 .if !defined(RUST_BUILDLINK3_MK)
 RUST_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.rust+=	rust>=1.20.0
+BUILDLINK_API_DEPENDS.rust+=	rust>=1.56.1
 BUILDLINK_PKGSRCDIR.rust?=	../../wip/rust
 BUILDLINK_PASSTHRU_DIRS+=	${PREFIX}/lib/rustlib
 .endif
diff --git a/rust/distinfo b/rust/distinfo
index d79030aa6a4..10599f3d58e 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -1,128 +1,128 @@
 $NetBSD: distinfo,v 1.118 2020/08/06 11:42:56 jperkin Exp $
 
-BLAKE2s (rust-1.62.0-x86_64-unknown-illumos.tar.gz) = 2732461c3d84cd516563afedc5513f377e3a6796c931ef03601fdcbcc4e6fe33
-SHA512 (rust-1.62.0-x86_64-unknown-illumos.tar.gz) = e99f53fd801d09f28dfd0568a8f2e97a5c4d5d0de7bea28f5afdc91d02f27ff887627f7717c032b90af412e4c04fc11c80c91f42e4b8dab885a311d56fdd5542
-Size (rust-1.62.0-x86_64-unknown-illumos.tar.gz) = 197829953 bytes
-BLAKE2s (rust-1.62.1-aarch64-apple-darwin.tar.gz) = 95884eba580edfe3fc8e41aa48a01d7b881e849350598358422d3e5fd20e5d55
-SHA512 (rust-1.62.1-aarch64-apple-darwin.tar.gz) = 11d32205ef962b7bd19209dc4e2627d97d97392f333f712c26f5b9b4d2ea895608e5dfbf38280e0433b9da9e5cd037a182b9ac4a744dd188540b491bd5dc19ad
-Size (rust-1.62.1-aarch64-apple-darwin.tar.gz) = 226819968 bytes
-BLAKE2s (rust-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = d0414d0746877449f3aea03ad2ee8564d6878aa75471c9402d37fb227b0a76cf
-SHA512 (rust-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = efc20cdab9d15d0d80ce842d10a315260932e6b8e7bf076112f85b1c2cb7526b5761b9c49571880e8818ad6f7c2ce53d379d72eb40aafc65de6e5825c7175598
-Size (rust-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = 391230027 bytes
-BLAKE2s (rust-1.62.1-aarch64-unknown-netbsd.tar.xz) = 9d297948e81774780669461261048e6964e38b991301bcb1e72d002f567fe642
-SHA512 (rust-1.62.1-aarch64-unknown-netbsd.tar.xz) = 609469f1938a6bd88089391605d708228ab760c09f2624d2c89fc2ae2f17ca466aeba96fecb7a31f5e18fc9b175b47c80ce8f425b015fe2a8fb3fd2684220c28
-Size (rust-1.62.1-aarch64-unknown-netbsd.tar.xz) = 153006012 bytes
-BLAKE2s (rust-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 98f0839e7c3886381279e9c32b9a203c5912db46c437f47f4af9f2be65ab5a11
-SHA512 (rust-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 06e9254a8e31bba1eee83d5851a1dfdb17671863f3370325827f16cbaa9b264ab3dfdad33f4c212e5afb1a1653aa159fd34c11b3f448cc28f21c0de95f0b0950
-Size (rust-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 152149492 bytes
-BLAKE2s (rust-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = 3e6364849b34f8f8c309ff80094b3a74b6b4c3e182e554f6e1cc5b395143d450
-SHA512 (rust-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = aae29513d35aeb550f0e8372849d39baf868406aa30804b808fb0e13f3125694f1602c1645d2a63d2d036196e4de7b8d4fd85b3e61a87d48f29a19e62a7b2630
-Size (rust-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = 321045815 bytes
-BLAKE2s (rust-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = f66caf358af54016ed655a57585025c3f91a4199ab4845132a42b61b6b40ef94
-SHA512 (rust-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = dd5498837e07b3f41a67f0aec6f77c5f2026cf3723b5f6931621e2d8921bacf6eed6dfa2f1d81dd6b69ac839334e0fd74201f60209da8607916a2834b5e463a9
-Size (rust-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = 312568849 bytes
-BLAKE2s (rust-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = 3ea6b09bfb7a4f5fbbda3977739bdad66fe1ec4a4f47cdf23379f706ee257918
-SHA512 (rust-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = cf6a142404aebabf9196ea39095034984bd2f6582711527e341dddc35acca23e19d5f5769bfcf99a623a2d746664621c56cc7055796bd1983df84fa5bb3864a0
-Size (rust-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = 134947696 bytes
-BLAKE2s (rust-1.62.1-i586-unknown-netbsd.tar.xz) = 17aa9922d662804485cd242979ebea0c5404bc508a434c1697f2beb9150046c6
-SHA512 (rust-1.62.1-i586-unknown-netbsd.tar.xz) = 3169dbcd30e3bd766e3ebe896c0963ba3875683da5cf192e933903423147d6bb463fa9223990e6766c802b0a8aba52d8da099ff068bb34008ba57ba705ba1355
-Size (rust-1.62.1-i586-unknown-netbsd.tar.xz) = 165954144 bytes
-BLAKE2s (rust-1.62.1-i686-unknown-linux-gnu.tar.gz) = 0fe5431cd25ca1eb5b0029d88a387934f8ce4cedc9991914561f9429c390328f
-SHA512 (rust-1.62.1-i686-unknown-linux-gnu.tar.gz) = b0948781b4ae987f297e22dcbf81446837536af26994dfa30bd1fd5be050ed613d9f4114105c1b71cce03d3cb8e4d105e23285bf1f5cdd372b45dd63c0fb9f12
-Size (rust-1.62.1-i686-unknown-linux-gnu.tar.gz) = 368878800 bytes
-BLAKE2s (rust-1.62.1-powerpc-unknown-netbsd.tar.xz) = b2d8e8e82e555bccfae49c3ecb7f710e5387d2fab724aae9fe85707d2cea7e45
-SHA512 (rust-1.62.1-powerpc-unknown-netbsd.tar.xz) = 8800cc0e387ab9a4576ef581da70cccf5b9bc5cff1889e36654ab2f05fe8f10be5b43322a4f160a7f2ab94792c3202aeaa0b3b0eacf7afbec0182fb6c3637b5a
-Size (rust-1.62.1-powerpc-unknown-netbsd.tar.xz) = 169776912 bytes
-BLAKE2s (rust-1.62.1-powerpc-unknown-netbsd90.tar.xz) = b730c7c724860331fb3d53ec2807147acc6734c12e23419e5a950347e6e1239e
-SHA512 (rust-1.62.1-powerpc-unknown-netbsd90.tar.xz) = bbc739c9bfea90a74a06ed6afa43e6ff1ca0ed2a7a66fa25269cf6d09cfb40fce50f240d81bd8821a3c42e738d876b0e73c6b1b8b5242f399d3f907051bc3e94
-Size (rust-1.62.1-powerpc-unknown-netbsd90.tar.xz) = 177559744 bytes
-BLAKE2s (rust-1.62.1-sparc64-unknown-netbsd.tar.xz) = ffdc19c697f49dd575abe6617c658e354e73f4a77c9395275a14ebf321b3e3d1
-SHA512 (rust-1.62.1-sparc64-unknown-netbsd.tar.xz) = 91a1a477ab0c797949610a287e6bfd23e50ce1007fa8fa69bdebb4b29de689813d093be3c6d7bcf2ba57415af92416cb741beb9377fe9bb1c2215a59c3a49c57
-Size (rust-1.62.1-sparc64-unknown-netbsd.tar.xz) = 149239740 bytes
-BLAKE2s (rust-1.62.1-x86_64-apple-darwin.tar.gz) = 7125c2c82f869d3f80591165bf249237770a1fa6c2b539c49e7bf5f85f232295
-SHA512 (rust-1.62.1-x86_64-apple-darwin.tar.gz) = e97dae43eaa0fb621a68408409f3ab7f34f26f6fa9c301a3435d6a4b5dd04e9fa2fdc9bbe5aa6dd0bad6f8c72db3af89f5147cf64cbe60dcaa93c93cede3a3a5
-Size (rust-1.62.1-x86_64-apple-darwin.tar.gz) = 291881993 bytes
-BLAKE2s (rust-1.62.1-x86_64-unknown-freebsd.tar.gz) = b44a4316025cf81b7acc3b4d42f40cb1f0b38492089741fed6037d8fe3a2ad35
-SHA512 (rust-1.62.1-x86_64-unknown-freebsd.tar.gz) = 160200cf8395e084c4bfc8dd403af67cbc883bce41df1337125d74044b75d6cd227ace44e3400ddcd7f0b84a9cda26657d3d9b33582490c98b93992f8cc4ae6c
-Size (rust-1.62.1-x86_64-unknown-freebsd.tar.gz) = 287568888 bytes
-BLAKE2s (rust-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 7a0660bdf1e7a653686d9b6b0b3ff878b4f551f8de586fa7de03d5e89ae565fe
-SHA512 (rust-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 55125402c787df1c7cf10145902cd882077baa1bef032db71dbed46d1ed467f838e5d88c51753475fe84a89b61b557c895804aef134f6a0e2b016f3c7e68e164
-Size (rust-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 265631587 bytes
-BLAKE2s (rust-1.62.1-x86_64-unknown-netbsd.tar.xz) = 94e420fe58a0af5359d5947774e3eb89576eeac81830dceaf884474d40f07032
-SHA512 (rust-1.62.1-x86_64-unknown-netbsd.tar.xz) = ff1051a9152cc5706c8c6d6be6d23d73b913313bfc4e8212196f2356503f8016f26c9fc5551564a5d7063a801038ea719024dadca0cded60f47b1d7263737e72
-Size (rust-1.62.1-x86_64-unknown-netbsd.tar.xz) = 172701916 bytes
-BLAKE2s (rust-std-1.62.1-aarch64-apple-darwin.tar.gz) = a7ad0d562f59962afa64b81c70db13c6d669911a1d3a15da95325930f007b159
-SHA512 (rust-std-1.62.1-aarch64-apple-darwin.tar.gz) = 205dd929ca91999d2377ef474af557d55c18372ff1825d19ebff214903979da02058bb664bc5ffb0989b8b641642249600f2e16bbb5ce4f5b55e2500b28cbce0
-Size (rust-std-1.62.1-aarch64-apple-darwin.tar.gz) = 39464902 bytes
-BLAKE2s (rust-std-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = 40e29a9153706a8d899c3164899c6bd9ebf1cac35d1776a28cb9205b8f663f8e
-SHA512 (rust-std-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = 0a80fb1d155d2d56b2a0ec5fa93114c67c3eafb4fa4335536eb1b883e1bccb5cf69594ead247195fa1b5e7eec7481bb35959b2b6f10e49b982d83d2152e89545
-Size (rust-std-1.62.1-aarch64-unknown-linux-gnu.tar.gz) = 56992887 bytes
-BLAKE2s (rust-std-1.62.1-aarch64-unknown-netbsd.tar.xz) = b1525521d522b64edb248223d78584b3ed4d9b63608b7f1c0c3f06ba76ebf95d
-SHA512 (rust-std-1.62.1-aarch64-unknown-netbsd.tar.xz) = 764a3479a197ec77a3f4ca9c1ed03c79616ae49518e696d7caa8672806356439108779e6ab92b6bc1a86c8d14aea06bbaab4bbf802bcfe4d2c00679e0ecd429e
-Size (rust-std-1.62.1-aarch64-unknown-netbsd.tar.xz) = 22650524 bytes
-BLAKE2s (rust-std-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 3010fa11f7ee3f45c6c421372f45f98a633265638e596ed67468256d1946e0d4
-SHA512 (rust-std-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = deeec40da779492ee73494de41949c8f5f0670e4a3fa163d1393a36ec3d9d6ef13946b18ed37e83363fe3f0d7560a8922f6ee3158b11a8a9f4693db99d13cacc
-Size (rust-std-1.62.1-aarch64_be-unknown-netbsd.tar.xz) = 22464008 bytes
-BLAKE2s (rust-std-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = b7f165cddba9d738a372cc0905bb80ae1c8b0ea85c255a72b7fe5d9387d74ab3
-SHA512 (rust-std-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = 49b90056ca67cdb0bb8c9a5803c6074bd620c964037d71fbb1de4cecdc6dd9f655e0e66ba605db3af783a62eb863eadacc1275b1103ac03559ddb1290b50a1ed
-Size (rust-std-1.62.1-arm-unknown-linux-gnueabihf.tar.gz) = 35692832 bytes
-BLAKE2s (rust-std-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = 69d4685e118e25bf65bfc22675bc6fc6906f35ba475a8eb34e09f0a8d94e7bee
-SHA512 (rust-std-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = 665f0b49572017ef9035acdd587df02b779053ee288660c25410fc01cd4ad76c01754fec9573c2ef699642c6b65a1c195447ca06399cbe2ec29e489c84390d94
-Size (rust-std-1.62.1-armv7-unknown-linux-gnueabihf.tar.gz) = 37547880 bytes
-BLAKE2s (rust-std-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = 116abcf083beaf6592a7b268694cd22005c81871a6c6d28d2784a6eb51b7ca83
-SHA512 (rust-std-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = aba210f8bbaadaf365e72fbbceb7ac862c06fe01e9be5c4de04b5420f1c17097f5197b7e1475ee36690fad46419e0400adc8473ae4906a48ade069e34fe5eeb2
-Size (rust-std-1.62.1-armv7-unknown-netbsd-eabihf.tar.xz) = 21749880 bytes
-BLAKE2s (rust-std-1.62.1-i586-unknown-netbsd.tar.xz) = 4aab9d204a04b9ab9fa54416161730330404cbf4ece0fd7de0094570941b5609
-SHA512 (rust-std-1.62.1-i586-unknown-netbsd.tar.xz) = 9289ecea292a1e29e2b420185cc8445bcefcadf50ff0069a4b49a2e8364b70052925d59d05c5c1427a43e0d85357219c95723ffc4df82041954fd8074b0267dc
-Size (rust-std-1.62.1-i586-unknown-netbsd.tar.xz) = 22647628 bytes
-BLAKE2s (rust-std-1.62.1-i686-unknown-linux-gnu.tar.gz) = 61ef685652975dce70e0df29c0f0cdcb768f4762102fc1dbaaa39fe99f7e16b7
-SHA512 (rust-std-1.62.1-i686-unknown-linux-gnu.tar.gz) = 1b151013827bc9ced16589bb8ea379a292ad0343236a48f4d7ad945b71c4e50ab2c269c440c0fbdcaa28fccb379449c7958f7f0bc70ff7e7aa3d0777f1d6c668
-Size (rust-std-1.62.1-i686-unknown-linux-gnu.tar.gz) = 39451796 bytes
-BLAKE2s (rust-std-1.62.1-powerpc-unknown-netbsd.tar.xz) = 4d2341868558edc8cdd59d8244dc4e7c9ff3170eb347b382ddf84daf8367cf84
-SHA512 (rust-std-1.62.1-powerpc-unknown-netbsd.tar.xz) = ab05aa5b6b34608e2b72266d0b2d9c937be727dc2a914ae4ab83a00c50c89927e85c3f3fe34e82131aca3d7c40835da791c4eb6afba3558f55c6518b82dbb770
-Size (rust-std-1.62.1-powerpc-unknown-netbsd.tar.xz) = 20522208 bytes
-BLAKE2s (rust-std-1.62.1-powerpc-unknown-netbsd90.tar.xz) = b5fd541cb5ed7d6ec45e3ac122521d3268129a6a54a6f545118ed703170c310a
-SHA512 (rust-std-1.62.1-powerpc-unknown-netbsd90.tar.xz) = 9fbc7ec69db6652f80c1e5f9fe5f087e3fa82d25c0f6c0137af4d7020a208175a8372d0ae0e407c3b67fee8eb5319a3f41746de97f3be95ceb443e401733207e
-Size (rust-std-1.62.1-powerpc-unknown-netbsd90.tar.xz) = 20519232 bytes
-BLAKE2s (rust-std-1.62.1-sparc64-unknown-netbsd.tar.xz) = 8f9c9961e18d345893d8a8e37324883de682d08049a91ed321aef123fae3b0f2
-SHA512 (rust-std-1.62.1-sparc64-unknown-netbsd.tar.xz) = e9a355ecc772acc90d382c5333e6b5195a91b284a9f4a4c68a6fe8e8805ac2505bd68191f34c0e3332a4ee2577e324aff7055257eb562b139552d91c8217bcb7
-Size (rust-std-1.62.1-sparc64-unknown-netbsd.tar.xz) = 20607296 bytes
-BLAKE2s (rust-std-1.62.1-x86_64-apple-darwin.tar.gz) = 24589c5da00d22c1727eaf7149ea613e6216d8e81be55971fe2a95afa7c21c6a
-SHA512 (rust-std-1.62.1-x86_64-apple-darwin.tar.gz) = 7693dbcd780fee8b2f4372f86ca1c0c3620280cf3b20ee9bf155ff32e410a7faa263545b5a8f51b1e77597eeb5b357dd070fe95e1f132db92bcc38afcbd3d4a4
-Size (rust-std-1.62.1-x86_64-apple-darwin.tar.gz) = 40146874 bytes
-BLAKE2s (rust-std-1.62.1-x86_64-unknown-freebsd.tar.gz) = aff2086bb0de53f4e5af1d54798d872dad6ef67ee56a97a78eefad39fe82dfe8
-SHA512 (rust-std-1.62.1-x86_64-unknown-freebsd.tar.gz) = 4de5cd33c06430fbd77f484baa440508aacb62252995bee56dd4653855312c1b438e2005941411a89613ea247413b311fd60b235fd30c13253fcd291ccfd2dab
-Size (rust-std-1.62.1-x86_64-unknown-freebsd.tar.gz) = 42381072 bytes
-BLAKE2s (rust-std-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 578e330e17e1cd7d5c5ee632a53a980ab5ce3669f13a480896e1033f4c1d3832
-SHA512 (rust-std-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 912cb0b0f3bfe296300ca9764ea3695716e674600ada36a7252a7e5fceadff2afca65f6a3aac80e3303425e177ecf1b0db1dcfc48aad0eb573f1d2db112e6692
-Size (rust-std-1.62.1-x86_64-unknown-linux-gnu.tar.gz) = 43773106 bytes
-BLAKE2s (rust-std-1.62.1-x86_64-unknown-netbsd.tar.xz) = 99769fb8e8fd92d22e53227ded03d207c4ddeabf1cfb3f1088edfc637727e2be
-SHA512 (rust-std-1.62.1-x86_64-unknown-netbsd.tar.xz) = d72824448ce83c94ec2b559a5fc769c8a8441293df4ca9b491e91ee1c42c0159ec8e2bbc9eaaa68e2d31b889a257d8d5743ef62ec10786caf5f017a8c5e3eca2
-Size (rust-std-1.62.1-x86_64-unknown-netbsd.tar.xz) = 25464592 bytes
-BLAKE2s (rustc-1.63.0-src.tar.gz) = 0fd32c49a5e919cc01a7f8faefe66132c4462b5a1275115427ec879c007da894
-SHA512 (rustc-1.63.0-src.tar.gz) = 8c4ce20f0e6ddf86c13e24f222846dbcddc6b8fccc5490b1c41877df3ecf2543bf5fd88431d2e6d23280f90c0395f0d812b4ad7c13098128b043669660911299
-Size (rustc-1.63.0-src.tar.gz) = 203449048 bytes
-SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = a9a891b9c507958354fb819587d6d4b31ff83ce6
-SHA1 (patch-compiler_rustc__llvm_build.rs) = bcc6ed331eebf0589a100d53b29182659596d90b
+BLAKE2s (rust-1.63.0-aarch64-apple-darwin.tar.gz) = 8b6bb1a17756ad68c516afc05fd0f2760c9608975e65399781b1fc85bd7d91bf
+SHA512 (rust-1.63.0-aarch64-apple-darwin.tar.gz) = f8bca4ac150db2296ea1be8ef7cd887e5a9e2dfbc7a7fb4c5f8d31c539ffdf58aa9d46611a281bd718c6272a85fca2aef60d1838a9a27b0b622e9d50e33cc1e6
+Size (rust-1.63.0-aarch64-apple-darwin.tar.gz) = 228229488 bytes
+BLAKE2s (rust-1.63.0-aarch64-unknown-linux-gnu.tar.gz) = 58ede5121c9ee8b61edfa792771851da61b75a08e63379f9b836395e9e61bbb5
+SHA512 (rust-1.63.0-aarch64-unknown-linux-gnu.tar.gz) = 04d2a917e64c66b15cda3bbe9353d61737c57eb1ee4d9a2207d976b9f8f588e447f8682c7f87cf33cbc3cf14c37195795c8f259202509d3229ce9c5c175311f4
+Size (rust-1.63.0-aarch64-unknown-linux-gnu.tar.gz) = 391767348 bytes
+BLAKE2s (rust-1.63.0-aarch64-unknown-netbsd.tar.xz) = 6aa93fab83a104585c44d4bc78e4ad3e46e37ae907e2e23c5a56a11903e54876
+SHA512 (rust-1.63.0-aarch64-unknown-netbsd.tar.xz) = 690348f679f2d9d6af8b4ce648e6a68cd83bd724906566cdbf4a5e56e75d5aa596b5dc702807baef8296883a94bafdb0c6506a8de1f764271d07b6950a9115de
+Size (rust-1.63.0-aarch64-unknown-netbsd.tar.xz) = 153412536 bytes
+BLAKE2s (rust-1.63.0-aarch64_be-unknown-netbsd.tar.xz) = 0b3fed187c6701c687e028857085f5c09fd4a93bb67b91897c938c5a52427c69
+SHA512 (rust-1.63.0-aarch64_be-unknown-netbsd.tar.xz) = 766344c17c59007fe3c6fdfd4caefb9bf0eec3b6c8fec878744f71979069e3edafc3b023727341f9526c7c5169b13d0fc234a0e3f5118858218149a5c7d85a08
+Size (rust-1.63.0-aarch64_be-unknown-netbsd.tar.xz) = 152749160 bytes
+BLAKE2s (rust-1.63.0-arm-unknown-linux-gnueabihf.tar.gz) = dcb4cc227039a5ee59606b30e29e6172b56eb86590a248e9483d6b4234070d2d
+SHA512 (rust-1.63.0-arm-unknown-linux-gnueabihf.tar.gz) = e27cb6f86ef5c5fd4466afe37a34e09f910a0a09a7a7f98c735831a89983de83d447569165dd44c49fc6511aa37d065742748e222d03e240d519d011c5dbd73c
+Size (rust-1.63.0-arm-unknown-linux-gnueabihf.tar.gz) = 321731846 bytes
+BLAKE2s (rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.gz) = af2f939e619d49b2ea52628418c9e4d4e6234a37d508335d18a99ac46274e365
+SHA512 (rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.gz) = da0b59f52de3457ab1bf5b47ed4c51b4348e9b4e85844b0698e592706367ed78d3ad12d20740c8e1a9d907116c2d18d68382769e213894ad9844ad7e027af860
+Size (rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.gz) = 313156635 bytes
+BLAKE2s (rust-1.63.0-armv7-unknown-netbsd-eabihf.tar.xz) = e07fdec17a5292b99df1a517349a7b15c1ac2c15c2cd3d5c1620a55f2e222cf7
+SHA512 (rust-1.63.0-armv7-unknown-netbsd-eabihf.tar.xz) = d27f655ede43e38e4a1654c3117346332da73032d8b45a5b79d8bd52ae20acc083fe263b1e32c1bb5b394a33c0b6ac7dcbdc1623da227b505c92f0744e140da3
+Size (rust-1.63.0-armv7-unknown-netbsd-eabihf.tar.xz) = 134099348 bytes
+BLAKE2s (rust-1.63.0-i586-unknown-netbsd.tar.xz) = 4dd319d183bdcf209c47887f54288c1ad92893c25127ae0fc1a6a1c29812f868
+SHA512 (rust-1.63.0-i586-unknown-netbsd.tar.xz) = 6fd39e5e55d9baf3645ff241ac1be63290419533bec6fb9ab0e68a9e0897559195c07ecdfc807dd0a6b1c7ddbfa5d23faff3276e1036cb43fa8c047582f3f466
+Size (rust-1.63.0-i586-unknown-netbsd.tar.xz) = 165878492 bytes
+BLAKE2s (rust-1.63.0-i686-unknown-linux-gnu.tar.gz) = b194a05fc85145bd16a30d9204598a270db509c3a9597eb929a1681c7d43425c
+SHA512 (rust-1.63.0-i686-unknown-linux-gnu.tar.gz) = 759d0bcb79bcbc38a49dbdf9c7611c7d520910b8de6f07939d76140ea6c4178ba6fc80367d399482c2989160b213ac3b26107344996b7cb06cf8d67609fb9ba9
+Size (rust-1.63.0-i686-unknown-linux-gnu.tar.gz) = 369810939 bytes
+BLAKE2s (rust-1.63.0-powerpc-unknown-netbsd.tar.xz) = d4d4b8b369e7c3a2ffe72d66963086e9b35165c97611dd825a05b95d3b2b8f7e
+SHA512 (rust-1.63.0-powerpc-unknown-netbsd.tar.xz) = eeb03a94ded0ee104d5bddf8b370a064ff0ea082228ff621ed19f22fee6cc2a61b79d99b7fc257a5d86666e46a0ff1298a30e62e13a4b47ad1a15cf454e4a3ae
+Size (rust-1.63.0-powerpc-unknown-netbsd.tar.xz) = 169274792 bytes
+BLAKE2s (rust-1.63.0-powerpc-unknown-netbsd90.tar.xz) = 3464e8f6a823eddaea3fbcb0c8b6cf629df73f12f2121ddc21ed45185ed6a3f7
+SHA512 (rust-1.63.0-powerpc-unknown-netbsd90.tar.xz) = 90c5facc452705d2edc87f14b02d117443dadb476d0b02328849a4efc5bbc0520fd3c346112547e3b398dab04601919fdc9f1eec285c6ff5d1e07329d78c35ce
+Size (rust-1.63.0-powerpc-unknown-netbsd90.tar.xz) = 177793992 bytes
+BLAKE2s (rust-1.63.0-sparc64-unknown-netbsd.tar.xz) = 3251a4e4303b1e57d0239e9cb1f49e72354ab9633ec4a729776d651db0856e58
+SHA512 (rust-1.63.0-sparc64-unknown-netbsd.tar.xz) = c9da3d518ece8596ea6f8fe3f69c6623735e0876d3ceb587a885c5a02939bf00fa794dad4d1d081b0916251186b2941ac3185b70d611c58bccaa4893d822c59d
+Size (rust-1.63.0-sparc64-unknown-netbsd.tar.xz) = 149584036 bytes
+BLAKE2s (rust-1.63.0-x86_64-apple-darwin.tar.gz) = 7f12ec36e0deade8f9536c3dc55465afd78e0d8388e5c6b46cb7f3a8092a807d
+SHA512 (rust-1.63.0-x86_64-apple-darwin.tar.gz) = 241f230c6eba6b21eb5a34745b31ab979ea757bef02c86625f6641c0e6579173a5ab29aafc724372a33c6c2d5b741a4861cbc2520cb80242400f8086ed4d32c1
+Size (rust-1.63.0-x86_64-apple-darwin.tar.gz) = 293106442 bytes
+BLAKE2s (rust-1.63.0-x86_64-unknown-freebsd.tar.gz) = eab6148a4ef45c7ce78f10873db3e90ba9cc424f161e3fc7518337e99556998b
+SHA512 (rust-1.63.0-x86_64-unknown-freebsd.tar.gz) = 33652c6e1db7aed358f9fd63fc5e0c10755a558f264a90b6180245c1b95a4292ed201af91c78f9b8b030a55e7d6eb5f2d67823a1770b780ace5ac2da67806dca
+Size (rust-1.63.0-x86_64-unknown-freebsd.tar.gz) = 288166502 bytes
+BLAKE2s (rust-1.63.0-x86_64-unknown-illumos.tar.gz) = 7844914d1a21e8df16bc2a7aad5f01d8502a79806f4606edf2edc7fa38d7f6e5
+SHA512 (rust-1.63.0-x86_64-unknown-illumos.tar.gz) = 1279e4cb7dce1e23cdf8b40afa3540c60e24f22e41a02acd0985cdfa13d825d09ba92859e138734ab2f8435808b4e61c510006a4aba75a02f6b3a45b9bafe556
+Size (rust-1.63.0-x86_64-unknown-illumos.tar.gz) = 201958566 bytes
+BLAKE2s (rust-1.63.0-x86_64-unknown-linux-gnu.tar.gz) = 9ea24101e32efb791fe30f9639b92f705b55c1cb72017a15adada51dd33fe48c
+SHA512 (rust-1.63.0-x86_64-unknown-linux-gnu.tar.gz) = 84a680e7dbf7025490d6681eb49e540acae2f02b32f9762593e92811824300b61862c72671f8288c59483716b3e8a53324714738234e7baf452f75921c751b48
+Size (rust-1.63.0-x86_64-unknown-linux-gnu.tar.gz) = 267333435 bytes
+BLAKE2s (rust-1.63.0-x86_64-unknown-netbsd.tar.xz) = cd865da1c25e3915a8dd8b66554072a550e52ed6dbc284a11f335b49cba52ea3
+SHA512 (rust-1.63.0-x86_64-unknown-netbsd.tar.xz) = 046431fc3382994e42b1755f6ead2e124ffe92ce5df1638bbf6c14d9e5a4bd56bd960d775b49e91dc2573bd3995178e926b719d20a2be223f029b17c3587f536
+Size (rust-1.63.0-x86_64-unknown-netbsd.tar.xz) = 173189252 bytes
+BLAKE2s (rust-std-1.63.0-aarch64-apple-darwin.tar.gz) = 7cbda155876eaff413ca9574dbe90909fd6fd00d4dad40494c03d7a75a519276
+SHA512 (rust-std-1.63.0-aarch64-apple-darwin.tar.gz) = 44252454d3932476675a971fda6a7c01560a372d9dfb51f64ef7d3d53971715bb1a39b09a2cb43cdd6639af2857cf278c4206728e85f6fb68d679ef4ea42f44b
+Size (rust-std-1.63.0-aarch64-apple-darwin.tar.gz) = 39776510 bytes
+BLAKE2s (rust-std-1.63.0-aarch64-unknown-linux-gnu.tar.gz) = d48310db4c8934aac0b039e9c40feb5dec29366956ee6c24a27c3bbede37e8e4
+SHA512 (rust-std-1.63.0-aarch64-unknown-linux-gnu.tar.gz) = 10a8fe1fee134a201393ae5bf0221f599722156d0139bb75175fd10611941f032fe2899d2a256ce708390b0a5a185d045b53cf5cf52fd9ab67da43605a8b9012
+Size (rust-std-1.63.0-aarch64-unknown-linux-gnu.tar.gz) = 57250791 bytes
+BLAKE2s (rust-std-1.63.0-aarch64-unknown-netbsd.tar.xz) = 5b4c8c7c7e1a7e6d151d30cceacb8dc7cb686305c9b67ac6d7a3334958b0ecf7
+SHA512 (rust-std-1.63.0-aarch64-unknown-netbsd.tar.xz) = 1b67a4e5089eae4a092eee248b215621a80f381879682fe629b62fc293e32965c0b18534642ded510abada0bff6f831f5937220eed2360d9e2e38b5924a4d1bf
+Size (rust-std-1.63.0-aarch64-unknown-netbsd.tar.xz) = 22653612 bytes
+BLAKE2s (rust-std-1.63.0-aarch64_be-unknown-netbsd.tar.xz) = c45ee00c8cd3b6636d58128982f0d57a1e4729c8062791c735518db1c9b5bde0
+SHA512 (rust-std-1.63.0-aarch64_be-unknown-netbsd.tar.xz) = 0a142992f084367750bb479fb4ff8694f4ee4256e6f0181815246c6b1ea64320a599da5563642927bc67a6f2ded959c456f45987ffe28c90438388d3c7e9b513
+Size (rust-std-1.63.0-aarch64_be-unknown-netbsd.tar.xz) = 22614832 bytes
+BLAKE2s (rust-std-1.63.0-arm-unknown-linux-gnueabihf.tar.gz) = 9d08ca076d966386b7cbf23aa72f5aeac47600686d105eeca7363867cf4eec66
+SHA512 (rust-std-1.63.0-arm-unknown-linux-gnueabihf.tar.gz) = dd14e86345ffcd6a19c5640c893d941efe70f0f98d226cf76b7d630c4cf56112c2202e908584d17afe15fc85b01b1be7a603ed67da4ba1334254a48ea07b0b4e
+Size (rust-std-1.63.0-arm-unknown-linux-gnueabihf.tar.gz) = 35898004 bytes
+BLAKE2s (rust-std-1.63.0-armv7-unknown-linux-gnueabihf.tar.gz) = d54b985d08493510a1fc84084b91b68f3b407d449e9bdfa5fbd379b876e033f5
+SHA512 (rust-std-1.63.0-armv7-unknown-linux-gnueabihf.tar.gz) = b97e3d076a04405890f1540b866d5787ee61cbdbc5fc6b45a6814ccda38276d59c809a2a9fa9a4ed77b07210cf1b7ce4a2f362e65211e803b3107c8aa95cb59b
+Size (rust-std-1.63.0-armv7-unknown-linux-gnueabihf.tar.gz) = 37741784 bytes
+BLAKE2s (rust-std-1.63.0-armv7-unknown-netbsd-eabihf.tar.xz) = e37494b5e764b30b081ee73c1275a488270092d4ab9e263483131fd9ca70982a
+SHA512 (rust-std-1.63.0-armv7-unknown-netbsd-eabihf.tar.xz) = a9920722c8739478a617c93504b06f615865297d87921c1faa8d8da7b2ff95be3cfcd2b2417e6b7ec8e81ef31e5e0396ca65f8e3b4cf19cb73e387b55d2d330e
+Size (rust-std-1.63.0-armv7-unknown-netbsd-eabihf.tar.xz) = 21831664 bytes
+BLAKE2s (rust-std-1.63.0-i586-unknown-netbsd.tar.xz) = 564b67526782d80c9962d2bdbcbb631642a526eb0b157264c996ba83f7aa1fc2
+SHA512 (rust-std-1.63.0-i586-unknown-netbsd.tar.xz) = 269f53d2d197578febef3d96f9feaa2e7f3e098fc0d52e8a85b65530e859943a535904c33f2bbda1631d71e5de921caebda2b616134940e0a6072b1c196c16b6
+Size (rust-std-1.63.0-i586-unknown-netbsd.tar.xz) = 22699044 bytes
+BLAKE2s (rust-std-1.63.0-i686-unknown-linux-gnu.tar.gz) = 5f0e031fbbbf54670535b083165d3d452de4e0588849f9dfb71ed74663402d10
+SHA512 (rust-std-1.63.0-i686-unknown-linux-gnu.tar.gz) = e862660fd94fe3d9b30df994e95247d3ab7b6a4943098e910f2824026cfaf6df0a44afd6950074d80e94e6f0cfa3bde95660a765d6c5c31fc0a742f6818569d0
+Size (rust-std-1.63.0-i686-unknown-linux-gnu.tar.gz) = 39728937 bytes
+BLAKE2s (rust-std-1.63.0-powerpc-unknown-netbsd.tar.xz) = cf467af536d5f44ca40566f8385123f54d60c7587c2f3b12d03a934ed7aa8d55
+SHA512 (rust-std-1.63.0-powerpc-unknown-netbsd.tar.xz) = aa5f69063548875a2cad381fe5004a576376ea121c95599cef831deffb1509d05e5f1764714220de3d6c49794c1768df772789fe772f34281a7ea36cf1ad2097
+Size (rust-std-1.63.0-powerpc-unknown-netbsd.tar.xz) = 20677128 bytes
+BLAKE2s (rust-std-1.63.0-powerpc-unknown-netbsd90.tar.xz) = 8a5734eda79f3d1249e3c5c6343088e5e566e6c35cf5eed9675039c54c3f630f
+SHA512 (rust-std-1.63.0-powerpc-unknown-netbsd90.tar.xz) = 609b321facbda65fea8cadd1b28c6c0c15d7d470bd89af61f442cc6b640e598c4c03b77adcf7f87b0545f5fb8a9da479a810fe813f72e808548c35031183b9f8
+Size (rust-std-1.63.0-powerpc-unknown-netbsd90.tar.xz) = 20743540 bytes
+BLAKE2s (rust-std-1.63.0-sparc64-unknown-netbsd.tar.xz) = 9c38cca66a59768f22737c5b4d88e201ddd9c381239b49556d44cf60d1175af5
+SHA512 (rust-std-1.63.0-sparc64-unknown-netbsd.tar.xz) = ce6e74057ffa960cfd4a87a1f08d2eb2fe7cb15af233caf05fd0b19ff37ad464a82f6a32f8eb4cf9bdccb2ca62b0ff6d682c9bd986d7d05ebb65940b67ab46af
+Size (rust-std-1.63.0-sparc64-unknown-netbsd.tar.xz) = 20674968 bytes
+BLAKE2s (rust-std-1.63.0-x86_64-apple-darwin.tar.gz) = 165cd3cb5ade9ff694fdc60f4a327245ea75ca9794e90624bc5ecd7c7fd731e1
+SHA512 (rust-std-1.63.0-x86_64-apple-darwin.tar.gz) = 2f62040a55e3a9d52a2bfabecacc2f0e36fd1dcdc00b3adc549acac85cb8c1ceeefc68222968eefb6f37d8114a154a91d02fd18ee95889cf80efc291cdc8df6d
+Size (rust-std-1.63.0-x86_64-apple-darwin.tar.gz) = 40445814 bytes
+BLAKE2s (rust-std-1.63.0-x86_64-unknown-freebsd.tar.gz) = 888fad5e8a5b4fd08e8d895cf2fb82d9a552df486716a6b28d98a77e41c1c977
+SHA512 (rust-std-1.63.0-x86_64-unknown-freebsd.tar.gz) = 63c39aa71b0e8ef972bc6211f0c2ec7cf85e30a5ee161d37b8c3f4e2650eb6b843d9c7be46447cb0d4cdef44627b298257a4139c16b5e94636b39ea93d60ee77
+Size (rust-std-1.63.0-x86_64-unknown-freebsd.tar.gz) = 42592740 bytes
+BLAKE2s (rust-std-1.63.0-x86_64-unknown-linux-gnu.tar.gz) = 6202c2a656b8f0069ca2acec86f11103479f35a8ce08d7a699cb55be954d7764
+SHA512 (rust-std-1.63.0-x86_64-unknown-linux-gnu.tar.gz) = d79f38ef9879ea9ec2841c3c64c49a3e4645d7225a6500fad38ef7161c147664905812f2f20dbd1d8f955ae629f15f74c09bff23d24f4d969b91e5bac1191852
+Size (rust-std-1.63.0-x86_64-unknown-linux-gnu.tar.gz) = 44064096 bytes
+BLAKE2s (rust-std-1.63.0-x86_64-unknown-netbsd.tar.xz) = 5328a4215846005afcbc8a8118d9a4d927557a63814a3db3a7095a9999a90c15
+SHA512 (rust-std-1.63.0-x86_64-unknown-netbsd.tar.xz) = b7b1fda019b7a161bd8ceb259c980f2ad26fac186d6deb7c5493b81652cbc04e5ca3036ca93ec64fcf9bee49df24b9c438532c7a4a221472ab1efa4f7cff6f58
+Size (rust-std-1.63.0-x86_64-unknown-netbsd.tar.xz) = 25553764 bytes
+BLAKE2s (rustc-1.64.0-src.tar.gz) = b390e0040c2cffa5b69eadba870e40667986d4d0b9c4952692d6e62b6cddc810
+SHA512 (rustc-1.64.0-src.tar.gz) = 1c453702f6d6cbdb12633d3db617495d69f7b6c6645cbef72750470b6ca826dd410fde0bbacbf11621234c4e12fa72e27f61fc2858983ec4490a68ce025e4660
+Size (rustc-1.64.0-src.tar.gz) = 205881934 bytes
+SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = bfa0196fa53ac0fc95dc30a4a5097b8db805251e
+SHA1 (patch-compiler_rustc__llvm_build.rs) = 73f8225f6dea809da9381d78a8099d13c7c151c0
 SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = c81d0d288699056ae45569f8d0a1c9bb08153ec4
 SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = 71b5736952023931c94c6996e73cdcfc66b429fe
-SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 46d434ec650c4e1ad419cf4c84a0c21d2ae5975a
+SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 8f1b5ced49fa66a646327a19f9eb0501fa2b01c7
 SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 57b26a7eb55a4a8e9ec8c4fb8b3b318a25d5a78b
 SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 32ab8ea3809cd4f6fee9fc0df5db47d76ccbd9d2
 SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 56621c10310914672a851cf5dfbf343a9ff4e1be
-SHA1 (patch-library_std_src_sys_unix_mod.rs) = ef9e2b2e78602d5779e5d17e979347b0237ea4a6
-SHA1 (patch-library_std_src_sys_unix_thread.rs) = aafa957d5cfa0f48a6e43c20cfa346261ec7aa76
-SHA1 (patch-library_unwind_build.rs) = 7ece6de566ead1d9aae490ba91d81ac2d0bc50a8
-SHA1 (patch-src_bootstrap_bootstrap.py) = acd1839b8381ed39e907652213627e6eb713da48
-SHA1 (patch-src_bootstrap_builder.rs) = ef84496eaeca753200e7a8fc7cf1c460ca3c464c
-SHA1 (patch-src_bootstrap_compile.rs) = 4dfce147e78968b67c5e32edbadf487cea21c613
-SHA1 (patch-src_bootstrap_lib.rs) = 5815a67cbb5b40f652dfe60d1b715e69bdeec1b5
-SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = fb1b9ea0c81bf96abb5a88fcb523631c42cd8f14
-SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = fef9f055d2b918c4480fbf8ee68e259197490a0f
+SHA1 (patch-library_std_src_sys_unix_mod.rs) = f8669d680f169137ac2891af2977909619366a97
+SHA1 (patch-library_std_src_sys_unix_thread.rs) = e5f661b3dd00058e874fe60cd89d9e919325e99b
+SHA1 (patch-library_unwind_build.rs) = df092d5c07fa0be63a9510f1d6a77e5094ca3b15
+SHA1 (patch-src_bootstrap_bootstrap.py) = 84af2ffa57ae1b68d12c6b9d3ce181a13576992c
+SHA1 (patch-src_bootstrap_builder.rs) = a99bdde69d3b55906f8d227a5604a1a6ef55bb1c
+SHA1 (patch-src_bootstrap_compile.rs) = c57799aee9c12603f5e6a13cb6b5befc8f96b4b6
+SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
+SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7abfabb6ec70df229a69355f8c76825610165c37
+SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 67de0d9fc105ef7ea7a0d96fa25fc779c2b89024
 SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
 SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 26982203916ad601599c7a3e05867e4dad742ae1
 SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2587c2f4d11ad8f75bf8a16de625135b26bacc15
-SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 88c2f26c5980a3cfacd7a928044dff68eb0ec61e
+SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = dc9b405b41882bc7c74e08b8188acab3d4aed4ad
 SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 60713699c968f3e389f486e796009d31a5048906
 SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = 8174664b7bce2e60e690bc20ab688606b60c55dc
 SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 5236eda97fa686b5661e4e5832102e2f010def7b
@@ -130,12 +130,12 @@ SHA1 (patch-src_tools_rust-installer_install-template.sh) = ca769db07986ded26d92
 SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = b93148ff72a60a17c6a444f2616386c40d872153
 SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 308538090d9ce11d206d6eef0e675581a1fc6e80
 SHA1 (patch-vendor_cc-1.0.69_src_lib.rs) = b5c0f795624b928b8b02fe01174e6a24e770adea
-SHA1 (patch-vendor_cc_src_lib.rs) = 8864edc8dc0ad0665a89c89016bbaee7d603cbe1
-SHA1 (patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs) = e447bd34d0dd7c6a51fbc27dfae50129d0b33462
-SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 31b1f5d1c9d289ecbd219b8bb2fd3839db5e7862
-SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 5b45640b2f0015142bd1eda5d5f02c7dbfe9210c
+SHA1 (patch-vendor_cc_src_lib.rs) = 2f6b0ad800b31cd33334f194651981491ecf7641
+SHA1 (patch-vendor_kqueue_src_time.rs) = 21950e7d79fb88257bdb11b988f2a3ae0084ba3d
+SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 351e213fc07b0dc7c35d70d6a0c2ecc6b5b9056e
+SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 8364e19ea09203d32494c37ff3db19fe3d6b9d8a
 SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
-SHA1 (patch-vendor_openssl-src_src_lib.rs) = e62697daa7e7fa3d7b89f338c3a26066b93d7b34
+SHA1 (patch-vendor_openssl-src_src_lib.rs) = 5077b0603515cc5869581be7b6a0830950ec323f
 SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7
 SHA1 (patch-vendor_stacker_src_lib.rs) = e00a1e95eb16540ff182715db778bf97ebd07a5e
-SHA1 (patch-vendor_target-lexicon_src_targets.rs) = 421aa776a05a64674ffa447b85cfe463075160a2
+SHA1 (patch-vendor_target-lexicon_src_targets.rs) = e0c67288516ff8d379d6d1e7b05d4ab86f9ac0a7
diff --git a/rust/do-cross.mk b/rust/do-cross.mk
index 0239bba0ec4..f6c3d810e37 100644
--- a/rust/do-cross.mk
+++ b/rust/do-cross.mk
@@ -69,7 +69,7 @@ CA.${st}+=--set=target.${TGT.${st}}.linker=${SCRIPTS}/gcc-wrap
 CA.${st}+=--set=target.${TGT.${st}}.ar=${ROOT.${st}}/tools/bin/${G_TGT.${st}}-ar
 do-${st}:
 	mkdir -p dist
-	${ECHO} "=======> Cross-building rust for ${st}"
+	@echo "=======> Cross-building rust for ${st}"
 	${DEBUG} make -f Makefile clean
 	${DEBUG} env \
 		CROSS_ROOT=${ROOT.${st}} \
@@ -87,13 +87,13 @@ do-${st}:
 		src=$${distdir}/$${comp}-${V_NOREV}-${TGT.${st}}.tar.xz; \
 		tgt=dist/$${comp}-${VERSION}-$${TT}.tar.xz; \
 		if [ ! -f "$${tgt}" ]; then \
-			${ECHO} ln $${src} $${tgt}; \
+			echo ln $${src} $${tgt}; \
 			${DEBUG} ln $${src} $${tgt}; \
 		fi; \
 	done; \
 	src_comp=rust-src-${V_NOREV}.tar.xz; \
 	if [ ! -f dist/$${src_comp} ]; then \
-		${ECHO} ln $${distdir}/$${src_comp} dist; \
+		echo ln $${distdir}/$${src_comp} dist; \
 		${DEBUG} ln $${distdir}/$${src_comp} dist; \
 	fi
 .endfor
diff --git a/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs b/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
index a95337f84a8..32343104c50 100644
--- a/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
+++ b/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
@@ -7,7 +7,7 @@ Do not use @rpath on Darwin.
 @@ -326,7 +326,7 @@ impl<'a> GccLinker<'a> {
              // principled solution at some point to force the compiler to pass
              // the right `-Wl,-install_name` with an `@rpath` in it.
-             if self.sess.opts.cg.rpath || self.sess.opts.debugging_opts.osx_rpath_install_name {
+             if self.sess.opts.cg.rpath || self.sess.opts.unstable_opts.osx_rpath_install_name {
 -                let mut rpath = OsString::from("@rpath/");
 +                let mut rpath = OsString::from("@PREFIX@/lib/");
                  rpath.push(out_filename.file_name().unwrap());
diff --git a/rust/patches/patch-compiler_rustc__llvm_build.rs b/rust/patches/patch-compiler_rustc__llvm_build.rs
index aac56c55ef9..7af182c085e 100644
--- a/rust/patches/patch-compiler_rustc__llvm_build.rs
+++ b/rust/patches/patch-compiler_rustc__llvm_build.rs
@@ -4,7 +4,7 @@ Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
 
 --- compiler/rustc_llvm/build.rs.orig	2021-11-01 07:17:29.000000000 +0000
 +++ compiler/rustc_llvm/build.rs
-@@ -331,7 +331,13 @@ fn main() {
+@@ -268,7 +268,13 @@ fn main() {
          "c++"
      } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
          // NetBSD uses a separate library when relocation is required
diff --git a/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs b/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
index 268837b4b66..5f107edb65c 100644
--- a/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
+++ b/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
@@ -4,7 +4,7 @@ Add i586(pentium) and aarch64_be targets.
 
 --- compiler/rustc_target/src/spec/mod.rs.orig	2021-03-23 16:15:10.000000000 +0000
 +++ compiler/rustc_target/src/spec/mod.rs
-@@ -895,9 +895,11 @@ supported_targets! {
+@@ -816,9 +816,11 @@ supported_targets! {
      ("powerpc-unknown-openbsd", powerpc_unknown_openbsd),
  
      ("aarch64-unknown-netbsd", aarch64_unknown_netbsd),
diff --git a/rust/patches/patch-library_std_src_sys_unix_mod.rs b/rust/patches/patch-library_std_src_sys_unix_mod.rs
index 1dcc21e31eb..025b74b7b42 100644
--- a/rust/patches/patch-library_std_src_sys_unix_mod.rs
+++ b/rust/patches/patch-library_std_src_sys_unix_mod.rs
@@ -4,7 +4,7 @@ Add libexecinfo for backtrace() on NetBSD.
 
 --- library/std/src/sys/unix/mod.rs.orig	2021-02-10 17:36:44.000000000 +0000
 +++ library/std/src/sys/unix/mod.rs
-@@ -302,6 +302,7 @@ cfg_if::cfg_if! {
+@@ -269,6 +269,7 @@ cfg_if::cfg_if! {
          #[link(name = "pthread")]
          extern "C" {}
      } else if #[cfg(target_os = "netbsd")] {
diff --git a/rust/patches/patch-library_std_src_sys_unix_thread.rs b/rust/patches/patch-library_std_src_sys_unix_thread.rs
index 21a78b44fd3..444d257b9bf 100644
--- a/rust/patches/patch-library_std_src_sys_unix_thread.rs
+++ b/rust/patches/patch-library_std_src_sys_unix_thread.rs
@@ -4,7 +4,7 @@ Fix stack-clash on SunOS.
 
 --- library/std/src/sys/unix/thread.rs.orig	2020-10-07 07:53:22.000000000 +0000
 +++ library/std/src/sys/unix/thread.rs
-@@ -584,7 +584,7 @@ pub mod guard {
+@@ -470,7 +470,7 @@ pub mod guard {
          let page_size = os::page_size();
          PAGE_SIZE.store(page_size, Ordering::Relaxed);
  
diff --git a/rust/patches/patch-library_unwind_build.rs b/rust/patches/patch-library_unwind_build.rs
index ec416e5d2b4..a860d7af9d2 100644
--- a/rust/patches/patch-library_unwind_build.rs
+++ b/rust/patches/patch-library_unwind_build.rs
@@ -4,7 +4,7 @@ Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
 
 --- library/unwind/build.rs.orig	2020-10-07 07:53:22.000000000 +0000
 +++ library/unwind/build.rs
-@@ -23,7 +23,9 @@ fn main() {
+@@ -20,7 +20,9 @@ fn main() {
      } else if target.contains("freebsd") {
          println!("cargo:rustc-link-lib=gcc_s");
      } else if target.contains("netbsd") {
diff --git a/rust/patches/patch-src_bootstrap_bootstrap.py b/rust/patches/patch-src_bootstrap_bootstrap.py
index 900efdfb409..a77b009a532 100644
--- a/rust/patches/patch-src_bootstrap_bootstrap.py
+++ b/rust/patches/patch-src_bootstrap_bootstrap.py
@@ -6,7 +6,7 @@
 
 --- src/bootstrap/bootstrap.py.orig	2021-02-10 17:36:44.000000000 +0000
 +++ src/bootstrap/bootstrap.py
-@@ -278,6 +278,11 @@ def default_build_triple(verbose):
+@@ -218,6 +218,11 @@ def default_build_triple(verbose):
          'OpenBSD': 'unknown-openbsd'
      }
  
@@ -18,7 +18,7 @@
      # Consider the direct transformation first and then the special cases
      if ostype in ostype_mapper:
          ostype = ostype_mapper[ostype]
-@@ -331,6 +336,7 @@ def default_build_triple(verbose):
+@@ -271,6 +276,7 @@ def default_build_triple(verbose):
      cputype_mapper = {
          'BePC': 'i686',
          'aarch64': 'aarch64',
@@ -26,7 +26,7 @@
          'amd64': 'x86_64',
          'arm64': 'aarch64',
          'i386': 'i686',
-@@ -369,10 +375,12 @@ def default_build_triple(verbose):
+@@ -309,10 +315,12 @@ def default_build_triple(verbose):
              ostype = 'linux-androideabi'
          else:
              ostype += 'eabihf'
@@ -40,7 +40,7 @@
          else:
              ostype += 'eabihf'
      elif cputype == 'mips':
-@@ -791,7 +799,7 @@ class RustBuild(object):
+@@ -980,7 +988,7 @@ class RustBuild(object):
                  self.cargo()))
          args = [self.cargo(), "build", "--manifest-path",
                  os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
diff --git a/rust/patches/patch-src_bootstrap_builder.rs b/rust/patches/patch-src_bootstrap_builder.rs
index 2a74b870345..7e04db9c510 100644
--- a/rust/patches/patch-src_bootstrap_builder.rs
+++ b/rust/patches/patch-src_bootstrap_builder.rs
@@ -2,12 +2,10 @@ $NetBSD: patch-src_bootstrap_builder.rs,v 1.11 2020/07/06 13:56:32 he Exp $
 
 Do not install 'src'.
 Use @PREFIX@, not $ORIGIN in rpath.
-Fix RPATH for pkgsrc.
-Pull in upstream commit 5122bb55 to fix install on illumos.
 
 --- src/bootstrap/builder.rs.orig	2022-06-27 13:37:07.000000000 +0000
 +++ src/bootstrap/builder.rs
-@@ -735,7 +735,6 @@ impl<'a> Builder<'a> {
+@@ -743,7 +743,6 @@ impl<'a> Builder<'a> {
                  install::Clippy,
                  install::Miri,
                  install::Analysis,
@@ -15,7 +13,7 @@ Pull in upstream commit 5122bb55 to fix install on illumos.
                  install::Rustc
              ),
              Kind::Run => describe!(run::ExpandYamlAnchors, run::BuildManifest, run::BumpStage0),
-@@ -1699,7 +1698,7 @@ impl<'a> Builder<'a> {
+@@ -1702,7 +1701,7 @@ impl<'a> Builder<'a> {
                  Some("-Wl,-rpath,@loader_path/../lib")
              } else if !target.contains("windows") {
                  rustflags.arg("-Clink-args=-Wl,-z,origin");
@@ -24,13 +22,3 @@ Pull in upstream commit 5122bb55 to fix install on illumos.
              } else {
                  None
              };
-@@ -1760,7 +1759,8 @@ impl<'a> Builder<'a> {
-             let needs_unstable_opts = target.contains("linux")
-                 || target.contains("windows")
-                 || target.contains("bsd")
--                || target.contains("dragonfly");
-+                || target.contains("dragonfly")
-+                || target.contains("illumos");
- 
-             if needs_unstable_opts {
-                 rustflags.arg("-Zunstable-options");
diff --git a/rust/patches/patch-src_bootstrap_compile.rs b/rust/patches/patch-src_bootstrap_compile.rs
index c5b279eec44..6dc2ebbb8ad 100644
--- a/rust/patches/patch-src_bootstrap_compile.rs
+++ b/rust/patches/patch-src_bootstrap_compile.rs
@@ -4,7 +4,7 @@ On Darwin, do not use @rpath for internal libraries.
 
 --- src/bootstrap/compile.rs.orig	2021-09-06 18:42:35.000000000 +0000
 +++ src/bootstrap/compile.rs
-@@ -418,7 +418,7 @@ fn copy_sanitizers(
+@@ -414,7 +414,7 @@ fn copy_sanitizers(
  
          if target == "x86_64-apple-darwin" || target == "aarch64-apple-darwin" {
              // Update the library’s install name to reflect that it has has been renamed.
diff --git a/rust/patches/patch-src_bootstrap_lib.rs b/rust/patches/patch-src_bootstrap_lib.rs
index efb6bbe2e40..5a21ea08f82 100644
--- a/rust/patches/patch-src_bootstrap_lib.rs
+++ b/rust/patches/patch-src_bootstrap_lib.rs
@@ -5,7 +5,7 @@ FreeBSD has a particular C++ runtime library name
 
 --- src/bootstrap/lib.rs.orig	2021-09-06 18:42:35.000000000 +0000
 +++ src/bootstrap/lib.rs
-@@ -1050,14 +1050,13 @@ impl Build {
+@@ -954,14 +954,13 @@ impl Build {
              .args()
              .iter()
              .map(|s| s.to_string_lossy().into_owned())
diff --git a/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt b/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
index bc724c9eb5c..2477a555c8e 100644
--- a/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
+++ b/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
@@ -4,7 +4,7 @@ Don't implement sys/regset.h workaround, fix source instead.
 
 --- src/llvm-project/llvm/CMakeLists.txt.orig	2018-03-10 02:51:13.000000000 +0000
 +++ src/llvm-project/llvm/CMakeLists.txt
-@@ -1025,11 +1025,6 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
+@@ -939,11 +939,6 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
  # (this is a variable that CrossCompile sets on recursive invocations)
  endif()
  
diff --git a/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake b/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
index 3cef007092c..5f0c06e4378 100644
--- a/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
+++ b/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
@@ -4,7 +4,7 @@ On Darwin, use correct install-name for shared libraries.
 
 --- src/llvm-project/llvm/cmake/modules/AddLLVM.cmake.orig	2020-09-22 17:14:20.000000000 +0000
 +++ src/llvm-project/llvm/cmake/modules/AddLLVM.cmake
-@@ -2143,7 +2143,7 @@ function(llvm_setup_rpath name)
+@@ -2117,7 +2117,7 @@ function(llvm_setup_rpath name)
    endif()
  
    if (APPLE)
diff --git a/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs b/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
index 031a4402c28..6b677e462c8 100644
--- a/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
+++ b/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
@@ -5,7 +5,7 @@ https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_increment
 
 --- src/tools/cargo/src/cargo/core/profiles.rs.orig	2018-10-24 20:01:28.000000000 +0000
 +++ src/tools/cargo/src/cargo/core/profiles.rs
-@@ -643,6 +643,9 @@ impl Profile {
+@@ -720,6 +720,9 @@ impl Profile {
              debuginfo: Some(2),
              debug_assertions: true,
              overflow_checks: true,
diff --git a/rust/patches/patch-vendor_cc_src_lib.rs b/rust/patches/patch-vendor_cc_src_lib.rs
index 74578676d10..d786cb3f521 100644
--- a/rust/patches/patch-vendor_cc_src_lib.rs
+++ b/rust/patches/patch-vendor_cc_src_lib.rs
@@ -4,7 +4,7 @@ Add aarch64_eb.
 
 --- vendor/cc/src/lib.rs.orig	2021-07-26 15:20:38.000000000 +0000
 +++ vendor/cc/src/lib.rs
-@@ -2551,6 +2551,7 @@ impl Build {
+@@ -2382,6 +2382,7 @@ impl Build {
              "aarch64-unknown-linux-gnu" => Some("aarch64-linux-gnu"),
              "aarch64-unknown-linux-musl" => Some("aarch64-linux-musl"),
              "aarch64-unknown-netbsd" => Some("aarch64--netbsd"),
diff --git a/rust/patches/patch-vendor_kqueue_src_time.rs b/rust/patches/patch-vendor_kqueue_src_time.rs
new file mode 100644
index 00000000000..6fa49d89300
--- /dev/null
+++ b/rust/patches/patch-vendor_kqueue_src_time.rs
@@ -0,0 +1,48 @@
+$NetBSD$
+
+Use the timespec component types instead of hardcoding int lengths.
+...except Linux has a quirk.
+
+--- vendor/kqueue/src/time.rs.orig	2022-09-19 15:35:02.000000000 +0000
++++ vendor/kqueue/src/time.rs
+@@ -1,32 +1,15 @@
+-use libc::timespec;
++use libc::{timespec, time_t, c_long};
+ use std::time::Duration;
+ 
+-#[cfg(not(all(
+-    any(target_os = "freebsd", target_os = "macos"),
+-    any(target_arch = "x86", target_arch = "powerpc")
+-)))]
+-pub(crate) fn duration_to_timespec(d: Duration) -> timespec {
+-    let tv_sec = d.as_secs() as i64;
+-    let tv_nsec = d.subsec_nanos() as i64;
+-
+-    if tv_sec.is_negative() {
+-        panic!("Duration seconds is negative");
+-    }
+-
+-    if tv_nsec.is_negative() {
+-        panic!("Duration nsecs is negative");
+-    }
+-
+-    timespec { tv_sec, tv_nsec }
+-}
++// Linux x32 compatibility, ref. libc/src/unix/mod.rs
++#[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
++type NSec = i64;
++#[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
++type NSec = c_long;
+ 
+-#[cfg(all(
+-    any(target_os = "freebsd", target_os = "macos"),
+-    any(target_arch = "x86", target_arch = "powerpc")
+-))]
+ pub(crate) fn duration_to_timespec(d: Duration) -> timespec {
+-    let tv_sec = d.as_secs() as i32;
+-    let tv_nsec = d.subsec_nanos() as i32;
++    let tv_sec = d.as_secs() as time_t;
++    let tv_nsec = d.subsec_nanos() as NSec;
+ 
+     if tv_sec.is_negative() {
+         panic!("Duration seconds is negative");
diff --git a/rust/patches/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust/patches/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs
deleted file mode 100644
index 652421f0c16..00000000000
--- a/rust/patches/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-Copy execinfo function definitions from openbsd's mod.rs.
-
---- vendor/libc-0.2.119/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2022-08-09 00:43:08.000000000 +0000
-+++ vendor/libc-0.2.119/src/unix/bsd/netbsdlike/netbsd/mod.rs
-@@ -2788,6 +2788,22 @@ extern "C" {
-     pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
- }
- 
-+#[link(name = "execinfo")]
-+extern "C" {
-+    pub fn backtrace(addrlist: *mut *mut ::c_void, len: ::size_t) -> ::size_t;
-+    pub fn backtrace_symbols(addrlist: *const *mut ::c_void, len: ::size_t) -> *mut *mut ::c_char;
-+    pub fn backtrace_symbols_fd(
-+        addrlist: *const *mut ::c_void,
-+        len: ::size_t,
-+        fd: ::c_int,
-+    ) -> ::c_int;
-+    pub fn backtrace_symbols_fmt(
-+        addrlist: *const *mut ::c_void,
-+        len: ::size_t,
-+        fmt: *const ::c_char,
-+    ) -> *mut *mut ::c_char;
-+}
-+
- cfg_if! {
-     if #[cfg(target_arch = "aarch64")] {
-         mod aarch64;
diff --git a/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 5497db88ad3..cd519f6261b 100644
--- a/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/rust/patches/patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -4,7 +4,7 @@ Copy execinfo function definitions from openbsd's mod.rs.
 
 --- vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2022-05-10 20:59:35.217463943 +0000
 +++ vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs
-@@ -2821,6 +2821,22 @@ extern "C" {
+@@ -2787,6 +2787,22 @@ extern "C" {
      pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
  }
  
diff --git a/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs b/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
index 1c0068a94a3..bcf64dadb20 100644
--- a/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
+++ b/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
@@ -4,7 +4,7 @@ Fix xattr build.
 
 --- vendor/libc/src/unix/solarish/mod.rs.orig	2019-05-20 13:47:24.000000000 +0000
 +++ vendor/libc/src/unix/solarish/mod.rs
-@@ -1516,6 +1516,8 @@ pub const EOWNERDEAD: ::c_int = 58;
+@@ -1215,6 +1215,8 @@ pub const EOWNERDEAD: ::c_int = 58;
  pub const ENOTRECOVERABLE: ::c_int = 59;
  pub const ENOSTR: ::c_int = 60;
  pub const ENODATA: ::c_int = 61;
diff --git a/rust/patches/patch-vendor_openssl-src_src_lib.rs b/rust/patches/patch-vendor_openssl-src_src_lib.rs
index 76a8825e9a8..c068dbbe42b 100644
--- a/rust/patches/patch-vendor_openssl-src_src_lib.rs
+++ b/rust/patches/patch-vendor_openssl-src_src_lib.rs
@@ -2,9 +2,9 @@ $NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.1 2021/01/01 20:44:48 he Exp $
 
 Provide defaults for the various NetBSD targets.
 
---- vendor/openssl-src/src/lib.rs.orig	2021-07-26 15:20:39.000000000 +0000
+--- vendor/openssl-src/src/lib.rs.orig	2022-09-19 15:35:02.000000000 +0000
 +++ vendor/openssl-src/src/lib.rs
-@@ -219,6 +219,8 @@ impl Build {
+@@ -230,6 +230,8 @@ impl Build {
              "aarch64-unknown-freebsd" => "BSD-generic64",
              "aarch64-unknown-linux-gnu" => "linux-aarch64",
              "aarch64-unknown-linux-musl" => "linux-aarch64",
@@ -13,7 +13,7 @@ Provide defaults for the various NetBSD targets.
              "aarch64-pc-windows-msvc" => "VC-WIN64-ARM",
              "arm-linux-androideabi" => "linux-armv4",
              "armv7-linux-androideabi" => "linux-armv4",
-@@ -234,6 +236,7 @@ impl Build {
+@@ -245,6 +247,7 @@ impl Build {
              "armv7-unknown-linux-musleabi" => "linux-armv4",
              "armv7-unknown-linux-gnueabihf" => "linux-armv4",
              "armv7-unknown-linux-musleabihf" => "linux-armv4",
@@ -21,7 +21,7 @@ Provide defaults for the various NetBSD targets.
              "asmjs-unknown-emscripten" => "gcc",
              "i586-unknown-linux-gnu" => "linux-elf",
              "i586-unknown-linux-musl" => "linux-elf",
-@@ -244,6 +247,8 @@ impl Build {
+@@ -255,6 +258,8 @@ impl Build {
              "i686-unknown-freebsd" => "BSD-x86-elf",
              "i686-unknown-linux-gnu" => "linux-elf",
              "i686-unknown-linux-musl" => "linux-elf",
@@ -30,7 +30,7 @@ Provide defaults for the various NetBSD targets.
              "mips-unknown-linux-gnu" => "linux-mips32",
              "mips-unknown-linux-musl" => "linux-mips32",
              "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
-@@ -254,6 +259,7 @@ impl Build {
+@@ -265,6 +270,7 @@ impl Build {
              "mipsel-unknown-linux-musl" => "linux-mips32",
              "powerpc-unknown-freebsd" => "BSD-generic32",
              "powerpc-unknown-linux-gnu" => "linux-ppc",
@@ -38,7 +38,7 @@ Provide defaults for the various NetBSD targets.
              "powerpc64-unknown-freebsd" => "BSD-generic64",
              "powerpc64-unknown-linux-gnu" => "linux-ppc64",
              "powerpc64-unknown-linux-musl" => "linux-ppc64",
-@@ -263,6 +269,7 @@ impl Build {
+@@ -274,6 +280,7 @@ impl Build {
              "riscv64gc-unknown-linux-gnu" => "linux-generic64",
              "s390x-unknown-linux-gnu" => "linux64-s390x",
              "s390x-unknown-linux-musl" => "linux64-s390x",
diff --git a/rust/patches/patch-vendor_target-lexicon_src_targets.rs b/rust/patches/patch-vendor_target-lexicon_src_targets.rs
index 6bfd981fdc9..323e0d4773f 100644
--- a/rust/patches/patch-vendor_target-lexicon_src_targets.rs
+++ b/rust/patches/patch-vendor_target-lexicon_src_targets.rs
@@ -4,7 +4,7 @@ Add aarch64_eb for NetBSD.
 
 --- vendor/target-lexicon/src/targets.rs.orig	2021-05-03 21:35:46.000000000 +0000
 +++ vendor/target-lexicon/src/targets.rs
-@@ -1332,6 +1332,7 @@ mod tests {
+@@ -1287,6 +1287,7 @@ mod tests {
              "aarch64-unknown-linux-gnu_ilp32",
              "aarch64-unknown-linux-musl",
              "aarch64-unknown-netbsd",