diff --git a/Cargo.lock b/Cargo.lock index 58c39ad5..0264f509 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -738,7 +738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8030735ecb0d128428b64cd379809817e620a40e5001c54465b99ec5feec2857" dependencies = [ "futures-core", - "prost", + "prost 0.13.5", "prost-types", "tonic", "tracing-core", @@ -757,7 +757,7 @@ dependencies = [ "hdrhistogram", "humantime", "hyper-util", - "prost", + "prost 0.13.5", "prost-types", "serde", "serde_json", @@ -1178,9 +1178,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" +checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" dependencies = [ "crc32fast", "miniz_oxide", @@ -2024,9 +2024,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.172" +version = "0.2.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "libloading" @@ -2221,7 +2221,7 @@ dependencies = [ "nix 0.30.1", "objc", "pretty-hex", - "prost", + "prost 0.14.1", "rand 0.9.1", "security-framework", "smoltcp", @@ -2284,7 +2284,7 @@ dependencies = [ "mitmproxy", "mitmproxy-linux-ebpf", "mitmproxy-linux-ebpf-common", - "prost", + "prost 0.14.1", "tokio", "tun", ] @@ -2296,7 +2296,7 @@ dependencies = [ "aya-ebpf", "aya-log-ebpf", "mitmproxy-linux-ebpf-common", - "which 7.0.3", + "which 8.0.0", ] [[package]] @@ -2746,7 +2746,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.13.5", +] + +[[package]] +name = "prost" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d" +dependencies = [ + "bytes", + "prost-derive 0.14.1", ] [[package]] @@ -2762,13 +2772,26 @@ dependencies = [ "syn 2.0.101", ] +[[package]] +name = "prost-derive" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" +dependencies = [ + "anyhow", + "itertools 0.14.0", + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "prost-types" version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" dependencies = [ - "prost", + "prost 0.13.5", ] [[package]] @@ -2809,9 +2832,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f239d656363bcee73afef85277f1b281e8ac6212a1d42aa90e55b90ed43c47a4" +checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a" dependencies = [ "anyhow", "indoc", @@ -2854,9 +2877,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755ea671a1c34044fa165247aaf6f419ca39caa6003aee791a0df2713d8f1b6d" +checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598" dependencies = [ "once_cell", "target-lexicon", @@ -2864,9 +2887,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc95a2e67091e44791d4ea300ff744be5293f394f1bafd9f78c080814d35956e" +checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c" dependencies = [ "libc", "pyo3-build-config", @@ -2885,9 +2908,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a179641d1b93920829a62f15e87c0ed791b6c8db2271ba0fd7c2686090510214" +checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -2897,9 +2920,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dff85ebcaab8c441b0e3f7ae40a6963ecea8a9f5e74f647e33fcf5ec9a1e89e" +checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc" dependencies = [ "heck", "proc-macro2", @@ -3388,9 +3411,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.35.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79251336d17c72d9762b8b54be4befe38d2db56fbbc0241396d70f173c39d47a" +checksum = "3c3ffa3e4ff2b324a57f7aeb3c349656c7b127c3c189520251a648102a92496e" dependencies = [ "libc", "memchr", @@ -3633,7 +3656,7 @@ dependencies = [ "hyper-util", "percent-encoding", "pin-project", - "prost", + "prost 0.13.5", "socket2", "tokio", "tokio-stream", @@ -3752,9 +3775,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.25.5" +version = "0.25.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5fff5c47490dfdf473b5228039bfacad9d765d9b6939d26bf7cc064c1c7822" +checksum = "a7cf18d43cbf0bfca51f657132cc616a5097edc4424d538bae6fa60142eaf9f0" dependencies = [ "cc", "regex", @@ -3776,9 +3799,9 @@ dependencies = [ [[package]] name = "tree-sitter-highlight" -version = "0.25.5" +version = "0.25.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b95a758838aa4272d7c5c40fe35a4c8266fd3e3a36e019eef952ec5840b60ed" +checksum = "6eea684ab5dd71e19f6c0add355be96f2b4eb58327cb305337415208681761aa" dependencies = [ "regex", "streaming-iterator", @@ -4062,11 +4085,10 @@ dependencies = [ [[package]] name = "which" -version = "7.0.3" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762" +checksum = "d3fabb953106c3c8eea8306e4393700d7657561cb43122571b172bbfb7c7ba1d" dependencies = [ - "either", "env_home", "rustix 1.0.5", "winsafe", @@ -4280,7 +4302,7 @@ dependencies = [ "log", "lru_time_cache", "mitmproxy", - "prost", + "prost 0.14.1", "tokio", "windivert", "winres", diff --git a/Cargo.toml b/Cargo.toml index c4e329e8..40661640 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,7 +63,7 @@ tokio = { version = "1.45.1", features = ["macros", "net", "rt-multi-thread", "s boringtun = { version = "0.6", default-features = false } console-subscriber = { version = "0.4.1", optional = true } image = { version = "0.25.6", default-features = false, features = ["png", "tiff"] } -prost = "0.13.5" +prost = "0.14.1" tokio-util = { version = "0.7.14", features = ["codec"] } futures-util = { version = "0.3.31", features = ["sink"] } lru_time_cache = "0.11.11" @@ -99,12 +99,12 @@ core-graphics = "0.25" core-foundation = "0.10" cocoa = "0.26" objc = "0.2" -sysinfo = "0.35.1" +sysinfo = "0.35.2" [target.'cfg(target_os = "linux")'.dependencies] tun = { workspace = true, features = ["async"] } tempfile = "3.20.0" -sysinfo = "0.35.1" +sysinfo = "0.35.2" [dev-dependencies] env_logger = "0.11" diff --git a/mitmproxy-contentviews/Cargo.toml b/mitmproxy-contentviews/Cargo.toml index 3c315dae..17983a09 100644 --- a/mitmproxy-contentviews/Cargo.toml +++ b/mitmproxy-contentviews/Cargo.toml @@ -22,7 +22,7 @@ serde_yaml = "0.9" rmp-serde = "1.1" protobuf = "3.7.2" regex = "1.10.3" -flate2 = "1.0" +flate2 = "1.1" protobuf-parse = "3.7" [dev-dependencies] diff --git a/mitmproxy-highlight/Cargo.toml b/mitmproxy-highlight/Cargo.toml index f08f4305..ecd3cb04 100644 --- a/mitmproxy-highlight/Cargo.toml +++ b/mitmproxy-highlight/Cargo.toml @@ -13,9 +13,9 @@ workspace = true [dependencies] anyhow = { version = "1.0.97", features = ["backtrace"] } -tree-sitter = "0.25.5" +tree-sitter = "0.25.6" tree-sitter-css = "0.23.2" -tree-sitter-highlight = "0.25.5" +tree-sitter-highlight = "0.25.6" tree-sitter-javascript = "0.23.1" tree-sitter-xml = "0.7.0" tree-sitter-yaml = "0.7.1" diff --git a/mitmproxy-linux-ebpf/Cargo.toml b/mitmproxy-linux-ebpf/Cargo.toml index 43efaa6d..8509f663 100644 --- a/mitmproxy-linux-ebpf/Cargo.toml +++ b/mitmproxy-linux-ebpf/Cargo.toml @@ -15,7 +15,7 @@ aya-ebpf = { workspace = true } aya-log-ebpf = { workspace = true } [build-dependencies] -which = "7.0.2" +which = "8.0.0" [[bin]] name = "mitmproxy-linux" diff --git a/mitmproxy-linux/Cargo.toml b/mitmproxy-linux/Cargo.toml index 2b6fada1..06a7602b 100644 --- a/mitmproxy-linux/Cargo.toml +++ b/mitmproxy-linux/Cargo.toml @@ -25,9 +25,9 @@ tokio = { version = "1.45", features = ["macros", "net", "rt-multi-thread", "syn anyhow = { version = "1.0.97", features = ["backtrace"] } log = "0.4.27" env_logger = "0.11.5" -prost = "0.13.5" +prost = "0.14.1" internet-packet = { version = "0.2.0", features = ["checksums"] } -libc = "0.2.170" +libc = "0.2.174" const-sha1 = "0.3.0" [target.'cfg(target_os = "linux")'.build-dependencies] diff --git a/mitmproxy-windows/redirector/Cargo.toml b/mitmproxy-windows/redirector/Cargo.toml index f64347f7..dd8a0675 100644 --- a/mitmproxy-windows/redirector/Cargo.toml +++ b/mitmproxy-windows/redirector/Cargo.toml @@ -21,7 +21,7 @@ windivert = "0.6.0" lru_time_cache = "0.11.11" log = "0.4.27" env_logger = "0.11.5" -prost = "0.13.5" +prost = "0.14.1" internet-packet = { version = "0.2.2", features = ["checksums"] } [target.'cfg(windows)'.dev-dependencies]