From a5ff842250754823ad9798e10ecb68c93639efa7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Dec 2025 13:02:46 +0000 Subject: [PATCH 1/2] chore(deps): bump netdev from 0.39.0 to 0.40.0 Bumps [netdev](https://github.com/shellrow/netdev) from 0.39.0 to 0.40.0. - [Release notes](https://github.com/shellrow/netdev/releases) - [Commits](https://github.com/shellrow/netdev/compare/v0.39.0...v0.40.0) --- updated-dependencies: - dependency-name: netdev dependency-version: 0.40.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 150 ++++++++++++++++++++++++++++++++++++++++++------ iroh/Cargo.toml | 2 +- 2 files changed, 135 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 908af1b7d6c..b1e1732399b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -422,6 +422,15 @@ dependencies = [ "hybrid-array", ] +[[package]] +name = "block2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" +dependencies = [ + "objc2", +] + [[package]] name = "bumpalo" version = "3.19.0" @@ -1042,6 +1051,18 @@ dependencies = [ "winapi", ] +[[package]] +name = "dispatch2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" +dependencies = [ + "bitflags", + "block2", + "libc", + "objc2", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -1164,7 +1185,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -1920,7 +1941,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.1", "tokio", "tower-service", "tracing", @@ -2182,7 +2203,7 @@ dependencies = [ "n0-future", "n0-tracing-test", "n0-watcher", - "netdev", + "netdev 0.40.0", "netwatch", "parse-size", "pin-project", @@ -2361,7 +2382,7 @@ dependencies = [ "pin-project-lite", "rustc-hash", "rustls", - "socket2 0.5.10", + "socket2 0.6.1", "thiserror 2.0.17", "tokio", "tokio-stream", @@ -2398,13 +2419,13 @@ dependencies = [ [[package]] name = "iroh-quinn-udp" version = "0.6.0" -source = "git+https://github.com/n0-computer/quinn?branch=main#226ff0de42ebdbfd78c965046149e1c6e51b6048" +source = "git+https://github.com/n0-computer/quinn?branch=main#695025c28e98ffeb99f14ace8d00b8c90b98256c" dependencies = [ "cfg_aliases", "libc", - "socket2 0.5.10", + "socket2 0.6.1", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2829,6 +2850,28 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "netdev" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc9815643a243856e7bd84524e1ff739e901e846cfb06ad9627cd2b6d59bd737" +dependencies = [ + "block2", + "dispatch2", + "dlopen2", + "ipnet", + "libc", + "mac-addr", + "netlink-packet-core", + "netlink-packet-route", + "netlink-sys", + "objc2-core-foundation", + "objc2-system-configuration", + "once_cell", + "plist", + "windows-sys 0.59.0", +] + [[package]] name = "netlink-packet-core" version = "0.8.1" @@ -2892,7 +2935,7 @@ dependencies = [ "n0-error", "n0-future", "n0-watcher", - "netdev", + "netdev 0.39.0", "netlink-packet-core", "netlink-packet-route", "netlink-proto", @@ -3022,6 +3065,59 @@ dependencies = [ "libc", ] +[[package]] +name = "objc2" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" +dependencies = [ + "objc2-encode", +] + +[[package]] +name = "objc2-core-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" +dependencies = [ + "bitflags", + "block2", + "dispatch2", + "libc", + "objc2", +] + +[[package]] +name = "objc2-encode" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" + +[[package]] +name = "objc2-security" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" +dependencies = [ + "bitflags", + "objc2", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-system-configuration" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7216bd11cbda54ccabcab84d523dc93b858ec75ecfb3a7d89513fa22464da396" +dependencies = [ + "bitflags", + "dispatch2", + "libc", + "objc2", + "objc2-core-foundation", + "objc2-security", +] + [[package]] name = "oid-registry" version = "0.8.1" @@ -3209,6 +3305,19 @@ dependencies = [ "spki", ] +[[package]] +name = "plist" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07" +dependencies = [ + "base64", + "indexmap", + "quick-xml", + "serde", + "time", +] + [[package]] name = "plotters" version = "0.3.7" @@ -3400,6 +3509,15 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-xml" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" +dependencies = [ + "memchr", +] + [[package]] name = "quinn" version = "0.11.9" @@ -3413,7 +3531,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.5.10", + "socket2 0.6.1", "thiserror 2.0.17", "tokio", "tracing", @@ -3450,9 +3568,9 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.1", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -3722,7 +3840,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3823,7 +3941,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs 0.26.11", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3844,7 +3962,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs 1.0.4", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4419,7 +4537,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -5211,7 +5329,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/iroh/Cargo.toml b/iroh/Cargo.toml index 2b9e43f45ad..05e887f9131 100644 --- a/iroh/Cargo.toml +++ b/iroh/Cargo.toml @@ -80,7 +80,7 @@ sync_wrapper = { version = "1.0.2", features = ["futures"] } [target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies] hickory-resolver = "0.25.1" igd-next = { version = "0.16", features = ["aio_tokio"] } -netdev = { version = "0.39.0" } +netdev = { version = "0.40.0" } portmapper = { version = "0.12", default-features = false } quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "main", default-features = false, features = ["runtime-tokio", "rustls-ring"] } tokio = { version = "1", features = [ From 4d93a8b792d25d6bbffd9e82f99d5f2965c747b0 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Wed, 7 Jan 2026 12:19:57 +0100 Subject: [PATCH 2/2] update netwatch --- Cargo.lock | 91 +++++++++++++----------------------------------------- 1 file changed, 22 insertions(+), 69 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b1e1732399b..36ed6d2af56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -641,16 +641,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation" version = "0.10.1" @@ -1185,7 +1175,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -1941,7 +1931,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.1", + "socket2 0.5.10", "tokio", "tower-service", "tracing", @@ -2203,7 +2193,7 @@ dependencies = [ "n0-future", "n0-tracing-test", "n0-watcher", - "netdev 0.40.0", + "netdev", "netwatch", "parse-size", "pin-project", @@ -2382,7 +2372,7 @@ dependencies = [ "pin-project-lite", "rustc-hash", "rustls", - "socket2 0.6.1", + "socket2 0.5.10", "thiserror 2.0.17", "tokio", "tokio-stream", @@ -2419,13 +2409,13 @@ dependencies = [ [[package]] name = "iroh-quinn-udp" version = "0.6.0" -source = "git+https://github.com/n0-computer/quinn?branch=main#695025c28e98ffeb99f14ace8d00b8c90b98256c" +source = "git+https://github.com/n0-computer/quinn?branch=main#124059612a8149fe973a3f8629ec84c4773af1de" dependencies = [ "cfg_aliases", "libc", - "socket2 0.6.1", + "socket2 0.5.10", "tracing", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2832,24 +2822,6 @@ dependencies = [ "n0-future", ] -[[package]] -name = "netdev" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35a703aa1a87cd885b9f674922445a42dbb0c0f4f1b28fef21b227ae32375d21" -dependencies = [ - "dlopen2", - "ipnet", - "libc", - "mac-addr", - "netlink-packet-core", - "netlink-packet-route", - "netlink-sys", - "once_cell", - "system-configuration", - "windows-sys 0.59.0", -] - [[package]] name = "netdev" version = "0.40.0" @@ -2923,7 +2895,7 @@ dependencies = [ [[package]] name = "netwatch" version = "0.12.0" -source = "git+https://github.com/n0-computer/net-tools?branch=main#03810108ec3aef00b5642e1b9de570e61ec4bfe5" +source = "git+https://github.com/n0-computer/net-tools?branch=main#5906f20f80bf0eaa4681b1f2471e08256d76eb04" dependencies = [ "atomic-waker", "bytes", @@ -2935,11 +2907,13 @@ dependencies = [ "n0-error", "n0-future", "n0-watcher", - "netdev 0.39.0", + "netdev", "netlink-packet-core", "netlink-packet-route", "netlink-proto", "netlink-sys", + "objc2-core-foundation", + "objc2-system-configuration", "pin-project-lite", "serde", "socket2 0.6.1", @@ -3531,7 +3505,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.6.1", + "socket2 0.5.10", "thiserror 2.0.17", "tokio", "tracing", @@ -3568,9 +3542,9 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.1", + "socket2 0.5.10", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.52.0", ] [[package]] @@ -3840,7 +3814,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -3929,7 +3903,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" dependencies = [ - "core-foundation 0.10.1", + "core-foundation", "core-foundation-sys", "jni", "log", @@ -3941,7 +3915,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs 0.26.11", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3950,7 +3924,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" dependencies = [ - "core-foundation 0.10.1", + "core-foundation", "core-foundation-sys", "jni", "log", @@ -3962,7 +3936,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs 1.0.4", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4043,7 +4017,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" dependencies = [ "bitflags", - "core-foundation 0.10.1", + "core-foundation", "core-foundation-sys", "libc", "security-framework-sys", @@ -4500,27 +4474,6 @@ dependencies = [ "syn", ] -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tagptr" version = "0.2.0" @@ -4537,7 +4490,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -5329,7 +5282,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]]