From ed36b5d0c734ed9fad24be9f001932bcf7a65a54 Mon Sep 17 00:00:00 2001 From: MarcusGrass Date: Sat, 4 Oct 2025 15:02:38 +0200 Subject: [PATCH 1/7] chore: update deps --- Cargo.lock | 395 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 221 insertions(+), 174 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8d8da6a..670c64a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "ab_glyph" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e074464580a518d16a7126262fffaaa47af89d4099d4cb403f8ed938ba12ee7d" +checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,9 +20,9 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" [[package]] name = "addr2line" -version = "0.24.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" dependencies = [ "gimli", ] @@ -138,9 +138,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.20" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" dependencies = [ "anstyle", "anstyle-parse", @@ -153,9 +153,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" [[package]] name = "anstyle-parse" @@ -188,9 +188,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" dependencies = [ "backtrace", ] @@ -354,9 +354,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "axum" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5" +checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871" dependencies = [ "axum-core", "bytes", @@ -373,8 +373,7 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", - "rustversion", - "serde", + "serde_core", "serde_json", "serde_path_to_error", "serde_urlencoded", @@ -388,9 +387,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.5.2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6" +checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22" dependencies = [ "bytes", "futures-core", @@ -399,7 +398,6 @@ dependencies = [ "http-body-util", "mime", "pin-project-lite", - "rustversion", "sync_wrapper", "tower-layer", "tower-service", @@ -419,9 +417,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.75" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" +checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" dependencies = [ "addr2line", "cfg-if", @@ -429,7 +427,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets 0.52.6", + "windows-link 0.2.0", ] [[package]] @@ -569,18 +567,18 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "bytemuck" -version = "1.23.2" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" +checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", @@ -637,9 +635,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.37" +version = "1.2.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65193589c6404eb80b450d618eaf9a2cafaaafd57ecce47370519ef674a7bd44" +checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb" dependencies = [ "find-msvc-tools", "jobserver", @@ -711,9 +709,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.47" +version = "4.5.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931" +checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae" dependencies = [ "clap_builder", "clap_derive", @@ -721,9 +719,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.47" +version = "4.5.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6" +checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9" dependencies = [ "anstream", "anstyle", @@ -794,7 +792,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" dependencies = [ - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] @@ -1174,9 +1172,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc" +checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071" dependencies = [ "powerfmt", ] @@ -1415,7 +1413,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -1484,9 +1482,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "find-msvc-tools" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d" +checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3" [[package]] name = "flutter_rust_bridge" @@ -1544,9 +1542,9 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "font-types" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a596f5713680923a2080d86de50fe472fb290693cf0f701187a1c8b36996b7" +checksum = "511e2c18a516c666d27867d2f9821f76e7d591f762e9fc41dd6cc5c90fe54b0b" dependencies = [ "bytemuck", ] @@ -1820,9 +1818,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.1" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" [[package]] name = "gio-sys" @@ -2111,7 +2109,7 @@ dependencies = [ "once_cell", "rand 0.9.2", "ring", - "thiserror 2.0.16", + "thiserror 2.0.17", "tinyvec", "tokio", "tracing", @@ -2134,7 +2132,7 @@ dependencies = [ "rand 0.9.2", "resolv-conf", "smallvec", - "thiserror 2.0.16", + "thiserror 2.0.17", "tokio", "tracing", ] @@ -2292,7 +2290,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.0", + "windows-core 0.62.1", ] [[package]] @@ -2777,7 +2775,7 @@ dependencies = [ "rustc-hash 2.1.1", "rustls", "socket2 0.5.10", - "thiserror 2.0.16", + "thiserror 2.0.17", "tokio", "tracing", "web-time", @@ -2797,7 +2795,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.16", + "thiserror 2.0.17", "tinyvec", "tracing", "web-time", @@ -2912,9 +2910,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.80" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852f13bec5eba4ba9afbeb93fd7c13fe56147f055939ae21c43a29a0ecb2702e" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ "once_cell", "wasm-bindgen", @@ -2945,18 +2943,18 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.175" +version = "0.2.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "libloading" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-targets 0.53.3", + "windows-link 0.2.0", ] [[package]] @@ -3011,11 +3009,10 @@ checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" [[package]] name = "lock_api" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", ] @@ -3101,9 +3098,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memmap2" @@ -3166,20 +3163,19 @@ dependencies = [ [[package]] name = "moka" -version = "0.12.10" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926" +checksum = "8261cd88c312e0004c1d51baad2980c66528dfdb2bee62003e643a4d8f86b077" dependencies = [ "crossbeam-channel", "crossbeam-epoch", "crossbeam-utils", - "loom", + "equivalent", "parking_lot", "portable-atomic", "rustc_version", "smallvec", "tagptr", - "thiserror 1.0.69", "uuid", ] @@ -3250,7 +3246,7 @@ dependencies = [ "once_cell", "rustc-hash 1.1.0", "spirv", - "thiserror 2.0.16", + "thiserror 2.0.17", "unicode-ident", ] @@ -3377,7 +3373,7 @@ dependencies = [ "log", "netlink-packet-core", "netlink-sys", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] @@ -3449,11 +3445,11 @@ checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" [[package]] name = "normpath" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c178369371fd7db523726931e50d430b560e3059665abc537ba3277e9274c9c4" +checksum = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b" dependencies = [ - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -3794,9 +3790,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.7" +version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "memchr", ] @@ -3935,7 +3931,7 @@ version = "1.0.0" dependencies = [ "anyhow", "iroh", - "thiserror 2.0.16", + "thiserror 2.0.17", "tokio", ] @@ -3999,9 +3995,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -4009,15 +4005,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", "redox_syscall 0.5.17", "smallvec", - "windows-targets 0.52.6", + "windows-link 0.2.0", ] [[package]] @@ -4043,20 +4039,19 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e0a3a33733faeaf8651dfee72dd0f388f0c8e5ad496a3478fa5a922f49cfa8" +checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4" dependencies = [ "memchr", - "thiserror 2.0.16", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc58706f770acb1dbd0973e6530a3cff4746fb721207feb3a8a6064cd0b6c663" +checksum = "187da9a3030dbafabbbfb20cb323b976dc7b7ce91fcd84f2f74d6e31d378e2de" dependencies = [ "pest", "pest_generator", @@ -4064,9 +4059,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d4f36811dfe07f7b8573462465d5cb8965fffc2e71ae377a33aecf14c2c9a2f" +checksum = "49b401d98f5757ebe97a26085998d6c0eecec4995cad6ab7fc30ffdf4b052843" dependencies = [ "pest", "pest_meta", @@ -4077,9 +4072,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42919b05089acbd0a5dcd5405fb304d17d1053847b81163d09c4ad18ce8e8420" +checksum = "72f27a2cfee9f9039c4d86faa5af122a0ac3851441a34865b8a043b46be0065a" dependencies = [ "pest", "sha2", @@ -4151,7 +4146,7 @@ dependencies = [ "serde", "sha1_smol", "simple-dns", - "thiserror 2.0.16", + "thiserror 2.0.17", "tokio", "tracing", "url", @@ -4227,7 +4222,7 @@ dependencies = [ "hermit-abi", "pin-project-lite", "rustix 1.1.2", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -4349,9 +4344,9 @@ dependencies = [ [[package]] name = "precis-profiles" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4f67f78f50388f03494794766ba824a704db16fb5d400fe8d545fa7bc0d3f1" +checksum = "31e2768890a47af73a032af9f0cedbddce3c9d06cf8de201d5b8f2436ded7674" dependencies = [ "lazy_static", "precis-core", @@ -4423,7 +4418,7 @@ dependencies = [ "rustc-hash 2.1.1", "rustls", "socket2 0.6.0", - "thiserror 2.0.16", + "thiserror 2.0.17", "tokio", "tracing", "web-time", @@ -4444,7 +4439,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.16", + "thiserror 2.0.17", "tinyvec", "tracing", "web-time", @@ -4466,9 +4461,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] @@ -4568,9 +4563,9 @@ checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "read-fonts" -version = "0.29.3" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ca636dac446b5664bd16c069c00a9621806895b8bb02c2dc68542b23b8f25d" +checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358" dependencies = [ "bytemuck", "font-types", @@ -4596,9 +4591,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.2" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" +checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" dependencies = [ "aho-corasick", "memchr", @@ -4608,9 +4603,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" +checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" dependencies = [ "aho-corasick", "memchr", @@ -4797,14 +4792,14 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.11.0", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] name = "rustls" -version = "0.23.31" +version = "0.23.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc" +checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40" dependencies = [ "log", "once_cell", @@ -4827,9 +4822,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.6" +version = "0.103.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8572f3c2cb9934231157b45499fc41e1f58c589fdfb81a844ba873265e80f8eb" +checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf" dependencies = [ "ring", "rustls-pki-types", @@ -4928,9 +4923,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.225" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6c24dee235d0da097043389623fb913daddf92c76e9f5a1db88607a0bcbd1d" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ "serde_core", "serde_derive", @@ -4948,18 +4943,18 @@ dependencies = [ [[package]] name = "serde_core" -version = "1.0.225" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "659356f9a0cb1e529b24c01e43ad2bdf520ec4ceaf83047b83ddcc2251f96383" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.225" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea936adf78b1f766949a4977b91d2f5595825bd6ec079aa9543ad2685fc4516" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -5119,9 +5114,9 @@ dependencies = [ [[package]] name = "skrifa" -version = "0.31.3" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbeb4ca4399663735553a09dd17ce7e49a0a0203f03b706b39628c4d913a8607" +checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841" dependencies = [ "bytemuck", "read-fonts", @@ -5368,9 +5363,9 @@ checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb" [[package]] name = "swash" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f745de914febc7c9ab4388dfaf94bbc87e69f57bb41133a9b0c84d4be49856f3" +checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a" dependencies = [ "skrifa", "yazi", @@ -5476,15 +5471,15 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.22.0" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand", "getrandom 0.3.3", "once_cell", "rustix 1.1.2", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -5507,11 +5502,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.16" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.16", + "thiserror-impl 2.0.17", ] [[package]] @@ -5527,9 +5522,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.16" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -5556,11 +5551,12 @@ dependencies = [ [[package]] name = "time" -version = "0.3.43" +version = "0.3.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", + "itoa", "js-sys", "libc", "num-conv", @@ -5670,9 +5666,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f63835928ca123f1bef57abbcd23bb2ba0ac9ae1235f1e65bda0d06e7786bd" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ "rustls", "tokio", @@ -5706,9 +5702,9 @@ dependencies = [ [[package]] name = "tokio-websockets" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190767f03b86528ab9f4f6a9158072a6d0ef240d9a9591772eb411f315920f4" +checksum = "b1b6348ebfaaecd771cecb69e832961d277f59845d4220a584701f72728152b7" dependencies = [ "base64", "bytes", @@ -5955,9 +5951,9 @@ checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" [[package]] name = "typenum" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "ucd-parse" @@ -6168,9 +6164,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.103" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab10a69fbd0a177f5f649ad4d8d3305499c42bab9aef2f7ff592d0ec8f833819" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", @@ -6181,9 +6177,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.103" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb702423545a6007bbc368fde243ba47ca275e549c8a28617f56f6ba53b1d1c" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" dependencies = [ "bumpalo", "log", @@ -6195,9 +6191,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.53" +version = "0.4.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0b221ff421256839509adbb55998214a70d829d3a28c69b4a6672e9d2a42f67" +checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" dependencies = [ "cfg-if", "js-sys", @@ -6208,9 +6204,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.103" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc65f4f411d91494355917b605e1480033152658d71f722a90647f56a70c88a0" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6218,9 +6214,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.103" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc003a991398a8ee604a401e194b6b3a39677b3173d6e74495eb51b82e99a32" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", @@ -6231,9 +6227,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.103" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293c37f4efa430ca14db3721dfbe48d8c33308096bd44d80ebaa775ab71ba1cf" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" dependencies = [ "unicode-ident", ] @@ -6376,9 +6372,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.80" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe734895e869dc429d78c4b433f8d17d95f8d05317440b4fad5ab2d33e596dc" +checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" dependencies = [ "js-sys", "wasm-bindgen", @@ -6464,7 +6460,7 @@ dependencies = [ "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror 2.0.16", + "thiserror 2.0.17", "wgpu-core-deps-apple", "wgpu-core-deps-emscripten", "wgpu-core-deps-windows-linux-android", @@ -6539,7 +6535,7 @@ dependencies = [ "raw-window-handle", "renderdoc-sys", "smallvec", - "thiserror 2.0.16", + "thiserror 2.0.17", "wasm-bindgen", "web-sys", "wgpu-types", @@ -6557,7 +6553,7 @@ dependencies = [ "bytemuck", "js-sys", "log", - "thiserror 2.0.16", + "thiserror 2.0.17", "web-sys", ] @@ -6589,7 +6585,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -6628,11 +6624,23 @@ version = "0.61.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" dependencies = [ - "windows-collections", + "windows-collections 0.2.0", "windows-core 0.61.2", - "windows-future", + "windows-future 0.2.1", "windows-link 0.1.3", - "windows-numerics", + "windows-numerics 0.2.0", +] + +[[package]] +name = "windows" +version = "0.62.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49e6c4a1f363c8210c6f77ba24f645c61c6fb941eccf013da691f7e09515b8ac" +dependencies = [ + "windows-collections 0.3.1", + "windows-core 0.62.1", + "windows-future 0.3.1", + "windows-numerics 0.3.0", ] [[package]] @@ -6644,6 +6652,15 @@ dependencies = [ "windows-core 0.61.2", ] +[[package]] +name = "windows-collections" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "123e712f464a8a60ce1a13f4c446d2d43ab06464cb5842ff68f5c71b6fb7852e" +dependencies = [ + "windows-core 0.62.1", +] + [[package]] name = "windows-core" version = "0.58.0" @@ -6663,8 +6680,8 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement 0.60.0", - "windows-interface 0.59.1", + "windows-implement 0.60.1", + "windows-interface 0.59.2", "windows-link 0.1.3", "windows-result 0.3.4", "windows-strings 0.4.2", @@ -6672,12 +6689,12 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.62.0" +version = "0.62.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fe7168f7de578d2d8a05b07fd61870d2e73b4020e9f49aa00da8471723497c" +checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9" dependencies = [ - "windows-implement 0.60.0", - "windows-interface 0.59.1", + "windows-implement 0.60.1", + "windows-interface 0.59.2", "windows-link 0.2.0", "windows-result 0.4.0", "windows-strings 0.5.0", @@ -6691,7 +6708,18 @@ checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" dependencies = [ "windows-core 0.61.2", "windows-link 0.1.3", - "windows-threading", + "windows-threading 0.1.0", +] + +[[package]] +name = "windows-future" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f3db6b24b120200d649cd4811b4947188ed3a8d2626f7075146c5d178a9a4a" +dependencies = [ + "windows-core 0.62.1", + "windows-link 0.2.0", + "windows-threading 0.2.0", ] [[package]] @@ -6707,9 +6735,9 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "edb307e42a74fb6de9bf3a02d9712678b22399c87e6fa869d6dfcd8c1b7754e0" dependencies = [ "proc-macro2", "quote", @@ -6729,9 +6757,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "c0abd1ddbc6964ac14db11c7213d6532ef34bd9aa042c2e5935f59d7908b46a5" dependencies = [ "proc-macro2", "quote", @@ -6760,6 +6788,16 @@ dependencies = [ "windows-link 0.1.3", ] +[[package]] +name = "windows-numerics" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ce3498fe0aba81e62e477408383196b4b0363db5e0c27646f932676283b43d8" +dependencies = [ + "windows-core 0.62.1", + "windows-link 0.2.0", +] + [[package]] name = "windows-result" version = "0.2.0" @@ -6857,14 +6895,14 @@ version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.3", + "windows-targets 0.53.4", ] [[package]] name = "windows-sys" -version = "0.61.0" +version = "0.61.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa" +checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f" dependencies = [ "windows-link 0.2.0", ] @@ -6917,11 +6955,11 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.3" +version = "0.53.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" +checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b" dependencies = [ - "windows-link 0.1.3", + "windows-link 0.2.0", "windows_aarch64_gnullvm 0.53.0", "windows_aarch64_msvc 0.53.0", "windows_i686_gnu 0.53.0", @@ -6941,6 +6979,15 @@ dependencies = [ "windows-link 0.1.3", ] +[[package]] +name = "windows-threading" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab47f085ad6932defa48855254c758cdd0e2f2d48e62a34118a268d8f345e118" +dependencies = [ + "windows-link 0.2.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -7199,17 +7246,17 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "wmi" -version = "0.17.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3de777dce4cbcdc661d5d18e78ce4b46a37adc2bb7c0078a556c7f07bcce2f" +checksum = "120d8c2b6a7c96c27bf4a7947fd7f02d73ca7f5958b8bd72a696e46cb5521ee6" dependencies = [ "chrono", "futures", "log", "serde", - "thiserror 2.0.16", - "windows 0.61.3", - "windows-core 0.61.2", + "thiserror 2.0.17", + "windows 0.62.1", + "windows-core 0.62.1", ] [[package]] @@ -7231,7 +7278,7 @@ dependencies = [ "pharos", "rustc_version", "send_wrapper", - "thiserror 2.0.16", + "thiserror 2.0.17", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -7449,9 +7496,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" [[package]] name = "zerotrie" From 495b37d317e6e27b6d84b4544d22692b124f8a1f Mon Sep 17 00:00:00 2001 From: MarcusGrass Date: Sat, 4 Oct 2025 15:05:45 +0200 Subject: [PATCH 2/7] chore: update deny --- deny.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deny.toml b/deny.toml index 4d3f992..6c7c739 100644 --- a/deny.toml +++ b/deny.toml @@ -63,7 +63,10 @@ skip = [ { name = "windows-implement", version = "=0.58.0" }, { name = "windows-core", version = "=0.58.0" }, { name = "windows-core", version = "=0.61.2" }, + { name = "windows-collections", version = "=0.2.0" }, + { name = "windows-future", version = "=0.2.1" }, { name = "windows", version = "=0.58.0" }, + { name = "windows", version = "=0.61.3" }, { name = "windows-sys", version = "=0.48.0" }, { name = "windows-sys", version = "=0.52.0" }, { name = "windows-sys", version = "=0.59.0" }, @@ -71,8 +74,10 @@ skip = [ { name = "windows-strings", version = "=0.1.0" }, { name = "windows-strings", version = "=0.4.2" }, { name = "windows-link", version = "=0.1.3" }, + { name = "windows-numerics", version = "=0.2.0" }, { name = "windows-result", version = "=0.2.0" }, { name = "windows-result", version = "=0.3.4" }, + { name = "windows-threading", version = "=0.1.0" }, # Much smaller apple-swamp { name = "objc2", version = "=0.5.2" }, { name = "objc2-foundation", version = "=0.2.2" }, From e81a08bbba3ca593324728ec27710f44a93ab486 Mon Sep 17 00:00:00 2001 From: MarcusGrass Date: Sat, 4 Oct 2025 15:06:21 +0200 Subject: [PATCH 3/7] chore: use workspace versioning --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 1 + p2proxy-cli/Cargo.toml | 2 +- p2proxy-client/Cargo.toml | 2 +- p2proxy-desktop/Cargo.toml | 2 +- p2proxy-lib/Cargo.toml | 2 +- p2proxy-test-runner/Cargo.toml | 2 +- p2proxy-test-server/Cargo.toml | 2 +- p2proxy_fl/rust/Cargo.toml | 2 +- p2proxyd/Cargo.toml | 2 +- 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 670c64a..c62589a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3880,7 +3880,7 @@ dependencies = [ [[package]] name = "p2proxy-cli" -version = "1.0.0" +version = "1.0.1" dependencies = [ "anyhow", "clap", @@ -3896,7 +3896,7 @@ dependencies = [ [[package]] name = "p2proxy-client" -version = "1.0.0" +version = "1.0.1" dependencies = [ "anyhow", "iroh", @@ -3908,7 +3908,7 @@ dependencies = [ [[package]] name = "p2proxy-desktop" -version = "1.0.0" +version = "1.0.1" dependencies = [ "anyhow", "hex", @@ -3927,7 +3927,7 @@ dependencies = [ [[package]] name = "p2proxy-lib" -version = "1.0.0" +version = "1.0.1" dependencies = [ "anyhow", "iroh", @@ -3937,7 +3937,7 @@ dependencies = [ [[package]] name = "p2proxy-test-runner" -version = "1.0.0" +version = "1.0.1" dependencies = [ "anyhow", "hex", @@ -3949,7 +3949,7 @@ dependencies = [ [[package]] name = "p2proxy-test-server" -version = "1.0.0" +version = "1.0.1" dependencies = [ "axum", "tokio", @@ -3957,7 +3957,7 @@ dependencies = [ [[package]] name = "p2proxyd" -version = "1.0.0" +version = "1.0.1" dependencies = [ "anyhow", "clap", @@ -4724,7 +4724,7 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rust_lib_p2proxy_fl" -version = "1.0.0" +version = "1.0.1" dependencies = [ "android_logger", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 36fe67a..43ac099 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,7 @@ resolver = "3" [workspace.package] edition = "2024" license = "GPL-3.0" +version = "1.0.1" [workspace.dependencies] p2proxy-client = { path = "./p2proxy-client" } diff --git a/p2proxy-cli/Cargo.toml b/p2proxy-cli/Cargo.toml index b7913b4..a5ef108 100644 --- a/p2proxy-cli/Cargo.toml +++ b/p2proxy-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "p2proxy-cli" -version = "1.0.0" +version = { workspace = true } edition = { workspace = true } license = { workspace = true } diff --git a/p2proxy-client/Cargo.toml b/p2proxy-client/Cargo.toml index 1b6264d..8bfcc49 100644 --- a/p2proxy-client/Cargo.toml +++ b/p2proxy-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "p2proxy-client" -version = "1.0.0" +version = { workspace = true } edition = { workspace = true } license = { workspace = true } diff --git a/p2proxy-desktop/Cargo.toml b/p2proxy-desktop/Cargo.toml index 8dcb4cc..e7fde2a 100644 --- a/p2proxy-desktop/Cargo.toml +++ b/p2proxy-desktop/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "p2proxy-desktop" -version = "1.0.0" +version = { workspace = true } edition = { workspace = true } license = { workspace = true } diff --git a/p2proxy-lib/Cargo.toml b/p2proxy-lib/Cargo.toml index 1f161ba..e72093d 100644 --- a/p2proxy-lib/Cargo.toml +++ b/p2proxy-lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "p2proxy-lib" -version = "1.0.0" +version = { workspace = true } edition = { workspace = true } license = { workspace = true } diff --git a/p2proxy-test-runner/Cargo.toml b/p2proxy-test-runner/Cargo.toml index 897f130..f0bec2b 100644 --- a/p2proxy-test-runner/Cargo.toml +++ b/p2proxy-test-runner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "p2proxy-test-runner" -version = "1.0.0" +version = { workspace = true } edition.workspace = true license.workspace = true diff --git a/p2proxy-test-server/Cargo.toml b/p2proxy-test-server/Cargo.toml index 9912e2d..87a2996 100644 --- a/p2proxy-test-server/Cargo.toml +++ b/p2proxy-test-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "p2proxy-test-server" -version = "1.0.0" +version = { workspace = true } edition.workspace = true license.workspace = true diff --git a/p2proxy_fl/rust/Cargo.toml b/p2proxy_fl/rust/Cargo.toml index e1fd905..970787c 100644 --- a/p2proxy_fl/rust/Cargo.toml +++ b/p2proxy_fl/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust_lib_p2proxy_fl" -version = "1.0.0" +version = { workspace = true } edition = { workspace = true } license = { workspace = true } diff --git a/p2proxyd/Cargo.toml b/p2proxyd/Cargo.toml index 99f6fce..3c6d84f 100644 --- a/p2proxyd/Cargo.toml +++ b/p2proxyd/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "p2proxyd" -version = "1.0.0" +version = { workspace = true } edition = { workspace = true } license = { workspace = true } From 2b038566de9534a4a20394bdc140b5b468a143b5 Mon Sep 17 00:00:00 2001 From: MarcusGrass Date: Sat, 4 Oct 2025 15:07:05 +0200 Subject: [PATCH 4/7] feat: make p2proxy-cli and p2proxy-desktop run windows_subsystem="windows" Avoids the pop-up cmd when running --- p2proxy-cli/src/main.rs | 1 + p2proxy-desktop/src/main.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/p2proxy-cli/src/main.rs b/p2proxy-cli/src/main.rs index dc11047..f91ff7f 100644 --- a/p2proxy-cli/src/main.rs +++ b/p2proxy-cli/src/main.rs @@ -1,3 +1,4 @@ +#![cfg_attr(target_family = "windows", windows_subsystem = "windows")] mod observability; use crate::observability::setup_observability; diff --git a/p2proxy-desktop/src/main.rs b/p2proxy-desktop/src/main.rs index 787e755..9b7a960 100644 --- a/p2proxy-desktop/src/main.rs +++ b/p2proxy-desktop/src/main.rs @@ -1,3 +1,4 @@ +#![cfg_attr(target_family = "windows", windows_subsystem = "windows")] mod observability; mod peer_id; mod peer_node_state; From 6c2ea7010eee80883332ec6465bac694f0016437 Mon Sep 17 00:00:00 2001 From: MarcusGrass Date: Sat, 4 Oct 2025 15:07:34 +0200 Subject: [PATCH 5/7] chore: Add prebuilding and instructions --- Readme.md | 15 +++++++++- assets/deployment/build-debian.sh | 50 +++++++++++++++++++++++++++++++ p2proxy-cli/Cargo.toml | 11 +++++++ p2proxy-desktop/Cargo.toml | 16 ++++++++++ p2proxy-desktop/cross.toml | 11 +++++++ p2proxyd/Cargo.toml | 11 +++++++ 6 files changed, 113 insertions(+), 1 deletion(-) create mode 100755 assets/deployment/build-debian.sh create mode 100644 p2proxy-desktop/cross.toml diff --git a/Readme.md b/Readme.md index deb5e88..3188e6c 100644 --- a/Readme.md +++ b/Readme.md @@ -77,7 +77,7 @@ See its readme for more details [here](./p2proxy-desktop/Readme.md). To build, you need a rust toolchain, you can get one [through rustup](https://rust-lang.org/tools/install/) for example. -You need `libglib2.0-dev` and `libgtk-3-dev` to build the desktop app. The proxy and cli does not need these +You need `libglib2.0-dev` and `libgtk-3-dev` to build the desktop app (on linux). The proxy and cli does not need these extra dependencies (as far as I'm aware). ### Daemon @@ -99,6 +99,19 @@ Can be built using flutter: To build release, you need to set up signing-configs, [see the flutter docs](https://docs.flutter.dev/deployment/android#configure-signing-in-gradle) +## Downloading + +For targets that are easy to build for and test with a VM (`generic linux`, `debian`, and `windows`) signed +binaries/packages +are supplied under releases. + +`p2proxyd` and `p2proxy-cli` can (and are) compiled statically for Linux in both cases. `p2proxy-desktop` has a +dependency on `libgtk` and `libglib`, so that's compiled on debian `bullseye` for compatibility. It should work +on any reasonably up-to-date linux install. + +I'm assuming that windows users won't run `p2proxyd`, but there's no technical reason that that can't be built +or run on windows either. + ```shell cd p2proxy_fl && flutter build appbundle --debug ``` diff --git a/assets/deployment/build-debian.sh b/assets/deployment/build-debian.sh new file mode 100755 index 0000000..f40e6b0 --- /dev/null +++ b/assets/deployment/build-debian.sh @@ -0,0 +1,50 @@ +#!/bin/sh +set -ex + +LTO="lto" +PACKAGE_DIR="target/packaged" +DEB_DIR="target/debian" +DEB_VER="1.0.1-1" +X86_MUSL="x86_64-unknown-linux-musl" +X86_GNU="x86_64-unknown-linux-gnu" +AARCH64_MUSL="aarch64-unknown-linux-musl" +AARCH64_GNU="aarch64-unknown-linux-gnu" +X86_WINDOWS="x86_64-pc-windows-gnu" +AARCH64_MAC="aarch64-apple-darwin" + +function package() { + BIN_NAME="$1" + BUILD_TARGET="$2" + OUTPUT_DIR="target/$BUILD_TARGET/$LTO" + DEB_ARCH="$3" + DEST_NAME="$4" + EXT="$5" + cross b -p "$BIN_NAME" --target "$BUILD_TARGET" --profile "$LTO" + cp "$OUTPUT_DIR/$BIN_NAME""$EXT" "$PACKAGE_DIR/$DEST_NAME""$EXT" + gpg --yes --armor --output "$PACKAGE_DIR/$DEST_NAME""$EXT.sig" --detach-sig "$PACKAGE_DIR/$DEST_NAME""$EXT" + # Some shared artifacts end up here, getting reused and causing build failures + rm -r "target/$LTO" +} + +function package_deb() { + package "$1" "$2" "$3" "$4" "$5" + DEB_ARCH="$3" + DEB_FILE="$DEB_DIR/$BIN_NAME"_"$DEB_VER"_"$DEB_ARCH.deb" + cargo deb -p "$BIN_NAME" --target "$BUILD_TARGET" --profile "$LTO" --no-build --no-strip + gpg --yes --armor --output "$DEB_FILE.sig" --detach-sig "$DEB_FILE" + mv "$DEB_FILE.sig" "$PACKAGE_DIR" + mv "$DEB_FILE" "$PACKAGE_DIR" +} + +mkdir -p "$PACKAGE_DIR" +package_deb "p2proxyd" "$X86_MUSL" "amd64" "p2proxyd-x86_64-linux" "" +package_deb "p2proxyd" "$AARCH64_MUSL" "arm64" "p2proxyd-aarch64-linux" "" +package_deb "p2proxy-cli" "$X86_MUSL" "amd64" "p2proxy-cli-x86_64-linux" "" +package_deb "p2proxy-cli" "$AARCH64_MUSL" "arm64" "p2proxy-cli-aarch64-linux" "" + +# Inject a prepared image to build with (has deps and an old debian version for compatibility) +export CROSS_CONFIG=./p2proxy-desktop/cross.toml +package_deb "p2proxy-desktop" "$X86_GNU" "amd64" "p2proxy-desktop-x86_64-linux-gnu" "" + +package "p2proxy-cli" "$X86_WINDOWS" "amd64" "p2proxy-cli" ".exe" +package "p2proxy-desktop" "$X86_WINDOWS" "amd64" "p2proxy-desktop" ".exe" diff --git a/p2proxy-cli/Cargo.toml b/p2proxy-cli/Cargo.toml index a5ef108..189a445 100644 --- a/p2proxy-cli/Cargo.toml +++ b/p2proxy-cli/Cargo.toml @@ -3,6 +3,7 @@ name = "p2proxy-cli" version = { workspace = true } edition = { workspace = true } license = { workspace = true } +description = "A cli to host a local server which connects to a p2proxyd proxy" [dependencies] p2proxy-lib = { workspace = true } @@ -19,3 +20,13 @@ tracing-subscriber = { workspace = true } [lints] workspace = true + +[package.metadata.deb] +maintainer = "Marcus Grass " +copyright = "2025, Marcus Grass" +section = "utility" +priority = "optional" +assets = [ + ["target/release/p2proxy-cli", "usr/bin/", "755"], + ["Readme.md", "usr/share/doc/p2proxy-cli/README", "644"] +] \ No newline at end of file diff --git a/p2proxy-desktop/Cargo.toml b/p2proxy-desktop/Cargo.toml index e7fde2a..8c95777 100644 --- a/p2proxy-desktop/Cargo.toml +++ b/p2proxy-desktop/Cargo.toml @@ -3,6 +3,7 @@ name = "p2proxy-desktop" version = { workspace = true } edition = { workspace = true } license = { workspace = true } +description = "A desktop client to host a local server which connects to a p2proxyd proxy" [dependencies] p2proxy-lib = { workspace = true } @@ -22,3 +23,18 @@ tracing-subscriber = { workspace = true } [lints] workspace = true + +[package.metadata.deb] +maintainer = "Marcus Grass " +copyright = "2025, Marcus Grass" +section = "utility" +priority = "optional" +depends = [ + # File picker, could do without + "libgtk-3-0", + "libglib2.0-0" +] +assets = [ + ["target/release/p2proxy-desktop", "usr/bin/", "755"], + ["Readme.md", "usr/share/doc/p2proxy-desktop/README", "644"] +] \ No newline at end of file diff --git a/p2proxy-desktop/cross.toml b/p2proxy-desktop/cross.toml new file mode 100644 index 0000000..be88d68 --- /dev/null +++ b/p2proxy-desktop/cross.toml @@ -0,0 +1,11 @@ +[target.x86_64-unknown-linux-gnu] +image = "debian:bullseye-slim" +pre-build = [ + "apt-get update && apt-get -y upgrade && apt-get -y install build-essential libgtk-3-dev libglib2.0-dev" +] + +[target.aarch64-unknown-linux-gnu] +image = "arm64v8/debian:bullseye-slim" +pre-build = [ + "apt-get update && apt-get -y upgrade && apt-get -y install build-essential libgtk-3-dev libglib2.0-dev" +] \ No newline at end of file diff --git a/p2proxyd/Cargo.toml b/p2proxyd/Cargo.toml index 3c6d84f..5773f73 100644 --- a/p2proxyd/Cargo.toml +++ b/p2proxyd/Cargo.toml @@ -3,6 +3,7 @@ name = "p2proxyd" version = { workspace = true } edition = { workspace = true } license = { workspace = true } +description = "A peer-to-peer reverse proxy for local TCP connections" [dependencies] p2proxy-lib = { workspace = true } @@ -22,3 +23,13 @@ tracing-subscriber = { workspace = true } [lints] workspace = true + +[package.metadata.deb] +maintainer = "Marcus Grass " +copyright = "2025, Marcus Grass" +section = "utility" +priority = "optional" +assets = [ + ["target/release/p2proxyd", "usr/bin/", "755"], + ["Readme.md", "usr/share/doc/p2proxyd/README", "644"] +] \ No newline at end of file From c199940d9f95dff058778d30192851dfc60adc77 Mon Sep 17 00:00:00 2001 From: MarcusGrass Date: Sat, 4 Oct 2025 15:11:06 +0200 Subject: [PATCH 6/7] chore: clippy fix format arg --- p2proxyd/src/configuration.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/p2proxyd/src/configuration.rs b/p2proxyd/src/configuration.rs index f8a24e1..1396a2b 100644 --- a/p2proxyd/src/configuration.rs +++ b/p2proxyd/src/configuration.rs @@ -191,9 +191,8 @@ fn construct_routes( } } if explicit_allow_map.is_empty() { - anyhow::bail!( - "configuration error, server port {} has no explicit allow list, and does not allow any (cannot be connected to)", - server_port_name + bail!( + "configuration error, server port {server_port_name} has no explicit allow list, and does not allow any (cannot be connected to)", ); } From 8f0e58399603a51674713a83e7b8873c6bafb2be Mon Sep 17 00:00:00 2001 From: MarcusGrass Date: Sat, 4 Oct 2025 21:34:45 +0200 Subject: [PATCH 7/7] fix: readme --- Readme.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index 3188e6c..5067a4e 100644 --- a/Readme.md +++ b/Readme.md @@ -99,6 +99,10 @@ Can be built using flutter: To build release, you need to set up signing-configs, [see the flutter docs](https://docs.flutter.dev/deployment/android#configure-signing-in-gradle) +```shell +cd p2proxy_fl && flutter build appbundle --debug +``` + ## Downloading For targets that are easy to build for and test with a VM (`generic linux`, `debian`, and `windows`) signed @@ -112,9 +116,8 @@ on any reasonably up-to-date linux install. I'm assuming that windows users won't run `p2proxyd`, but there's no technical reason that that can't be built or run on windows either. -```shell -cd p2proxy_fl && flutter build appbundle --debug -``` +If you're lucky `f97b4c8a80c2aa84380f44e69f193b41360c0bb6ff81861f9ed154f186e9f137` may be serving something +interesting. ## License