rust: update to version 1.62.0.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: rust: update to version 1.62.0.
From: Havard Eidnes <he%NetBSD.org@localhost>
Date: Tue, 12 Jul 2022 22:41:44 +0000
Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Tue Jul 12 22:41:44 2022 +0000
Changeset:	a7e81b2c41863ea733f4687536ec122b90fcb126

Modified Files:
	rust/Makefile
	rust/distinfo
	rust/files/gcc-wrap
Added Files:
	rust/patches/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs
	rust/patches/patch-vendor_libc-0.2.123_src_unix_bsd_netbsdlike_netbsd_mod.rs
Removed Files:
	rust/patches/patch-vendor_libc-0.2.116_src_unix_bsd_netbsdlike_netbsd_mod.rs

Log Message:
rust: update to version 1.62.0.

Pkgsrc changes:
 * adapt patches (libc crate version bump)
 * no longer pass -I/usr/pkg/include through via gcc-wrap script.
   Attempt at fixing version skew with curl package vs. internal
   version of curl.
 * new checksums

Upstream changes:

Version 1.62.0 (2022-06-30)
==========================

Language
--------

- [Stabilize `#[derive(Default)]` on enums with a `#[default]` variant][94457]
- [Stop validating some checks in dead code after functions with
  uninhabited return types][93313]
- [Fix constants not getting dropped if part of a diverging expression][94775]
- [Support unit struct/enum variant in destructuring assignment][95380]
- [Remove mutable_borrow_reservation_conflict lint and allow the
  code pattern][96268]

Compiler
--------

- [linker: Stop using whole-archive on dependencies of dylibs][96436]
- [Make `unaligned_references` lint deny-by-default][95372]
  This lint is also a future compatibility lint, and is expected to eventually
  become a hard error.
- [Only add codegen backend to dep info if -Zbinary-dep-depinfo is used][93969]
- [Reject `#[thread_local]` attribute on non-static items][95006]
- [Add tier 3 `aarch64-pc-windows-gnullvm` and `x86_64-pc-windows-gnullvm`
  targets\*][94872]
- [Implement a lint to warn about unused macro rules][96150]
- [Promote `x86_64-unknown-none` target to Tier 2\*][95705]

\* Refer to Rust's [platform support page][platform-support-doc] for more
   information on Rust's tiered platform support.

Libraries
---------

- [Move `CStr` to libcore, and `CString` to liballoc][94079]
- [Windows: Use a pipe relay for chaining pipes][95841]
- [Replace Linux Mutex and Condvar with futex based ones.][95035]
- [Replace RwLock by a futex based one on Linux][95801]
- [std: directly use pthread in UNIX parker implementation][96393]

Stabilized APIs
---------------

- [`bool::then_some`]
- [`f32::total_cmp`]
- [`f64::total_cmp`]
- [`Stdin::lines`]
- [`windows::CommandExt::raw_arg`]
- [`impl<T: Default> Default for AssertUnwindSafe<T>`]
- [`From<Rc<str>> for Rc<[u8]>`][rc-u8-from-str]
- [`From<Arc<str>> for Arc<[u8]>`][arc-u8-from-str]
- [`FusedIterator for EncodeWide`]
- [RDM intrinsics on aarch64][stdarch/1285]

Clippy
------

- [Create clippy lint against unexpectedly late drop for temporaries
  in match scrutinee expressions][94206]

Cargo
-----

- Added the `cargo add` command for adding dependencies to `Cargo.toml` from
  the command-line.
  [docs](https://doc.rust-lang.org/nightly/cargo/commands/cargo-add.html)
- Package ID specs now support `name@version` syntax in addition to the
  previous `name:version` to align with the behavior in `cargo add` and other
  tools. `cargo install` and `cargo yank` also now support this syntax so the
  version does not need to passed as a separate flag.
- The `git` and `registry` directories in Cargo's home directory (usually
  `~/.cargo`) are now marked as cache directories so that they are not
  included in backups or content indexing (on Windows).
- Added automatic `@` argfile support, which will use "response files" if the
  command-line to `rustc` exceeds the operating system's limit.

Compatibility Notes
-------------------

