From 5c10685ca2e4a77e5189b1afe614138b7749ce67 Mon Sep 17 00:00:00 2001
From: dignifiedquire <me@dignifiedquire.com>
Date: Mon, 2 Dec 2024 19:06:18 +0100
Subject: [PATCH] fixup: update deps

---
 Cargo.lock                 | 85 +++++++-------------------------------
 iroh-net-report/Cargo.toml |  4 +-
 iroh/Cargo.toml            |  4 +-
 3 files changed, 20 insertions(+), 73 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index adf3268c3f..f8f3a143b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2421,7 +2421,7 @@ dependencies = [
  "iroh-relay",
  "iroh-test 0.28.0",
  "libc",
- "netdev 0.31.0",
+ "netdev",
  "netlink-packet-core",
  "netlink-packet-route 0.19.0",
  "netlink-packet-route 0.21.0",
@@ -2469,7 +2469,7 @@ dependencies = [
  "watchable",
  "webpki-roots",
  "windows 0.58.0",
- "wmi 0.14.1",
+ "wmi",
  "x509-parser",
  "z32",
 ]
@@ -3012,12 +3012,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
 
-[[package]]
-name = "memalloc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1"
-
 [[package]]
 name = "memchr"
 version = "2.7.4"
@@ -3077,23 +3071,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "netdev"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7516ad2c46cc25da098ed7d6b9a0cbe9e1fbffbd04b1596148b95f2841179c83"
-dependencies = [
- "dlopen2",
- "libc",
- "memalloc",
- "netlink-packet-core",
- "netlink-packet-route 0.17.1",
- "netlink-sys",
- "once_cell",
- "system-configuration",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "netdev"
 version = "0.31.0"
@@ -3207,31 +3184,35 @@ dependencies = [
 
 [[package]]
 name = "netwatch"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a639d52c0996ac640e2a7052a5265c8f71efdbdadc83188435ffc358b7ca931"
+checksum = "304c0c1b348830b016039f2cb1c5ac8217084a78875262c5594925dd08aa77fc"
 dependencies = [
  "anyhow",
+ "atomic-waker",
  "bytes",
  "derive_more",
  "futures-lite 2.5.0",
  "futures-sink",
  "futures-util",
+ "iroh-quinn-udp",
  "libc",
- "netdev 0.30.0",
+ "netdev",
  "netlink-packet-core",
- "netlink-packet-route 0.17.1",
+ "netlink-packet-route 0.19.0",
  "netlink-sys",
  "once_cell",
  "rtnetlink 0.13.1",
+ "rtnetlink 0.14.1",
  "serde",
  "socket2",
- "thiserror 1.0.69",
+ "thiserror 2.0.3",
  "time",
  "tokio",
+ "tokio-util",
  "tracing",
- "windows 0.51.1",
- "wmi 0.13.4",
+ "windows 0.58.0",
+ "wmi",
 ]
 
 [[package]]
@@ -3774,9 +3755,9 @@ checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "portmapper"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d60045fdcfe8ff6b781cf1027fdbb08ed319d93aff7da4bedc018e3bc92226"
+checksum = "9579639b10bc90d8793be2cc86c42fc0d80b2de328e74dea1255d102399f41c1"
 dependencies = [
  "anyhow",
  "base64",
@@ -3793,7 +3774,7 @@ dependencies = [
  "serde",
  "smallvec",
  "socket2",
- "thiserror 1.0.69",
+ "thiserror 2.0.3",
  "time",
  "tokio",
  "tokio-util",
@@ -6070,16 +6051,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "windows"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
-dependencies = [
- "windows-core 0.51.1",
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows"
 version = "0.52.0"
@@ -6100,15 +6071,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -6350,21 +6312,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "wmi"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff00ac1309d4c462be86f03a55e409509e8bf4323ec296aeb4b381dd9aabe6ec"
-dependencies = [
- "chrono",
- "futures",
- "log",
- "serde",
- "thiserror 1.0.69",
- "windows 0.58.0",
- "windows-core 0.58.0",
-]
-
 [[package]]
 name = "wmi"
 version = "0.14.1"
diff --git a/iroh-net-report/Cargo.toml b/iroh-net-report/Cargo.toml
index 74d47f15a5..38b4d1245f 100644
--- a/iroh-net-report/Cargo.toml
+++ b/iroh-net-report/Cargo.toml
@@ -25,8 +25,8 @@ hickory-resolver = "=0.25.0-alpha.2"
 iroh-base = { version = "0.28.0", path = "../iroh-base", default-features = false, features = ["relay"] }
 iroh-metrics = { version = "0.28.0", default-features = false, optional = true }
 iroh-relay = { version = "0.28", path = "../iroh-relay" }
-netwatch = { version = "0.1.0" }
-portmapper = { version = "0.1.0" }
+netwatch = { version = "0.2.0" }
+portmapper = { version = "0.2.0" }
 rand = "0.8"
 reqwest = { version = "0.12", default-features = false }
 rustls = { version = "0.23", default-features = false }
diff --git a/iroh/Cargo.toml b/iroh/Cargo.toml
index 3f85239b5a..432fc153b3 100644
--- a/iroh/Cargo.toml
+++ b/iroh/Cargo.toml
@@ -48,7 +48,7 @@ iroh-base = { version = "0.28.0", features = ["key"], path = "../iroh-base" }
 iroh-relay = { version = "0.28", path = "../iroh-relay" }
 libc = "0.2.139"
 netdev = "0.31.0"
-netwatch = { version = "0.1.0" }
+netwatch = { version = "0.2.0" }
 num_enum = "0.7"
 once_cell = "1.18.0"
 parking_lot = "0.12.1"
@@ -57,7 +57,7 @@ pkarr = { version = "2", default-features = false, features = [
     "async",
     "relay",
 ] }
-portmapper = { version = "0.1.0" }
+portmapper = { version = "0.2.0" }
 postcard = { version = "1", default-features = false, features = [
     "alloc",
     "use-std",