From ade04c92c2dca6d8f8609125bf3e80fa8345dab2 Mon Sep 17 00:00:00 2001
From: Dan Gohman <dev@sunfishcode.online>
Date: Wed, 13 Apr 2022 09:51:57 -0700
Subject: [PATCH] Update to rustix 0.33.6. (#4022)

Relevant to Wasmtime, this fixes undefined references to `utimensat` and
`futimens` on macOS 10.12 and earlier. See bytecodealliance/rustix#157
for details.

It also contains a fix for s390x which isn't currently needed by Wasmtime
itself, but which is needed to make rustix's own testsuite pass on s390x,
which helps people packaging rustix for use in Wasmtime. See
bytecodealliance/rustix#277 for details.
---
 Cargo.lock                                 | 4 ++--
 Cargo.toml                                 | 2 +-
 crates/cache/Cargo.toml                    | 2 +-
 crates/fiber/Cargo.toml                    | 2 +-
 crates/jit-debug/Cargo.toml                | 2 +-
 crates/jit/Cargo.toml                      | 2 +-
 crates/runtime/Cargo.toml                  | 2 +-
 crates/wasi-common/Cargo.toml              | 2 +-
 crates/wasi-common/cap-std-sync/Cargo.toml | 2 +-
 crates/wasi-common/tokio/Cargo.toml        | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ba662af8df..11bb1a1770 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2500,9 +2500,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.33.5"
+version = "0.33.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03627528abcc4a365554d32a9f3bbf67f7694c102cfeda792dc86a2d6057cc85"
+checksum = "7ac32d9fc97153ca55305284cb6c2dcbb84e1fc6d7ac13392cea02222f2d8741"
 dependencies = [
  "bitflags",
  "errno",
diff --git a/Cargo.toml b/Cargo.toml
index 84f28e5773..ed29aea55e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,7 +42,7 @@ lazy_static = "1.4.0"
 listenfd = "0.3.5"
 
 [target.'cfg(unix)'.dependencies]
-rustix = "0.33.5"
+rustix = "0.33.6"
 
 [dev-dependencies]
 # depend again on wasmtime to activate its default features for tests
diff --git a/crates/cache/Cargo.toml b/crates/cache/Cargo.toml
index fffcde25d7..c4c6736bfc 100644
--- a/crates/cache/Cargo.toml
+++ b/crates/cache/Cargo.toml
@@ -24,7 +24,7 @@ zstd = { version = "0.11.1", default-features = false }
 winapi = "0.3.7"
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
-rustix = "0.33.5"
+rustix = "0.33.6"
 
 [dev-dependencies]
 filetime = "0.2.7"
diff --git a/crates/fiber/Cargo.toml b/crates/fiber/Cargo.toml
index 4c9261357a..013f224914 100644
--- a/crates/fiber/Cargo.toml
+++ b/crates/fiber/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2021"
 links = "wasmtime-fiber-shims"
 
 [target.'cfg(unix)'.dependencies]
-rustix = "0.33.5"
+rustix = "0.33.6"
 
 [target.'cfg(windows)'.dependencies.winapi]
 version = "0.3.9"
diff --git a/crates/jit-debug/Cargo.toml b/crates/jit-debug/Cargo.toml
index eb67e54637..231e521451 100644
--- a/crates/jit-debug/Cargo.toml
+++ b/crates/jit-debug/Cargo.toml
@@ -15,7 +15,7 @@ lazy_static = {version = "1.3.0", optional = true }
 object = { version = "0.27.0", default-features = false, features = ["std", "read_core"], optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-rustix = { version = "0.33.5", optional = true }
+rustix = { version = "0.33.6", optional = true }
 
 [badges]
 maintenance = { status = "actively-developed" }
diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml
index f9e326bc25..6f2501a878 100644
--- a/crates/jit/Cargo.toml
+++ b/crates/jit/Cargo.toml
@@ -33,7 +33,7 @@ log = "0.4.8"
 winapi = { version = "0.3.8", features = ["winnt", "impl-default"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-rustix = "0.33.5"
+rustix = "0.33.6"
 
 [features]
 jitdump = ['wasmtime-jit-debug']
diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml
index ee19536605..cafe843032 100644
--- a/crates/runtime/Cargo.toml
+++ b/crates/runtime/Cargo.toml
@@ -31,7 +31,7 @@ memfd = { version = "0.4.1", optional = true }
 mach = "0.3.2"
 
 [target.'cfg(unix)'.dependencies]
-rustix = "0.33.5"
+rustix = "0.33.6"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version = "0.3.7", features = ["winbase", "memoryapi", "errhandlingapi", "handleapi"] }
diff --git a/crates/wasi-common/Cargo.toml b/crates/wasi-common/Cargo.toml
index be3d5966a7..745c479acb 100644
--- a/crates/wasi-common/Cargo.toml
+++ b/crates/wasi-common/Cargo.toml
@@ -27,7 +27,7 @@ cap-rand = "0.24.1"
 bitflags = "1.2"
 
 [target.'cfg(unix)'.dependencies]
-rustix = "0.33.5"
+rustix = "0.33.6"
 
 [target.'cfg(windows)'.dependencies]
 io-extras = "0.13.2"
diff --git a/crates/wasi-common/cap-std-sync/Cargo.toml b/crates/wasi-common/cap-std-sync/Cargo.toml
index 33fa14abd7..7e008e55ab 100644
--- a/crates/wasi-common/cap-std-sync/Cargo.toml
+++ b/crates/wasi-common/cap-std-sync/Cargo.toml
@@ -26,7 +26,7 @@ io-lifetimes = { version = "0.5.0", default-features = false }
 is-terminal = "0.1.0"
 
 [target.'cfg(unix)'.dependencies]
-rustix = "0.33.5"
+rustix = "0.33.6"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3"
diff --git a/crates/wasi-common/tokio/Cargo.toml b/crates/wasi-common/tokio/Cargo.toml
index b4dda7f029..01e3a33df6 100644
--- a/crates/wasi-common/tokio/Cargo.toml
+++ b/crates/wasi-common/tokio/Cargo.toml
@@ -20,7 +20,7 @@ anyhow = "1"
 io-lifetimes = { version = "0.5.0", default-features = false }
 
 [target.'cfg(unix)'.dependencies]
-rustix = "0.33.5"
+rustix = "0.33.6"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3"