- `cargo test` now passes `--target` to `rustdoc` if the specified target is
  the same as the host target.
  [#10594](https://github.com/rust-lang/cargo/pull/10594)
- [rustdoc: Remove .woff font files][96279]
- [Enforce Copy bounds for repeat elements while considering lifetimes][95819]

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

- [Unify ReentrantMutex implementations across all platforms][96042]

These changes provide no direct user facing benefits, but represent
significant improvements to the internals and overall performance
of rustc and related tools.

[93313]: https://github.com/rust-lang/rust/pull/93313/
[93969]: https://github.com/rust-lang/rust/pull/93969/
[94079]: https://github.com/rust-lang/rust/pull/94079/
[94206]: https://github.com/rust-lang/rust/pull/94206/
[94457]: https://github.com/rust-lang/rust/pull/94457/
[94775]: https://github.com/rust-lang/rust/pull/94775/
[94872]: https://github.com/rust-lang/rust/pull/94872/
[95006]: https://github.com/rust-lang/rust/pull/95006/
[95035]: https://github.com/rust-lang/rust/pull/95035/
[95372]: https://github.com/rust-lang/rust/pull/95372/
[95380]: https://github.com/rust-lang/rust/pull/95380/
[95431]: https://github.com/rust-lang/rust/pull/95431/
[95705]: https://github.com/rust-lang/rust/pull/95705/
[95801]: https://github.com/rust-lang/rust/pull/95801/
[95819]: https://github.com/rust-lang/rust/pull/95819/
[95841]: https://github.com/rust-lang/rust/pull/95841/
[96042]: https://github.com/rust-lang/rust/pull/96042/
[96150]: https://github.com/rust-lang/rust/pull/96150/
[96268]: https://github.com/rust-lang/rust/pull/96268/
[96279]: https://github.com/rust-lang/rust/pull/96279/
[96393]: https://github.com/rust-lang/rust/pull/96393/
[96436]: https://github.com/rust-lang/rust/pull/96436/
[96557]: https://github.com/rust-lang/rust/pull/96557/

[`bool::then_some`]: https://doc.rust-lang.org/stable/std/primitive.bool.html#method.then_some
[`f32::total_cmp`]: https://doc.rust-lang.org/stable/std/primitive.f32.html#method.total_cmp
[`f64::total_cmp`]: https://doc.rust-lang.org/stable/std/primitive.f64.html#method.total_cmp
[`Stdin::lines`]: https://doc.rust-lang.org/stable/std/io/struct.Stdin.html#method.lines
[`impl<T: Default> Default for AssertUnwindSafe<T>`]: https://doc.rust-lang.org/stable/std/panic/struct.AssertUnwindSafe.html#impl-Default
[rc-u8-from-str]: https://doc.rust-lang.org/stable/std/rc/struct.Rc.html#impl-From%3CRc%3Cstr%3E%3E
[arc-u8-from-str]: https://doc.rust-lang.org/stable/std/sync/struct.Arc.html#impl-From%3CArc%3Cstr%3E%3E
[stdarch/1285]: https://github.com/rust-lang/stdarch/pull/1285
[`windows::CommandExt::raw_arg`]: https://doc.rust-lang.org/stable/std/os/windows/process/trait.CommandExt.html#tymethod.raw_arg
[`FusedIterator for EncodeWide`]: https://doc.rust-lang.org/stable/std/os/windows/ffi/struct.EncodeWide.html#impl-FusedIterator

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a7e81b2c41863ea733f4687536ec122b90fcb126

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust/Makefile                                      |  77 ++++----
 rust/distinfo                                      | 200 ++++++++++-----------
 rust/files/gcc-wrap                                |   6 +-
 ...c-0.2.116_src_unix_bsd_netbsdlike_netbsd_mod.rs |  29 ---
 ...c-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs |  30 ++++
 ...c-0.2.123_src_unix_bsd_netbsdlike_netbsd_mod.rs |  29 +++
 6 files changed, 201 insertions(+), 170 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index cde8302de0..e50b869aca 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.61.0-src
+DISTNAME=	rustc-1.62.0-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
@@ -177,7 +177,7 @@ BUILDLINK_TRANSFORM.NetBSD+=	rm:-Wl,--enable-new-dtags
 DISTFILES:=		${DEFAULT_DISTFILES}
 
 .if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.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
@@ -185,7 +185,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.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
@@ -193,7 +193,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.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
@@ -201,7 +201,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.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
@@ -209,7 +209,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.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
@@ -217,7 +217,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.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
@@ -225,7 +225,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.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
@@ -252,7 +252,7 @@ CONFIGURE_ARGS+=	--target=${RUST_ARCH}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.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
@@ -260,10 +260,10 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.0
 RUST_ARCH=		i586-unknown-netbsd
-RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
-RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
+RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
+RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
 SITES.${RUST_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -278,21 +278,21 @@ pre-build-fix:
 	${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.60.0
+RUST_STAGE0_VER=	1.61.0
 RUST_ARCH=		x86_64-unknown-netbsd
-RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
-RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
+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}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.0
 RUST_ARCH=		powerpc-unknown-netbsd
 
 # Cross-built against NetBSD 9.0
 .  if empty(OS_VERSION:M8.*) || make(distinfo) || make(makesum) || make(mdi)
-RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}90.tar.gz
-RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}90.tar.gz
+RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}90.tar.xz
+RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}90.tar.xz
 DISTFILES:=			${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 SITES.${RUST_STAGE0}=		${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
@@ -300,8 +300,8 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 
 # Cross-built against NetBSD 8.0
 .  if !empty(OS_VERSION:M8.*) || make(distinfo) || make(makesum) || make(mdi)
-RUST_STAGE0:=			rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
-RUST_STD_STAGE0:=		rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
+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}
 SITES.${RUST_STAGE0}=		${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
@@ -310,30 +310,30 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.0
 RUST_ARCH=		aarch64-unknown-netbsd
-RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
-RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
+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}
 SITES.${RUST_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64eb) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.0
 RUST_ARCH=		aarch64_be-unknown-netbsd
-RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
-RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
+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}
 SITES.${RUST_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.60.0
+RUST_STAGE0_VER=	1.61.0
 RUST_ARCH=		sparc64-unknown-netbsd
-RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
-RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
+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}
 SITES.${RUST_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
@@ -341,9 +341,9 @@ pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
 RUST_ARCH=		armv7-unknown-netbsd-eabihf
-RUST_STAGE0_VER=	1.60.0
-RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
-RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
+RUST_STAGE0_VER=	1.61.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}
 SITES.${RUST_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
@@ -385,13 +385,12 @@ CKSUM_CRATES+=	vendor/cc-1.0.69
 CKSUMS+=	6dde684bdcc1bb03a808784ce8ccc0721f53bfdf87b84c607045aada916730ba
 CKSUMS+=	dd09a6ad92c998b3cc15d81b3b56a70544886fe0c22d659406aa25d734fe2fd1
 
-CKSUM_CRATES+=	vendor/libc-0.2.116
-CKSUMS+=	5f927d3d26165689b3ae7a7535ea5504068a406ef76705572c610995dbea1f0e
-CKSUMS+=	a8da54099bdddb92bd0150fd23b90a7d94216927297b7b24bee219e7e1f754e1
-
-#CKSUM_CRATES+=	vendor/rustc-ap-rustc_target
-#CKSUMS+=	5a8bae7d5b6feb07a75226ad061455298f05627086a3b444cb2a1a6272899d88
-#CKSUMS+=	673ac3b6875d487ace59b01725d83d2fab4af60615d1f8edd95bf21295947433
+CKSUM_CRATES+=	vendor/libc
+CKSUMS+=	8826303cad14a575fa8189f67c7df52a7e11f8eea0381d7d389ff8206757de9e
+CKSUMS+=	f79ec5ad2156182d51cf70d80401293da6f8277983dbdedfd2e6927133440e42
+#CKSUM_CRATES+=	vendor/libc
+CKSUMS+=	976b07a13e195840b67c166a62318abfa9ffc8d5ebbb0358f199dd213ec98d1b
+CKSUMS+=	ee760c856bb491d885e9458fb723c53db7988ba775e59ab5b9ee8be438e69cf4
 
 CKSUM_CRATES+=	vendor/lzma-sys
 CKSUMS+=	6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
diff --git a/rust/distinfo b/rust/distinfo
index 7c69e36841..182a7fd7d4 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -3,105 +3,105 @@ $NetBSD: distinfo,v 1.118 2020/08/06 11:42:56 jperkin Exp $
 BLAKE2s (rust-1.58.1-x86_64-unknown-illumos.tar.gz) = 867ef1783de52f6d6c59905d0fea90ac9db8ed623ed58956acba6af090521508
 SHA512 (rust-1.58.1-x86_64-unknown-illumos.tar.gz) = 9649f840e8052f3d77c40938d9e651035f181f7ed71b2d4375dd911a270cb9e3d1d86f8ca62629e230e02612d6972729b5f3becca16af9eb3c53c4538a4a2f3b
 Size (rust-1.58.1-x86_64-unknown-illumos.tar.gz) = 196899563 bytes
-BLAKE2s (rust-1.60.0-aarch64-apple-darwin.tar.gz) = 08230723b5f29aa187fde0e3300314ee5d75a2bfdc3f42519a2cf1e7c98430d0
-SHA512 (rust-1.60.0-aarch64-apple-darwin.tar.gz) = 305ffbc825905b52a30ecc8e3caa0e818b0d3fb46a7fb7342af9b35765aaa3ab7e1d2be2bb76d2f89c5a49a466eadb6ddc8de098d6ec613c2e1599100053c39f
-Size (rust-1.60.0-aarch64-apple-darwin.tar.gz) = 221417609 bytes
-BLAKE2s (rust-1.60.0-aarch64-unknown-linux-gnu.tar.gz) = 21206309ecf9a1bb057628a06a2457cb85d1178d3e47ce9edfceacdae994db11
-SHA512 (rust-1.60.0-aarch64-unknown-linux-gnu.tar.gz) = ccbbe27836b547c44e2716adf95fed08bc411681f8f4a2957d13d701af6099a4900ac34c901da82b0b947d5b39e5d3697b5b5db6d9145544ce2398e4f5bb68f8
-Size (rust-1.60.0-aarch64-unknown-linux-gnu.tar.gz) = 381444465 bytes
-BLAKE2s (rust-1.60.0-aarch64-unknown-netbsd.tar.gz) = 282790e8e05f8570f3d7f49ad031efe12a4f4944f97e01b410e6f98aa6b1337c
-SHA512 (rust-1.60.0-aarch64-unknown-netbsd.tar.gz) = e11976892f12c0d7932f08bd467ccaf979c086acf5e49903ff1331e4755bec8799e73f57c83924b1397e19e7e58aa880bcce9e500473e567cdc3107612378a62
-Size (rust-1.60.0-aarch64-unknown-netbsd.tar.gz) = 244202398 bytes
-BLAKE2s (rust-1.60.0-aarch64_be-unknown-netbsd.tar.gz) = d49f2356456247b532205535b952e6b85d31495d781b50f259022d5259af99c9
-SHA512 (rust-1.60.0-aarch64_be-unknown-netbsd.tar.gz) = 1d091d26250aeba17420eb33f981162efdc4ef94ba159f9dc9dcb57e6af1768bde87a3b46dabdb612b1f71bcbebd7957abaa2ea4ffeb61e3684b1f795fd2bd10
-Size (rust-1.60.0-aarch64_be-unknown-netbsd.tar.gz) = 248623552 bytes
-BLAKE2s (rust-1.60.0-arm-unknown-linux-gnueabihf.tar.gz) = 26de40f134ca5af2b302418f48e055ee92f552c0ffd6058d7270fd14e5417079
-SHA512 (rust-1.60.0-arm-unknown-linux-gnueabihf.tar.gz) = 97cc76262d9f5006cdc25f06e2cc95f34db4434b0f743eb17a4db65c9f9cd165360beb948c70e4e005be5faab257ed0b2fa37ba0641a7ec961e60148abaeafe9
-Size (rust-1.60.0-arm-unknown-linux-gnueabihf.tar.gz) = 312425675 bytes
-BLAKE2s (rust-1.60.0-armv7-unknown-linux-gnueabihf.tar.gz) = 58f38c6e25b1311a29d08cc600917561e18c49671444f5558193b4433e344840
-SHA512 (rust-1.60.0-armv7-unknown-linux-gnueabihf.tar.gz) = efe1a241743dfed6f752e69d12d8013c16d749136d35a6757cc1b4a3c456c0909d38ed7a954782641510d2eea717909265ba6c3859f9ae1b89d21ae0ef85a1e7
-Size (rust-1.60.0-armv7-unknown-linux-gnueabihf.tar.gz) = 303815017 bytes
-BLAKE2s (rust-1.60.0-armv7-unknown-netbsd-eabihf.tar.gz) = 8d29be22a90f4250ace85f3b9110d3ec733208f7c18242a4ac5cf63ff7fc5dd7
-SHA512 (rust-1.60.0-armv7-unknown-netbsd-eabihf.tar.gz) = 20b84930d545c8c4facb18a847cde8c6a6941755d7c075b5b0c933ba4fd64ff3e89ce41dfd07a2e4e4fa7b0f88737e75c5642385ee3ac4da9da7055ccb1fd722
-Size (rust-1.60.0-armv7-unknown-netbsd-eabihf.tar.gz) = 214261543 bytes
-BLAKE2s (rust-1.60.0-i586-unknown-netbsd.tar.gz) = 19d65cc0481aa2d11b84a5576cef951056ca4029cdf71723c431b5a4cf4e5fb9
-SHA512 (rust-1.60.0-i586-unknown-netbsd.tar.gz) = 76e6def376bf7e39d557a798701e71e0e0459cebaf28e6a61c828a90b7782579301928af24aa14a5d56abb4f065b9ce52f5af63eee7712a55acacbfd6ebe3dbf
-Size (rust-1.60.0-i586-unknown-netbsd.tar.gz) = 251680871 bytes
-BLAKE2s (rust-1.60.0-i686-unknown-linux-gnu.tar.gz) = 561beca01b1665ce132e597e402cfa3effa011ce834bfa6e5691b4f6f673bb3c
-SHA512 (rust-1.60.0-i686-unknown-linux-gnu.tar.gz) = 073474f77da149de6df2fdb1992d2fc6686bd86046f71088b7497f03586291708fcb9eae98306340936c4f734015a66f29c9cc9178502ac9b194e397c62eb6ca
-Size (rust-1.60.0-i686-unknown-linux-gnu.tar.gz) = 356598586 bytes
-BLAKE2s (rust-1.60.0-powerpc-unknown-netbsd.tar.gz) = b037e8ea24c1933b844e2de299504b7dddd554daa07908677598e04dd1676977
-SHA512 (rust-1.60.0-powerpc-unknown-netbsd.tar.gz) = f8f74136a6f6e19ac86bf66ec94d6136f477822042fff97f6588be8cfad04a5ce6a91f48152a739876d4f76be0a0b472e9efc24c74c6d2c9aaba93c64bf5d6a5
-Size (rust-1.60.0-powerpc-unknown-netbsd.tar.gz) = 284966325 bytes
-BLAKE2s (rust-1.60.0-powerpc-unknown-netbsd90.tar.gz) = 4131984d3d8a8ef891b153bec5117edf8be6de520cff57619f15f94a102c3049
-SHA512 (rust-1.60.0-powerpc-unknown-netbsd90.tar.gz) = c4bda2a3fb6bb96706ad50d20ddc0a242c781ef121dec50a75df051f0e6138c1aba25c7d424930017081035bd796d40f138d18a47cc0399dd31af3e6d96b83c3
-Size (rust-1.60.0-powerpc-unknown-netbsd90.tar.gz) = 291455249 bytes
-BLAKE2s (rust-1.60.0-sparc64-unknown-netbsd.tar.gz) = 13890f67fd90cd420d727d8b1c9e0592b3439c1b14a4a123ad2f7667858aa011
-SHA512 (rust-1.60.0-sparc64-unknown-netbsd.tar.gz) = b6852e843da62087e33ea64d748932ab5b6fe86fc49a937dfefb8f3e94118c08d1f5ee03d4bd03ccaf60ecdeb998a2a1af04219b31b1a8414cba7317706203ee
-Size (rust-1.60.0-sparc64-unknown-netbsd.tar.gz) = 252337191 bytes
-BLAKE2s (rust-1.60.0-x86_64-apple-darwin.tar.gz) = 895978fc329c419168e7c9257703c50fcae1c1831cab67237b854773c2fe9780
-SHA512 (rust-1.60.0-x86_64-apple-darwin.tar.gz) = 14d23525932e991ee50f2a37d2f2fea1914f67ae09f6db46c4805742b6725c48d39a61acff2ff76bb6bc8ef2951e68df30e3860ff95a3432315b83d5c3890a40
-Size (rust-1.60.0-x86_64-apple-darwin.tar.gz) = 292332759 bytes
-BLAKE2s (rust-1.60.0-x86_64-unknown-freebsd.tar.gz) = 57b81a756deab251c28f275c93ea8f5873a8cbc66afb0912fc8ffcc2d9a44f4c
-SHA512 (rust-1.60.0-x86_64-unknown-freebsd.tar.gz) = 8ae7d6e9e64753dd3ab2b0b83539d81bbd482b29e9e995b323c84834fa25c596e61312681a99de2eabf5d601fa3ec571db76336964870b755da4a612faa0600a
-Size (rust-1.60.0-x86_64-unknown-freebsd.tar.gz) = 277562600 bytes
-BLAKE2s (rust-1.60.0-x86_64-unknown-linux-gnu.tar.gz) = 73f3cc259100070497911d3041529e89a6d2d3de0835b4a4268c630a18c7162a
-SHA512 (rust-1.60.0-x86_64-unknown-linux-gnu.tar.gz) = 952d1eab97286b2c8dcd0d270f6535bd7cd5849d56afa1c929145a9030c163800113d7c82951151d1fa146967b2e369030c51fe54b0a707539db45379bd719d5
-Size (rust-1.60.0-x86_64-unknown-linux-gnu.tar.gz) = 263020998 bytes
-BLAKE2s (rust-1.60.0-x86_64-unknown-netbsd.tar.gz) = 74a733ebeaed6ae9b04442d1cd7d2d4f26ba42da04bb2169f8efd3ce178ea975
-SHA512 (rust-1.60.0-x86_64-unknown-netbsd.tar.gz) = 354da8a736b4f727db78c1884c08606729ac12087938505af5ab5713ea3515ea7e6cfc3c8096ce3b7f28e44bdf31d44f58bfa758cb9a5c9124056b328a8163ec
-Size (rust-1.60.0-x86_64-unknown-netbsd.tar.gz) = 255101002 bytes
-BLAKE2s (rust-std-1.60.0-aarch64-apple-darwin.tar.gz) = f9f767c4e64e681a464687609ecc163c51e2012fd9c781ae9c22239962555875
-SHA512 (rust-std-1.60.0-aarch64-apple-darwin.tar.gz) = 7919649923b44b40d2967c4a7025adbd2d3e26ef392bfbc4393717bf78ea77fe93e508723ea023189ca06cec751debdf301b57899784ee03e29733ff27aa17c8
-Size (rust-std-1.60.0-aarch64-apple-darwin.tar.gz) = 39295115 bytes
-BLAKE2s (rust-std-1.60.0-aarch64-unknown-linux-gnu.tar.gz) = 01db46e3dcdc94c3fd605b694a73db026b2921ab51f585dd2abf765aa90dc4ce
-SHA512 (rust-std-1.60.0-aarch64-unknown-linux-gnu.tar.gz) = edf3f80e67de5af36166068f47910a282f9af3a0a91a54220e464289c36578e2aefd719b08dc4f2d5630887caa05575a194c2e96814d075e23fbb94e80729693
-Size (rust-std-1.60.0-aarch64-unknown-linux-gnu.tar.gz) = 56612111 bytes
-BLAKE2s (rust-std-1.60.0-aarch64-unknown-netbsd.tar.gz) = 45b9362d54d2b22939a5b670ac176d57937194816039481a1c79791c41b082c0
-SHA512 (rust-std-1.60.0-aarch64-unknown-netbsd.tar.gz) = b810ccb6711a005e7879e71df14d0d09fd32e92a52165bd9092f10161f647509e156a87c0af882bac402a4dc81ae2f7c5555fb5f6847fb2a0dc96facc92dd36a
-Size (rust-std-1.60.0-aarch64-unknown-netbsd.tar.gz) = 34140738 bytes
-BLAKE2s (rust-std-1.60.0-aarch64_be-unknown-netbsd.tar.gz) = 0b653cf20e7a9f0ff375401ad91b620a26c1993e8a752b5517fccec1af6a4eaf
-SHA512 (rust-std-1.60.0-aarch64_be-unknown-netbsd.tar.gz) = c56e79586524b9cdd47d9511995a17434a353877edcb22c27bd2036b1d5f59c598e0590e0225e3b66c8bdbfd8f3fd96ffc6221e0015a9e0e1ee4481f36e45487
-Size (rust-std-1.60.0-aarch64_be-unknown-netbsd.tar.gz) = 34159175 bytes
-BLAKE2s (rust-std-1.60.0-arm-unknown-linux-gnueabihf.tar.gz) = 8c073ddc8cf3f0a0fc0bee805e0b6595f78fbd7f3bd05a75c4d2c71a30f38cb3
-SHA512 (rust-std-1.60.0-arm-unknown-linux-gnueabihf.tar.gz) = 4557ae13732b1fbcb7f45dc5a1ddd5c582b21206b126931c58574a9e3835f97a2b352a6371ddcadead9bae163fc919ae464f4300a59cc5f33b7d3cbce88fc65e
-Size (rust-std-1.60.0-arm-unknown-linux-gnueabihf.tar.gz) = 35205970 bytes
-BLAKE2s (rust-std-1.60.0-armv7-unknown-linux-gnueabihf.tar.gz) = 77b307effe60f37dfc1bae9721dfaeb138c21ac24f01e2537be1653190221072
-SHA512 (rust-std-1.60.0-armv7-unknown-linux-gnueabihf.tar.gz) = 3d6868b7457af9275fa92c4a951999ea59169800df597fbd0c366d4d0ff4b39f70912c2d33a09cf39b9e91e1439369401f175060f28d22aaa1705f3489862a20
-Size (rust-std-1.60.0-armv7-unknown-linux-gnueabihf.tar.gz) = 37062255 bytes
-BLAKE2s (rust-std-1.60.0-armv7-unknown-netbsd-eabihf.tar.gz) = b469426392411e967c1c716cfae313e21aad33c4ce80c9cb15a1d526673a6a38
-SHA512 (rust-std-1.60.0-armv7-unknown-netbsd-eabihf.tar.gz) = a8e7fdf240220f0b200f91821ff7c2bdddb1e1df9309f865a3ff402ae2bfa7cb33ffbe5b90aec0eedd398ed47ab65e9055ce9dca8dbd7136f06adc5c167a908d
-Size (rust-std-1.60.0-armv7-unknown-netbsd-eabihf.tar.gz) = 32575332 bytes
-BLAKE2s (rust-std-1.60.0-i586-unknown-netbsd.tar.gz) = b3e1379031a9e5b6257cf8a3bc10ee30e98aea5a331d3296b85a64a8f76ef606
-SHA512 (rust-std-1.60.0-i586-unknown-netbsd.tar.gz) = 7ead4f1b2f60ff42a9b2e846348f5bd464b910d495d7abbd472e2e027d0b54b2260bf45175cd1334fe31daa0381ae1f42852c43c8a28f970b4a86b962761f74d
-Size (rust-std-1.60.0-i586-unknown-netbsd.tar.gz) = 34765708 bytes
-BLAKE2s (rust-std-1.60.0-i686-unknown-linux-gnu.tar.gz) = c2f707d7b820ffb268dc0509d8842a290aaf0738ee6ac9191a5e5e502be853b6
-SHA512 (rust-std-1.60.0-i686-unknown-linux-gnu.tar.gz) = 803a2cc3a3b9fc312adae0e045e702081505b1c4ec16c4bef1ec7edbf5380d048a7570641db087e7423a76e6ca91b93ab902feb63319aa997d6bf02752d1f93a
-Size (rust-std-1.60.0-i686-unknown-linux-gnu.tar.gz) = 39085815 bytes
-BLAKE2s (rust-std-1.60.0-powerpc-unknown-netbsd.tar.gz) = 4506be6be2b0003bd7277958ad230c09730ab4d0759007c9f3419dda49398aed
-SHA512 (rust-std-1.60.0-powerpc-unknown-netbsd.tar.gz) = bfc8cf7d844d2ce1405f84b170b470324bd1e3499269a84f5ab60147caa74c9be2153f4e55913656c7d1a53c6fabb0faa1ed0b2a07c7a9b45d34712e6cb1ad2e
-Size (rust-std-1.60.0-powerpc-unknown-netbsd.tar.gz) = 30616718 bytes
-BLAKE2s (rust-std-1.60.0-powerpc-unknown-netbsd90.tar.gz) = 67e455f2418fe090504bd4d1bd1c3845b8385a5f424cc37cd31ee81d5113da93
-SHA512 (rust-std-1.60.0-powerpc-unknown-netbsd90.tar.gz) = 11f7d0d8b5782c24f64e1fdc18f4b8c949554ab57b94a72d898557c9cc55ec8bca21bf31277e81b0e529d324f24c90dec64b1eaef22469a5006f36d1c18de7f6
-Size (rust-std-1.60.0-powerpc-unknown-netbsd90.tar.gz) = 30610765 bytes
-BLAKE2s (rust-std-1.60.0-sparc64-unknown-netbsd.tar.gz) = 76944a88e4d25660ebedd90d73da33cee56d770cd11e6b10b7543f27fcb83f6e
-SHA512 (rust-std-1.60.0-sparc64-unknown-netbsd.tar.gz) = 962c70e6ee03291d867c9a8ac4bcc5182038acbd16935a28a0d6230dd62d08bbf19c839f5b96eba93b855eb6c98cbd0a0d69c3f86dd1f3bbdf5a7563c241109e
-Size (rust-std-1.60.0-sparc64-unknown-netbsd.tar.gz) = 30752314 bytes
-BLAKE2s (rust-std-1.60.0-x86_64-apple-darwin.tar.gz) = 777a95ee954434acf3f8cbaa4ab8ece2ea08762c85c2e0346440814fb076f29a
-SHA512 (rust-std-1.60.0-x86_64-apple-darwin.tar.gz) = 5a866e658ba7dc6bc0c8149dcc39e8e866d9ca60b78f7dfd4bc05cc93622972346091108bcd12e36b309bd5171d0176d39d726f38c8b0e7377953f3b8c06ddee
-Size (rust-std-1.60.0-x86_64-apple-darwin.tar.gz) = 39947593 bytes
-BLAKE2s (rust-std-1.60.0-x86_64-unknown-freebsd.tar.gz) = c1fffe5d65b2d2556e3cde22ff9e5b6bd215de88acb1f0d21c95f4c27adc16e5
-SHA512 (rust-std-1.60.0-x86_64-unknown-freebsd.tar.gz) = 6c64c60d2862dd61b0e8fa13eae9c52e67c6887bc0721a492d04af222464934e1da76b496d4a562e7049e3b94f0d61eb2ce0eb1491e370bfbeaccbf45f1f4bc1
-Size (rust-std-1.60.0-x86_64-unknown-freebsd.tar.gz) = 42078372 bytes
-BLAKE2s (rust-std-1.60.0-x86_64-unknown-linux-gnu.tar.gz) = ad5e363f1151632958d94bda9debac6a3fa01a327c5264c397eec987b91c14be
-SHA512 (rust-std-1.60.0-x86_64-unknown-linux-gnu.tar.gz) = 2fccacf359b434ebc349632dad1dbb2ff164fa8ba2062fb5629724a7f3c142ce8a61739fb6ce51649708c68836d449aba141415b51f9f65eeb2e922b07cd35c2
-Size (rust-std-1.60.0-x86_64-unknown-linux-gnu.tar.gz) = 43469578 bytes
-BLAKE2s (rust-std-1.60.0-x86_64-unknown-netbsd.tar.gz) = 3c6ade9f9b82c3487824252695e32e8649caf7aaf4f280f3d54caeeb9fd16300
-SHA512 (rust-std-1.60.0-x86_64-unknown-netbsd.tar.gz) = b5655b817338f63e580926036beaf5d5081131902e6a472390f189fd7503aedf1279022ba171e81568f7ccd30e2e69521044f8ff5f861cfd321e4bc8c76b73e1
-Size (rust-std-1.60.0-x86_64-unknown-netbsd.tar.gz) = 38891830 bytes
-BLAKE2s (rustc-1.61.0-src.tar.gz) = 6c6fa9ce140d5c6e2f038d99bb5de6271056106cf6aa732548dfd0e489933222
-SHA512 (rustc-1.61.0-src.tar.gz) = 486f77041f664ea73aa7c97affd3916892c5218e69dee9c701d33e629e335d1b8da12a2d23d0c18d9e9dc75f12983f961f76006395324a705b1d15444d891640
-Size (rustc-1.61.0-src.tar.gz) = 203300188 bytes
+BLAKE2s (rust-1.61.0-aarch64-apple-darwin.tar.gz) = 302f636b2e73cdd5233e520bdfec0a2071d7c0c3c299780e2de75e727024fb38
+SHA512 (rust-1.61.0-aarch64-apple-darwin.tar.gz) = 248c5d1c3b440aa1ebb8d8d519651259566407f3efd0c33724d274a4f85a371c1b3ead79be24bf38cbca8b57740cb017b26634a4c34c1f3c605d28a8d181a8af
+Size (rust-1.61.0-aarch64-apple-darwin.tar.gz) = 223157966 bytes
+BLAKE2s (rust-1.61.0-aarch64-unknown-linux-gnu.tar.gz) = 033b7a591e7880665e6b0aa0970ef6cc82788ffdaf4ffb557afbbb7b1ff2cf05
+SHA512 (rust-1.61.0-aarch64-unknown-linux-gnu.tar.gz) = e655efc0442872df855d3593c5b8b5c91037682cfcdfe5f3fc62f23c08ffe52d035bea94d9418d99f279da6835bbe4b17b92038c7c8b61dfa16a8d419e43c0ea
+Size (rust-1.61.0-aarch64-unknown-linux-gnu.tar.gz) = 384662543 bytes
+BLAKE2s (rust-1.61.0-aarch64-unknown-netbsd.tar.xz) = 1ce2a2f0feccc3be8dc3084e44a75d98a5277c4f8ef7c06503f1077110c95733
+SHA512 (rust-1.61.0-aarch64-unknown-netbsd.tar.xz) = c1ce3dd379ad469752bb4d44008f65cb4aacf5c06bc4ebe148bf43904de46e12beff404044e09d93c511172de2bd178fe050dda0b6abf56031188e8d0c290344
+Size (rust-1.61.0-aarch64-unknown-netbsd.tar.xz) = 152425036 bytes
+BLAKE2s (rust-1.61.0-aarch64_be-unknown-netbsd.tar.xz) = ee8093109204823679d484928c010f6313b27ec6e787f0d960e84cf96f132109
+SHA512 (rust-1.61.0-aarch64_be-unknown-netbsd.tar.xz) = f8b5a58a94ac9313a8c8445ba8a8d94dfa9fbfee21f3273d0d705f30ecec4eeeb0325723a73381fa2ea32ced419f09279f1233c174f749aa4ada93ec6810cabf
+Size (rust-1.61.0-aarch64_be-unknown-netbsd.tar.xz) = 153824936 bytes
+BLAKE2s (rust-1.61.0-arm-unknown-linux-gnueabihf.tar.gz) = 3ad009c7620aacb0d3d4e6a43d87cd8b2fdb7643955ebceef5111ba867bbc52b
+SHA512 (rust-1.61.0-arm-unknown-linux-gnueabihf.tar.gz) = 74ada02f436b2a97e05c8ec5bb8f7c0b638c5a59a71f04ba274efa6016a10514477480bce4e3023fe5586ab3190bdc270db723787d4d8ffccbaf0ba995325c1d
+Size (rust-1.61.0-arm-unknown-linux-gnueabihf.tar.gz) = 313941585 bytes
+BLAKE2s (rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.gz) = 3a66ca94537a649efdcf4f87a26941717bbabf4da56edd330c6d0e1a5423e55f
+SHA512 (rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.gz) = 951e49690023a681215f0911937af84642dda2e5be5261629eda6662f50fdd8fea0cfb20d8067cd39b6eea51cc0e5fe7e0ab337c8c379d7408b1669816754c4d
+Size (rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.gz) = 305528469 bytes
+BLAKE2s (rust-1.61.0-armv7-unknown-netbsd-eabihf.tar.xz) = fcfc58215e88b6a4d37994362def451a4d2b53aa1e941224a12d523d947d8fcf
+SHA512 (rust-1.61.0-armv7-unknown-netbsd-eabihf.tar.xz) = 5f14d9489a472aa743a49870f561ff7f99d92eac9db4e56f4909a38710e4e7e496b48387392afc9e4dd0d29efb971d7c893a38108791bb29127f15bfb6af5e24
+Size (rust-1.61.0-armv7-unknown-netbsd-eabihf.tar.xz) = 131446548 bytes
+BLAKE2s (rust-1.61.0-i586-unknown-netbsd.tar.xz) = 5b3fff5a7a53ca37dfc4ada3fefc2d494a60d7df785275b4b745be867ef4ad34
+SHA512 (rust-1.61.0-i586-unknown-netbsd.tar.xz) = 26d8d732d807ee62208db05c37e68dfe3f43924e0e4a57f02f86442e49f1660d736d74c218301af00a94fe62d35ea4a2eb2056c996387d6fc369cd2f4804a59b
+Size (rust-1.61.0-i586-unknown-netbsd.tar.xz) = 164105180 bytes
+BLAKE2s (rust-1.61.0-i686-unknown-linux-gnu.tar.gz) = b3d33a7243bed8546e1f233bb936970bfb4a1485902307430f479f5a9fb98dc2
+SHA512 (rust-1.61.0-i686-unknown-linux-gnu.tar.gz) = d2e7365ddc08e04de94a3aa1eb0388001e574d1a768e5506d88c6a637ebae54bcf6cf1790b08243bfdf439088c5fbaf1e8979cb2c80b699d47802149a7d26d76
+Size (rust-1.61.0-i686-unknown-linux-gnu.tar.gz) = 359348717 bytes
+BLAKE2s (rust-1.61.0-powerpc-unknown-netbsd.tar.xz) = 6d90142d69fd475a45713b7a1e9ea63465537d854e3b498baf5285eb87d60662
+SHA512 (rust-1.61.0-powerpc-unknown-netbsd.tar.xz) = b6e082decdcb28f4bb1c078ea48717c4ad3ef20d7cfecbc768df23e33b757515a266ad3146633a20befaf2da9ac443e1dd1ed69867513c1ce324e097808da9b5
+Size (rust-1.61.0-powerpc-unknown-netbsd.tar.xz) = 171267280 bytes
+BLAKE2s (rust-1.61.0-powerpc-unknown-netbsd90.tar.xz) = fae7b4b7c7aa5b82c3baa01534a430864e30d5338ddbf94dc3926d775feb0930
+SHA512 (rust-1.61.0-powerpc-unknown-netbsd90.tar.xz) = 5a4a10690155fe743536ff6490df7edb2dea3ba3be556bc2e3d9f903c66db58dd8f8d1430d9cfa067797db0006ddfb4191ade74109cbec74fa16a742d0f4d37c
+Size (rust-1.61.0-powerpc-unknown-netbsd90.tar.xz) = 173506228 bytes
+BLAKE2s (rust-1.61.0-sparc64-unknown-netbsd.tar.xz) = a30a9e02b087c374f54a2505aa70e62888070d7f0f1633cde5b0303a1099928a
+SHA512 (rust-1.61.0-sparc64-unknown-netbsd.tar.xz) = 0c08758d93b3d20fd9694e0a1e74d0db8a1065d362610b05e25cd6d4b2a5f5ceb6453fde8e03b90b328fdc1508cb385fd2331df89e8762f24d4b0dc56e34920d
+Size (rust-1.61.0-sparc64-unknown-netbsd.tar.xz) = 148653524 bytes
+BLAKE2s (rust-1.61.0-x86_64-apple-darwin.tar.gz) = 586f09f54f6bfa48bca1362e0aff4a77577de51c9ec7ba40039f21bbe6fe0f9d
+SHA512 (rust-1.61.0-x86_64-apple-darwin.tar.gz) = f585487ad238ee3a8d9268f5bcd76019da67de96ebd5a84d3b5f809ad6f3cd2ae79c7d93d8d2affbbf4bdfa61ab577a34a885196fe09408a658a577d20a892b2
+Size (rust-1.61.0-x86_64-apple-darwin.tar.gz) = 294924562 bytes
+BLAKE2s (rust-1.61.0-x86_64-unknown-freebsd.tar.gz) = b45e3011ce13ceeebac6eb179042c04da61713daaee1d01f3006f4c1563a974d
+SHA512 (rust-1.61.0-x86_64-unknown-freebsd.tar.gz) = da30babf3a6dba8af0cfdf5f131206360219af1b598568f6cbb55680e74e4d7a38ff14166e69daa4b8c16d7d9d9e2866511b9c20090b8e136b275ecb8c5a0133
+Size (rust-1.61.0-x86_64-unknown-freebsd.tar.gz) = 279844072 bytes
+BLAKE2s (rust-1.61.0-x86_64-unknown-linux-gnu.tar.gz) = 5f3564c314d3622d64a590267706097d1cb9704c252638f07aa239c1fcf48256
+SHA512 (rust-1.61.0-x86_64-unknown-linux-gnu.tar.gz) = 7352d98d3acfe8bd754641381435d4bcb3399a8448fe6883b7c96ee41ffa380d8545cc8471ca4b21ee29c0d8e891e28de3ab91e985ad16b88965342358a87590
+Size (rust-1.61.0-x86_64-unknown-linux-gnu.tar.gz) = 267765196 bytes
+BLAKE2s (rust-1.61.0-x86_64-unknown-netbsd.tar.xz) = 286cc36270967561d44dd469ecb03fe8356e76fc1d44beb1b2ad92644149a483
+SHA512 (rust-1.61.0-x86_64-unknown-netbsd.tar.xz) = ada2acd0f34c45e689ae97d98fa3cfbcbdb330b9231178c1b3e91c0474af47a84a3ae893309aed1fb14b726e2b07894713520fedebc2b534b16cd559d276cf43
+Size (rust-1.61.0-x86_64-unknown-netbsd.tar.xz) = 168759980 bytes
+BLAKE2s (rust-std-1.61.0-aarch64-apple-darwin.tar.gz) = 1a6ce39d1b191696803a8e4190992217cf0c77133cd4a59f0b3fdcaa99a1ee17
+SHA512 (rust-std-1.61.0-aarch64-apple-darwin.tar.gz) = b5d613d9484ed7d505e62bd905f573565b691a11e61416b78b6f0dcd0e7bf8528b608ae8ae65a0523aa1b85d755e725399a3a250a7c5a7cd015a5d364bce5348
+Size (rust-std-1.61.0-aarch64-apple-darwin.tar.gz) = 40372015 bytes
+BLAKE2s (rust-std-1.61.0-aarch64-unknown-linux-gnu.tar.gz) = eb33ffa3c0de6a95d7de177ba08a9220d42203adc8906a2634fd6edc8c54b36c
+SHA512 (rust-std-1.61.0-aarch64-unknown-linux-gnu.tar.gz) = 574984228b3f39e43bc751a01593e8831e5f1b9c87a79f2b5870ee356206bf14572169f91bbf73a76081eea100bde73dd4a4bf176dcbf882394c7ef46d1f2aea
+Size (rust-std-1.61.0-aarch64-unknown-linux-gnu.tar.gz) = 57803910 bytes
+BLAKE2s (rust-std-1.61.0-aarch64-unknown-netbsd.tar.xz) = f32b0fa6188491cb80578d780a8d56461b9a5c8fa5a237950a80399f7e02d799
+SHA512 (rust-std-1.61.0-aarch64-unknown-netbsd.tar.xz) = 65962e7a5752645cb1e51b3338ddd358d5575faf74cf5869c12d5593e0daa9f898442d11ffde198873bc1eeb707f47c49aa90b1444d15e00dd1712698998d7f5
+Size (rust-std-1.61.0-aarch64-unknown-netbsd.tar.xz) = 23632144 bytes
+BLAKE2s (rust-std-1.61.0-aarch64_be-unknown-netbsd.tar.xz) = b209b1bb802c4631c1b62121045ca86b4144bf4a778bb102587cce8535ebea38
+SHA512 (rust-std-1.61.0-aarch64_be-unknown-netbsd.tar.xz) = e63ea551dd707882dd5a9db380a6d125bd36394c97833b47e840d5ee446b6acbb8b029881fd8ab74153ee3da042a995ebe7b708b0951b657ca6654d2915d20a3
+Size (rust-std-1.61.0-aarch64_be-unknown-netbsd.tar.xz) = 23334820 bytes
+BLAKE2s (rust-std-1.61.0-arm-unknown-linux-gnueabihf.tar.gz) = ab3d1591f25a7f39e9c1b0bb16506dea2ef31a5020b63cb11055d8b1c17520c5
+SHA512 (rust-std-1.61.0-arm-unknown-linux-gnueabihf.tar.gz) = d3d834a55107bed04ef71479db9d10a0e895422874d754ba8f36f0633291d395d9e869f9de9160df619f5102b29434a4c2a464a5a40d8845f9aec77bc25992cc
+Size (rust-std-1.61.0-arm-unknown-linux-gnueabihf.tar.gz) = 36343974 bytes
+BLAKE2s (rust-std-1.61.0-armv7-unknown-linux-gnueabihf.tar.gz) = 8b46d14aa8a2bdcd0f5df8d324edc12bea56abf72ca5f3626302b164823790c8
+SHA512 (rust-std-1.61.0-armv7-unknown-linux-gnueabihf.tar.gz) = d92eb00c53ed725c55aaa2addb1c9e9ea92c8c07d2305e7565c960a3c670a17239df17b7942f5d8f8ddd5d3fcf95c4a9051366f4abf0b5ad0908ff163f46fb6e
+Size (rust-std-1.61.0-armv7-unknown-linux-gnueabihf.tar.gz) = 38251240 bytes
+BLAKE2s (rust-std-1.61.0-armv7-unknown-netbsd-eabihf.tar.xz) = 21d2975a4d1cb48bab85cdc96da017895ba17cd10828ad941803a06cbd451cf8
+SHA512 (rust-std-1.61.0-armv7-unknown-netbsd-eabihf.tar.xz) = 96a21ba042e7313f94244f56e8b946b9f69ace8126770b9aec591755f7ea49553af28d00efc84d9eed214801c615394c0668ff1963090905ca8a98d2358a991a
+Size (rust-std-1.61.0-armv7-unknown-netbsd-eabihf.tar.xz) = 22710204 bytes
+BLAKE2s (rust-std-1.61.0-i586-unknown-netbsd.tar.xz) = 6e243ba70f0855a331e245d737989bf130058a9c5174448a0d1ce2b2c4b7d448
+SHA512 (rust-std-1.61.0-i586-unknown-netbsd.tar.xz) = ff746760d086bfb0b77932aa8167cebc2ecc0b6a35e3174ba2019b431f21bd8ca278f3a74f3f080b555d775add4d0b2604e12f7381cc7bf11717b24b82563ca9
+Size (rust-std-1.61.0-i586-unknown-netbsd.tar.xz) = 23293816 bytes
+BLAKE2s (rust-std-1.61.0-i686-unknown-linux-gnu.tar.gz) = 61440054014a811b7423c0eccd3cd9fd71c1dfff11dd959a530ed26856f6ea04
+SHA512 (rust-std-1.61.0-i686-unknown-linux-gnu.tar.gz) = c4140820a64b5079c156b7125fc0127b8b6c23b6e2a7fa4b8fb1935a2041d1248ca8c07acd14091bb0b7ef25012c256a951f906da34389df0fb8e5cbd8e71978
+Size (rust-std-1.61.0-i686-unknown-linux-gnu.tar.gz) = 40230974 bytes
+BLAKE2s (rust-std-1.61.0-powerpc-unknown-netbsd.tar.xz) = 089b76e138ffdc9f7b0a3778dc2f02dc967ebc720bdbca8d3631b0461f3b9d05
+SHA512 (rust-std-1.61.0-powerpc-unknown-netbsd.tar.xz) = 3d30a7c2c179ba619b5e26d7f3fc5836bcfce674e0761541af2bed64e1a139247559e011b2656f76ea7eb82f613d4e04811c6efa62527bdebf9d7c1f126b8ae5
+Size (rust-std-1.61.0-powerpc-unknown-netbsd.tar.xz) = 21332952 bytes
+BLAKE2s (rust-std-1.61.0-powerpc-unknown-netbsd90.tar.xz) = 27b508588df75b65a4615a58243b5886e3e27945311b95cb13166d8c5aa0a75c
+SHA512 (rust-std-1.61.0-powerpc-unknown-netbsd90.tar.xz) = f139d347f8605bc42065db26dc7d1a434413ec253785040ad6fac7a79ec273df18171369c2997491ece6492790055f7e604471f9df838ac92b424f6e986e392f
+Size (rust-std-1.61.0-powerpc-unknown-netbsd90.tar.xz) = 21334304 bytes
+BLAKE2s (rust-std-1.61.0-sparc64-unknown-netbsd.tar.xz) = c299a2ec5cd573f032fc76c0e702cbb5576d77cc42b90de31f54a3b310c572d7
+SHA512 (rust-std-1.61.0-sparc64-unknown-netbsd.tar.xz) = bb1749000628b9e35af994cd1722007a477435a113d5c95d6281abb61cbe06a9790de9c591ffa8cc9a2164eb345cf96a8dab0a2319bb6d78ed5a5d3cbe92fc75
+Size (rust-std-1.61.0-sparc64-unknown-netbsd.tar.xz) = 21462720 bytes
+BLAKE2s (rust-std-1.61.0-x86_64-apple-darwin.tar.gz) = 1ce8738fc0ce4e5864feb0cd2b70129a4faff271cef06e19cd490131f98cc941
+SHA512 (rust-std-1.61.0-x86_64-apple-darwin.tar.gz) = 37a36ed8abc2a304feb85d431731baf2d3fdca894e15a70691ec03758c224a77040d0397b7cd8a116f1780016feecb188daf73363b9f1f699b728db17b5f41d9
+Size (rust-std-1.61.0-x86_64-apple-darwin.tar.gz) = 41009315 bytes
+BLAKE2s (rust-std-1.61.0-x86_64-unknown-freebsd.tar.gz) = 1f92252ef318448abefb42ab70b3b4586ea1bf11b1ebfc8c13ae421f5fb18561
+SHA512 (rust-std-1.61.0-x86_64-unknown-freebsd.tar.gz) = c17cea0286ef48c9d7bd3af9e0995a2195f57a0fdf0eac27c95d356f1203ab173e94fa007bf70b7a81547a0f71a5236510bdd7f0dd69c836bb689fbcd678b046
+Size (rust-std-1.61.0-x86_64-unknown-freebsd.tar.gz) = 43121370 bytes
+BLAKE2s (rust-std-1.61.0-x86_64-unknown-linux-gnu.tar.gz) = 825453fd8e2badb7f1d2acc09ace3b5b581032db111e090c81c27cf369758804
+SHA512 (rust-std-1.61.0-x86_64-unknown-linux-gnu.tar.gz) = 57d8f2647f8732fb4c3d8b9581822911d650d4d5f32c01ab60158b38626cfff416cd435231fb312aa4c09da823a59bbb5a50492c8d197d2c628f793c9791dd30
+Size (rust-std-1.61.0-x86_64-unknown-linux-gnu.tar.gz) = 44597191 bytes
+BLAKE2s (rust-std-1.61.0-x86_64-unknown-netbsd.tar.xz) = 65c40ed6e23cecae9dbab49f746140887be77cb4bffd588df957d25ec025f68a
+SHA512 (rust-std-1.61.0-x86_64-unknown-netbsd.tar.xz) = 4dfee06b1cd8a7d0a1f1b24d402e40fe0b751e3ae38ace8ad93c5d7384da7228079a4de5e402d32c3b087027dea4b86354f6a0af327c7781cfa602786613e098
+Size (rust-std-1.61.0-x86_64-unknown-netbsd.tar.xz) = 26321476 bytes
+BLAKE2s (rustc-1.62.0-src.tar.gz) = 3436ac95150ca6e30b6ea48c77eeab3fd6905e39b67342d5eb1adad72a4a063c
+SHA512 (rustc-1.62.0-src.tar.gz) = db1eec288661a384ea387102834aae35364099c7c93d90367940718904028c13dc08f879749ee048ce3420aaa043ed4853a7c514a7c1b8a5d1c25f04b9e22a8e
+Size (rustc-1.62.0-src.tar.gz) = 202192764 bytes
 SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = a9a891b9c507958354fb819587d6d4b31ff83ce6
 SHA1 (patch-compiler_rustc__llvm_build.rs) = 73f8225f6dea809da9381d78a8099d13c7c151c0
 SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = c81d0d288699056ae45569f8d0a1c9bb08153ec4
@@ -130,8 +130,8 @@ SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = b93148ff72a60a17c6a444f26
 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) = 2f6b0ad800b31cd33334f194651981491ecf7641
