From dbbdddf5b5b4628c162c6f18bbcd3e22f470c01b Mon Sep 17 00:00:00 2001
From: Ben Frederickson <github@benfrederickson.com>
Date: Wed, 27 Apr 2022 17:24:26 -0700
Subject: [PATCH 1/2] Update remoteprocess to v0.4.9

We were having test failures, running on newer versions of windows.
Fix by pulling in the latest remoteprocess code
---
 Cargo.lock | 78 +++++++++++++++++++++++++++++++++++++++++++++---------
 Cargo.toml |  2 +-
 2 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index deebd2fd..74c05c15 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -292,7 +292,7 @@ version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf"
 dependencies = [
- "nix",
+ "nix 0.23.1",
  "winapi",
 ]
 
@@ -427,7 +427,18 @@ checksum = "32401e89c6446dcd28185931a01b1093726d0356820ac744023e6850689bf926"
 dependencies = [
  "log",
  "plain",
- "scroll",
+ "scroll 0.10.2",
+]
+
+[[package]]
+name = "goblin"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c955ab4e0ad8c843ea653a3d143048b87490d9be56bd7132a435c2407846ac8f"
+dependencies = [
+ "log",
+ "plain",
+ "scroll 0.11.0",
 ]
 
 [[package]]
@@ -535,9 +546,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.112"
+version = "0.2.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
 
 [[package]]
 name = "libloading"
@@ -565,6 +576,17 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "libproc"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b799ad155d75ce914c467ee5627b62247c20d4aedbd446f821484cebf3cded7"
+dependencies = [
+ "bindgen",
+ "errno",
+ "libc",
+]
+
 [[package]]
 name = "log"
 version = "0.4.14"
@@ -652,6 +674,18 @@ dependencies = [
  "memoffset",
 ]
 
+[[package]]
+name = "nix"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -800,7 +834,7 @@ dependencies = [
  "anyhow",
  "bindgen",
  "libc",
- "libproc",
+ "libproc 0.10.0",
  "mach",
  "winapi",
 ]
@@ -817,7 +851,7 @@ dependencies = [
  "ctrlc",
  "env_logger",
  "failure",
- "goblin",
+ "goblin 0.4.3",
  "indicatif",
  "inferno",
  "lazy_static",
@@ -946,20 +980,20 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "remoteprocess"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae11432cfd7424585639bc42948e795716371e35e48c91ffc8e3c47453b173cf"
+checksum = "d9f13e22b81d40176f4d7ed41c029fd2c7306b182db9838a44d88aeb97a7c6d6"
 dependencies = [
  "addr2line",
- "goblin",
+ "goblin 0.5.1",
  "lazy_static",
  "libc",
- "libproc",
+ "libproc 0.12.0",
  "log",
  "mach",
  "mach_o_sys",
  "memmap",
- "nix",
+ "nix 0.24.1",
  "object",
  "proc-maps",
  "read-process-memory",
@@ -1009,7 +1043,16 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec"
 dependencies = [
- "scroll_derive",
+ "scroll_derive 0.10.5",
+]
+
+[[package]]
+name = "scroll"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
+dependencies = [
+ "scroll_derive 0.11.0",
 ]
 
 [[package]]
@@ -1023,6 +1066,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "scroll_derive"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "serde"
 version = "1.0.133"
diff --git a/Cargo.toml b/Cargo.toml
index f21467cd..f71c5cf9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,7 +35,7 @@ serde_derive = "1.0"
 serde_json = "1.0"
 rand = "0.8"
 rand_distr = "0.4"
-remoteprocess = {version="0.4.8", features=["unwind"]}
+remoteprocess = {version="0.4.9", features=["unwind"]}
 chrono = "0.4.19"
 
 [target.'cfg(unix)'.dependencies]

From c662fc47a72d9d32e77856b2d34da24208330b15 Mon Sep 17 00:00:00 2001
From: Ben Frederickson <github@benfrederickson.com>
Date: Mon, 2 May 2022 10:32:36 -0700
Subject: [PATCH 2/2] Update to proc-maps 0.2.1

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index f71c5cf9..ce2ab5fb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,7 @@ log = "0.4"
 lru = "0.7"
 regex = "1"
 tempfile = "3.0.3"
-proc-maps = "0.2.0"
+proc-maps = "0.2.1"
 memmap = "0.7.0"
 cpp_demangle = "0.3"
 serde = {version="1.0", features=["rc"]}