From c9ce4d99beae21fa4e11ad238a3ddd79cca63173 Mon Sep 17 00:00:00 2001 From: cyqsimon <28627918+cyqsimon@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:18:13 +0800 Subject: [PATCH 1/2] Bump `pnet` & `packet-builder` Switched to a branch for `packet-builder` with matching `pnet` version --- Cargo.lock | 40 ++++++++++++++++++++-------------------- Cargo.toml | 8 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 89abe6c6..4f762e15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -600,13 +600,13 @@ dependencies = [ [[package]] name = "derive-new" -version = "0.5.9" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" +checksum = "2cdc8d50f426189eef89dac62fabfa0abb27d5cc008f25bf4156a0203325becc" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.90", ] [[package]] @@ -1439,7 +1439,7 @@ dependencies = [ [[package]] name = "packet-builder" version = "0.7.0" -source = "git+https://github.com/cyqsimon/packet_builder.git?branch=patch-update#bf5a89ba75795f5067bb03fa8de00b833ffe4eae" +source = "git+https://github.com/cyqsimon/packet_builder.git?branch=patch-pnet-0.35#9911566055bba746a4d9b8189e3657ac818beb4d" dependencies = [ "derive-new", "ipnetwork", @@ -1518,9 +1518,9 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "pnet" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "130c5b738eeda2dc5796fe2671e49027e6935e817ab51b930a36ec9e6a206a64" +checksum = "682396b533413cc2e009fbb48aadf93619a149d3e57defba19ff50ce0201bd0d" dependencies = [ "ipnetwork", "pnet_base", @@ -1532,18 +1532,18 @@ dependencies = [ [[package]] name = "pnet_base" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cf6fb3ab38b68d01ab2aea03ed3d1132b4868fa4e06285f29f16da01c5f4c" +checksum = "ffc190d4067df16af3aba49b3b74c469e611cad6314676eaf1157f31aa0fb2f7" dependencies = [ "no-std-net", ] [[package]] name = "pnet_datalink" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5854abf0067ebbd3967f7d45ebc8976ff577ff0c7bd101c4973ae3c70f98fe" +checksum = "e79e70ec0be163102a332e1d2d5586d362ad76b01cec86f830241f2b6452a7b7" dependencies = [ "ipnetwork", "libc", @@ -1554,9 +1554,9 @@ dependencies = [ [[package]] name = "pnet_macros" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688b17499eee04a0408aca0aa5cba5fc86401d7216de8a63fdf7a4c227871804" +checksum = "13325ac86ee1a80a480b0bc8e3d30c25d133616112bb16e86f712dcf8a71c863" dependencies = [ "proc-macro2", "quote", @@ -1566,18 +1566,18 @@ dependencies = [ [[package]] name = "pnet_macros_support" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea925b72f4bd37f8eab0f221bbe4c78b63498350c983ffa9dd4bcde7e030f56" +checksum = "eed67a952585d509dd0003049b1fc56b982ac665c8299b124b90ea2bdb3134ab" dependencies = [ "pnet_base", ] [[package]] name = "pnet_packet" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a005825396b7fe7a38a8e288dbc342d5034dac80c15212436424fef8ea90ba" +checksum = "4c96ebadfab635fcc23036ba30a7d33a80c39e8461b8bd7dc7bb186acb96560f" dependencies = [ "glob", "pnet_base", @@ -1587,9 +1587,9 @@ dependencies = [ [[package]] name = "pnet_sys" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "417c0becd1b573f6d544f73671070b039051e5ad819cc64aa96377b536128d00" +checksum = "7d4643d3d4db6b08741050c2f3afa9a892c4244c085a72fcda93c9c2c9a00f4b" dependencies = [ "libc", "winapi", @@ -1597,9 +1597,9 @@ dependencies = [ [[package]] name = "pnet_transport" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2637e14d7de974ee2f74393afccbc8704f3e54e6eb31488715e72481d1662cc3" +checksum = "5f604d98bc2a6591cf719b58d3203fd882bdd6bf1db696c4ac97978e9f4776bf" dependencies = [ "libc", "pnet_base", diff --git a/Cargo.toml b/Cargo.toml index c8ed4e8b..5fc30ac8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,8 +36,8 @@ ipnetwork = "0.20.0" itertools = "0.13.0" log = "0.4.22" once_cell = "1.20.2" -pnet = "0.34.0" -pnet_macros_support = "0.34.0" +pnet = "0.35.0" +pnet_macros_support = "0.35.0" ratatui = "0.29.0" resolv-conf = "0.7.0" simplelog = "0.12.2" @@ -60,8 +60,8 @@ sysinfo = "0.32.1" [dev-dependencies] insta = "1.41.1" -packet-builder = { version = "0.7.0", git = "https://github.com/cyqsimon/packet_builder.git", branch = "patch-update" } -pnet_base = "0.34.0" +packet-builder = { version = "0.7.0", git = "https://github.com/cyqsimon/packet_builder.git", branch = "patch-pnet-0.35" } +pnet_base = "0.35.0" regex = "1.11.1" rstest = "0.23.0" From b0bbf44559095dbae13958b0f604ac0272c05582 Mon Sep 17 00:00:00 2001 From: cyqsimon <28627918+cyqsimon@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:22:22 +0800 Subject: [PATCH 2/2] Write changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dbec6f6..ccf08f31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) * Replace `derivative` with `derive_more` #439 - @YJDoc2 * Add build optimizations for release binary #434 - @pando85 * Minor cleanup and optimisations #435 - @cyqsimon +* Bump `pnet` & `packet-builder` #444 - @cyqsimon ## [0.23.1] - 2024-10-09