-SHA1 (patch-vendor_libc-0.2.116_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 90144e0a6a91db61c42308181a25bdf5ff60e670
 SHA1 (patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs) = d0af451a8d6a2061cf470968069e4270e5cfcb73
+SHA1 (patch-vendor_libc-0.2.123_src_unix_bsd_netbsdlike_netbsd_mod.rs) = a0177bbfa1935ea5001551fd93e92fef41890089
 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
diff --git a/rust/files/gcc-wrap b/rust/files/gcc-wrap
index 53b45e099f..b2db9c5b51 100644
--- a/rust/files/gcc-wrap
+++ b/rust/files/gcc-wrap
@@ -72,7 +72,8 @@ while [ $# -gt 0 ]; do
 			args="$args -I=/usr/include/krb5"
 			;;
 		-I/usr/pkg/include)
-			args="$args -I=/usr/pkg/include"
+# Try to drop this...
+#			args="$args -I=/usr/pkg/include"
 			;;
 		-I)
 			if [ $2 = "/usr/include" ]; then
@@ -82,7 +83,8 @@ while [ $# -gt 0 ]; do
 				args="$args -I=/usr/include/krb5"
 				shift
 			elif [ $2 = "/usr/pkg/include" ]; then
-				args="$args -I=/usr/pkg/include"
+# Try to drop this too...
+#				args="$args -I=/usr/pkg/include"
 				shift
 			else
 				args="$args -I"
diff --git a/rust/patches/patch-vendor_libc-0.2.116_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust/patches/patch-vendor_libc-0.2.116_src_unix_bsd_netbsdlike_netbsd_mod.rs
deleted file mode 100644
index 0e3314d9da..0000000000
--- a/rust/patches/patch-vendor_libc-0.2.116_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.116/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2022-04-04 11:10:56.000000000 +0000
-+++ vendor/libc-0.2.116/src/unix/bsd/netbsdlike/netbsd/mod.rs
-@@ -2787,6 +2787,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-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
new file mode 100644
index 0000000000..2cfbdfe8d0
--- /dev/null
+++ b/rust/patches/patch-vendor_libc-0.2.119_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Copy execinfo function definitions from openbsd's mod.rs.
+
+--- vendor/libc-0.2.119/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2022-05-18 03:01:05.000000000 +0000
++++ vendor/libc-0.2.119/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -2788,6 +2788,23 @@ 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-0.2.123_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust/patches/patch-vendor_libc-0.2.123_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..d925c25d65
--- /dev/null
+++ b/rust/patches/patch-vendor_libc-0.2.123_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,29 @@
+$NetBSD$
+
+Copy execinfo function definitions from openbsd's mod.rs.
+
+--- vendor/libc-0.2.123/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig	2022-06-27 15:22:31.000000000 +0000
++++ vendor/libc-0.2.123/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -2784,6 +2784,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;
Prev by Date: openssl3: add package for version 3 of openssl
Next by Date: aws-iam-authenticator: Add reference to CVE-2022-2385
Previous by Thread: openssl3: add package for version 3 of openssl
Next by Thread: aws-iam-authenticator: Add reference to CVE-2022-2385
Indexes:
Home | Main Index | Thread Index | Old Index