pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
py-mitmproxy_rs: Downgrade to 0.4.1
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Tue Jan 2 13:46:53 2024 +0100
Changeset: 6f3861d1b363b40dedea48db45fb1cc8c580ba95
Modified Files:
py-mitmproxy_rs/Makefile
py-mitmproxy_rs/PLIST
py-mitmproxy_rs/TODO
py-mitmproxy_rs/cargo-depends.mk
py-mitmproxy_rs/distinfo
Added Files:
py-mitmproxy_rs/patches/patch-.._vendor_boringtun-0.6.0_src_sleepyinstant_unix.rs
py-mitmproxy_rs/patches/patch-.._vendor_smoltcp-0.10.0_src_phy_sys_bpf.rs
Removed Files:
py-mitmproxy_rs/patches/patch-vendor_boringtun.xxx
py-mitmproxy_rs/patches/patch-vendor_smoltcp.xxx
Log Message:
py-mitmproxy_rs: Downgrade to 0.4.1
mitmproxy_rs.TcpStream was removed in 0.5.1 so for mitmproxy-10.1.6 we
need to stick to 0.4.1.
Adjust the patches so they get automatically applied.
With these changes mitmproxy seems to work!
Update TODO in order to point out that we should double-check patches
before we can import it.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6f3861d1b363b40dedea48db45fb1cc8c580ba95
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
py-mitmproxy_rs/Makefile | 2 +-
py-mitmproxy_rs/PLIST | 1 -
py-mitmproxy_rs/TODO | 4 +-
py-mitmproxy_rs/cargo-depends.mk | 34 +++----
py-mitmproxy_rs/distinfo | 110 +++++++++------------
...endor_boringtun-0.6.0_src_sleepyinstant_unix.rs | 20 ++++
...tch-.._vendor_smoltcp-0.10.0_src_phy_sys_bpf.rs | 47 +++++++++
py-mitmproxy_rs/patches/patch-vendor_boringtun.xxx | 16 ---
py-mitmproxy_rs/patches/patch-vendor_smoltcp.xxx | 43 --------
9 files changed, 126 insertions(+), 151 deletions(-)
diffs:
diff --git a/py-mitmproxy_rs/Makefile b/py-mitmproxy_rs/Makefile
index dba615b243..1dfde30e27 100644
--- a/py-mitmproxy_rs/Makefile
+++ b/py-mitmproxy_rs/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= mitmproxy_rs-0.5.1
+DISTNAME= mitmproxy_rs-0.4.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= www python
MASTER_SITES= ${MASTER_SITE_PYPI:=m/mitmproxy_rs/}
diff --git a/py-mitmproxy_rs/PLIST b/py-mitmproxy_rs/PLIST
index 626c631c81..0da92180c7 100644
--- a/py-mitmproxy_rs/PLIST
+++ b/py-mitmproxy_rs/PLIST
@@ -3,7 +3,6 @@ ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
${PYSITELIB}/${WHEEL_INFODIR}/RECORD
${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
-${PYSITELIB}/${WHEEL_INFODIR}/license_files/LICENSE
${PYSITELIB}/mitmproxy_rs/__init__.py
${PYSITELIB}/mitmproxy_rs/__init__.pyc
${PYSITELIB}/mitmproxy_rs/__init__.pyi
diff --git a/py-mitmproxy_rs/TODO b/py-mitmproxy_rs/TODO
index ab31010d5f..254553200e 100644
--- a/py-mitmproxy_rs/TODO
+++ b/py-mitmproxy_rs/TODO
@@ -1,3 +1 @@
-- Currently it only build by manually applying the patches in patches/
-- Review patches/*.xxx, they were only build-tested but are likely wrong
-- Properly patch such files
+- Review patches/* they were only build-tested but are likely wrong
diff --git a/py-mitmproxy_rs/cargo-depends.mk b/py-mitmproxy_rs/cargo-depends.mk
index cce191de98..a27d8c541f 100644
--- a/py-mitmproxy_rs/cargo-depends.mk
+++ b/py-mitmproxy_rs/cargo-depends.mk
@@ -61,13 +61,13 @@ CARGO_CRATE_DEPENDS+= crunchy-0.2.2
CARGO_CRATE_DEPENDS+= crypto-common-0.1.6
CARGO_CRATE_DEPENDS+= curve25519-dalek-4.0.0-rc.3
CARGO_CRATE_DEPENDS+= curve25519-dalek-derive-0.1.0
-CARGO_CRATE_DEPENDS+= data-encoding-2.5.0
+CARGO_CRATE_DEPENDS+= data-encoding-2.4.0
CARGO_CRATE_DEPENDS+= defmt-0.3.5
CARGO_CRATE_DEPENDS+= defmt-macros-0.3.6
CARGO_CRATE_DEPENDS+= defmt-parser-0.3.3
CARGO_CRATE_DEPENDS+= digest-0.10.7
CARGO_CRATE_DEPENDS+= either-1.9.0
-CARGO_CRATE_DEPENDS+= env_logger-0.10.1
+CARGO_CRATE_DEPENDS+= env_logger-0.10.0
CARGO_CRATE_DEPENDS+= errno-0.3.3
CARGO_CRATE_DEPENDS+= errno-dragonfly-0.1.2
CARGO_CRATE_DEPENDS+= etherparse-0.13.0
@@ -113,7 +113,7 @@ CARGO_CRATE_DEPENDS+= indexmap-1.9.3
CARGO_CRATE_DEPENDS+= indoc-1.0.9
CARGO_CRATE_DEPENDS+= inout-0.1.3
CARGO_CRATE_DEPENDS+= internet-checksum-0.2.1
-CARGO_CRATE_DEPENDS+= internet-packet-0.2.0
+CARGO_CRATE_DEPENDS+= internet-packet-0.1.0
CARGO_CRATE_DEPENDS+= ip_network-0.4.1
CARGO_CRATE_DEPENDS+= ip_network_table-0.2.0
CARGO_CRATE_DEPENDS+= ip_network_table-deps-treebitmap-0.5.0
@@ -125,7 +125,7 @@ CARGO_CRATE_DEPENDS+= jpeg-decoder-0.3.0
CARGO_CRATE_DEPENDS+= js-sys-0.3.64
CARGO_CRATE_DEPENDS+= lazy_static-1.4.0
CARGO_CRATE_DEPENDS+= lebe-0.5.2
-CARGO_CRATE_DEPENDS+= libc-0.2.150
+CARGO_CRATE_DEPENDS+= libc-0.2.148
CARGO_CRATE_DEPENDS+= linux-raw-sys-0.4.7
CARGO_CRATE_DEPENDS+= lock_api-0.4.10
CARGO_CRATE_DEPENDS+= log-0.4.20
@@ -138,7 +138,7 @@ CARGO_CRATE_DEPENDS+= memoffset-0.9.0
CARGO_CRATE_DEPENDS+= mime-0.3.17
CARGO_CRATE_DEPENDS+= minimal-lexical-0.2.1
CARGO_CRATE_DEPENDS+= miniz_oxide-0.7.1
-CARGO_CRATE_DEPENDS+= mio-0.8.9
+CARGO_CRATE_DEPENDS+= mio-0.8.8
CARGO_CRATE_DEPENDS+= nix-0.25.1
CARGO_CRATE_DEPENDS+= nix-0.27.1
CARGO_CRATE_DEPENDS+= nom-7.1.3
@@ -164,12 +164,12 @@ CARGO_CRATE_DEPENDS+= plotters-svg-0.3.5
CARGO_CRATE_DEPENDS+= png-0.17.10
CARGO_CRATE_DEPENDS+= poly1305-0.8.0
CARGO_CRATE_DEPENDS+= ppv-lite86-0.2.17
-CARGO_CRATE_DEPENDS+= pretty-hex-0.4.0
+CARGO_CRATE_DEPENDS+= pretty-hex-0.3.0
CARGO_CRATE_DEPENDS+= proc-macro-error-1.0.4
CARGO_CRATE_DEPENDS+= proc-macro-error-attr-1.0.4
CARGO_CRATE_DEPENDS+= proc-macro2-1.0.67
-CARGO_CRATE_DEPENDS+= prost-0.12.3
-CARGO_CRATE_DEPENDS+= prost-derive-0.12.3
+CARGO_CRATE_DEPENDS+= prost-0.12.1
+CARGO_CRATE_DEPENDS+= prost-derive-0.12.1
CARGO_CRATE_DEPENDS+= prost-types-0.12.1
CARGO_CRATE_DEPENDS+= pyo3-0.19.2
CARGO_CRATE_DEPENDS+= pyo3-asyncio-0.19.0
@@ -210,7 +210,7 @@ CARGO_CRATE_DEPENDS+= slab-0.4.9
CARGO_CRATE_DEPENDS+= smallvec-1.11.1
CARGO_CRATE_DEPENDS+= smoltcp-0.10.0
CARGO_CRATE_DEPENDS+= socket2-0.4.9
-CARGO_CRATE_DEPENDS+= socket2-0.5.5
+CARGO_CRATE_DEPENDS+= socket2-0.5.4
CARGO_CRATE_DEPENDS+= spin-0.5.2
CARGO_CRATE_DEPENDS+= spin-0.9.8
CARGO_CRATE_DEPENDS+= stable_deref_trait-1.2.0
@@ -226,9 +226,9 @@ CARGO_CRATE_DEPENDS+= thiserror-impl-1.0.48
CARGO_CRATE_DEPENDS+= thread_local-1.1.7
CARGO_CRATE_DEPENDS+= tiff-0.9.0
CARGO_CRATE_DEPENDS+= tinytemplate-1.2.1
-CARGO_CRATE_DEPENDS+= tokio-1.34.0
+CARGO_CRATE_DEPENDS+= tokio-1.33.0
CARGO_CRATE_DEPENDS+= tokio-io-timeout-1.2.0
-CARGO_CRATE_DEPENDS+= tokio-macros-2.2.0
+CARGO_CRATE_DEPENDS+= tokio-macros-2.1.0
CARGO_CRATE_DEPENDS+= tokio-stream-0.1.14
CARGO_CRATE_DEPENDS+= tokio-util-0.7.10
CARGO_CRATE_DEPENDS+= toml-0.5.11
@@ -266,25 +266,17 @@ CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
CARGO_CRATE_DEPENDS+= windivert-0.6.0
CARGO_CRATE_DEPENDS+= windivert-sys-0.10.0
CARGO_CRATE_DEPENDS+= windows-0.48.0
-CARGO_CRATE_DEPENDS+= windows-0.52.0
-CARGO_CRATE_DEPENDS+= windows-core-0.52.0
+CARGO_CRATE_DEPENDS+= windows-0.51.1
+CARGO_CRATE_DEPENDS+= windows-core-0.51.1
CARGO_CRATE_DEPENDS+= windows-sys-0.48.0
CARGO_CRATE_DEPENDS+= windows-targets-0.48.5
-CARGO_CRATE_DEPENDS+= windows-targets-0.52.0
CARGO_CRATE_DEPENDS+= windows_aarch64_gnullvm-0.48.5
-CARGO_CRATE_DEPENDS+= windows_aarch64_gnullvm-0.52.0
CARGO_CRATE_DEPENDS+= windows_aarch64_msvc-0.48.5
-CARGO_CRATE_DEPENDS+= windows_aarch64_msvc-0.52.0
CARGO_CRATE_DEPENDS+= windows_i686_gnu-0.48.5
-CARGO_CRATE_DEPENDS+= windows_i686_gnu-0.52.0
CARGO_CRATE_DEPENDS+= windows_i686_msvc-0.48.5
-CARGO_CRATE_DEPENDS+= windows_i686_msvc-0.52.0
CARGO_CRATE_DEPENDS+= windows_x86_64_gnu-0.48.5
-CARGO_CRATE_DEPENDS+= windows_x86_64_gnu-0.52.0
CARGO_CRATE_DEPENDS+= windows_x86_64_gnullvm-0.48.5
-CARGO_CRATE_DEPENDS+= windows_x86_64_gnullvm-0.52.0
CARGO_CRATE_DEPENDS+= windows_x86_64_msvc-0.48.5
-CARGO_CRATE_DEPENDS+= windows_x86_64_msvc-0.52.0
CARGO_CRATE_DEPENDS+= winres-0.1.12
CARGO_CRATE_DEPENDS+= x25519-dalek-2.0.0-rc.3
CARGO_CRATE_DEPENDS+= xattr-1.0.1
diff --git a/py-mitmproxy_rs/distinfo b/py-mitmproxy_rs/distinfo
index 1de87ec475..5189fe3c85 100644
--- a/py-mitmproxy_rs/distinfo
+++ b/py-mitmproxy_rs/distinfo
@@ -183,9 +183,9 @@ Size (curve25519-dalek-4.0.0-rc.3.crate) = 529027 bytes
BLAKE2s (curve25519-dalek-derive-0.1.0.crate) = ee941897ed43d4cd43b731bf43d80fc0d6875e2ab08eaad32eb6a5721decc1f4
SHA512 (curve25519-dalek-derive-0.1.0.crate) = 8d5adfc647aa1310d251d94b6a696c27049096d1ca28c3384ea1570af13c8765fcfb1382c00426c99f6f50a71adff5301e1537189b29fbd7821734c6f595b9e8
Size (curve25519-dalek-derive-0.1.0.crate) = 7344 bytes
-BLAKE2s (data-encoding-2.5.0.crate) = ce5fa9ca8c127fee28d23a901eafe86dcc0193a05bca1414f686d3dd2ddb4efd
-SHA512 (data-encoding-2.5.0.crate) = b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae
-Size (data-encoding-2.5.0.crate) = 20632 bytes
+BLAKE2s (data-encoding-2.4.0.crate) = 497694ac16e57acff1d751b6251dde3450f6a26cf1f010fb1e01de13b9d133fa
+SHA512 (data-encoding-2.4.0.crate) = b16c4bd5999a4f1281d6691ce05f8bc2a109cf422dd4fa4e7b26b573b2a4b7e33e2fb246681846bbf85fcb6361c115f509898724eb6526f1f49f55acb4f9ad7a
+Size (data-encoding-2.4.0.crate) = 19165 bytes
BLAKE2s (defmt-0.3.5.crate) = 4150534d7f703c34bdb54a6b0f9e88cebc367d8cadcd793e16be90b616e4c94e
SHA512 (defmt-0.3.5.crate) = e630b7b0ab2735c12de46d3f249f8713f82f0d93e29922dbe931589346b7ee39c29d7440e8a6dc6203f1ff07ac0ec1bb2db8e078f25d243c0a5d5e6ccfc81b45
Size (defmt-0.3.5.crate) = 23914 bytes
@@ -201,9 +201,9 @@ Size (digest-0.10.7.crate) = 19557 bytes
BLAKE2s (either-1.9.0.crate) = 5a2a8926fcb3b40b49b9bae0b6e35d54568dc40215691afa9bb355400b0eb180
SHA512 (either-1.9.0.crate) = 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177
Size (either-1.9.0.crate) = 16660 bytes
-BLAKE2s (env_logger-0.10.1.crate) = 4500909f287250419ad39dfc19076cfba598b420162fcf992fc266cb248f0b2e
-SHA512 (env_logger-0.10.1.crate) = 5749661d10a482447527f4641a86a77dfecff0984e13f07cc9392359287c74837af8b290c358a4888934ae3ec0389f51e8cd269fbcc48cd27bd44bbacac41b0f
-Size (env_logger-0.10.1.crate) = 36524 bytes
+BLAKE2s (env_logger-0.10.0.crate) = 279aaae993db71bf2be722fb2cfe9042a6a3a2765a0461ce2ed3dabc9afa4ad2
+SHA512 (env_logger-0.10.0.crate) = 4dd02f9d333a1f15657167ef4bd403eda5426cad17e0a4a43fa20cc65449345eb4d3fae2d6b10a3480016b9e23497fac13ed7e70b40c9450ef430be9f910d3e4
+Size (env_logger-0.10.0.crate) = 36574 bytes
BLAKE2s (errno-0.3.3.crate) = b60a1408c161b52694c72a492398ac1a27023e436811bb2930776abec6df41ba
SHA512 (errno-0.3.3.crate) = 9524db39d0c9be287e0d2aed3358a86e961b2868717037212a2e9dc408bc73198ab23196d7923a9ba7e0e9357276075148f582e0325ad36ae1b212a8c674173e
Size (errno-0.3.3.crate) = 10543 bytes
@@ -339,9 +339,9 @@ Size (inout-0.1.3.crate) = 10743 bytes
BLAKE2s (internet-checksum-0.2.1.crate) = 7534cecba69f4dca7a7de6a00cb0961e5bd01ad28f03d69547559c6663d27e0c
SHA512 (internet-checksum-0.2.1.crate) = 12f94dabf350fc9befa8b797f508d2e20697cefc5986bb166f294ae82e280ad48123bc1fe3f0524e3f2c81b18d6a99331824ae353a9f23455221ddb0caeec911
Size (internet-checksum-0.2.1.crate) = 9271 bytes
-BLAKE2s (internet-packet-0.2.0.crate) = 6e8e831cd4b9efeed535fdeabfcbf2da20c4c5dc9c09fbe045237326d837aaf6
-SHA512 (internet-packet-0.2.0.crate) = cb897c3af52e7df11da82d4ede0919be1d876be82165f9c914f82ef7333837a80e3b145c5222396f9b5789cbf0e3b472469c30d4fa8466c96d1841e56b4d0a8f
-Size (internet-packet-0.2.0.crate) = 6115 bytes
+BLAKE2s (internet-packet-0.1.0.crate) = f8d4089be79a69f622a064d061109a306071d6c5c890e4d9f6a0dc70a88211d4
+SHA512 (internet-packet-0.1.0.crate) = 53c66901bf81ad09b97ffa603d74ad9767a59bb083600721758afecd825d0e5a27c400e1bfc4b18806f365c61b88f999d15c7bcc55025193244900f96cb44166
+Size (internet-packet-0.1.0.crate) = 5241 bytes
BLAKE2s (ip_network-0.4.1.crate) = a956183acf4a7629377591a6e55969fc1d18c216867f099b913ded8ffb63aa3c
SHA512 (ip_network-0.4.1.crate) = fe6875d1f3b42b9cc7f9ccefd50c67d6b6503880594d4d807db50ca247776e68a5dd4e147686b9e0029f831b5a84c61254e389e600b013d2f46396302d05d48d
Size (ip_network-0.4.1.crate) = 23969 bytes
@@ -375,9 +375,9 @@ Size (lazy_static-1.4.0.crate) = 10443 bytes
BLAKE2s (lebe-0.5.2.crate) = 01e8bce825913aa4c842bf5c4027c23c057e7ac73942ab45ef52df6fd5fce5fa
SHA512 (lebe-0.5.2.crate) = ae8fce41c9a934999dad672ad74acabac9d7998aac4f1d03b54910d4b941375b9e9721cb1bfc8cd7cfcc4206fc0b18d725b0ea256a3a10a125a8d5848ed761ae
Size (lebe-0.5.2.crate) = 8422 bytes
-BLAKE2s (libc-0.2.150.crate) = 25c2f5af027131d2c1677003d5ae4aaf6c467fec005eef8ab1405066e8dc68d9
-SHA512 (libc-0.2.150.crate) = 7ae8fe6a1db38ac6d951c0b4880d25a02f064f5e61d6057c20f7208dec8395d58efd085e41857bcf5f4da2b014d2952dc4ddaf18ac4acd3a23675bb659e70385
-Size (libc-0.2.150.crate) = 719359 bytes
+BLAKE2s (libc-0.2.148.crate) = 8ba3a88809098e505c15dd976c79fcf703a98471734f5da8f4def55d65ecf624
+SHA512 (libc-0.2.148.crate) = 1dec9ec8f4c610c08f62bc2b45dd32f1e4528a045161d848b5c4f0382be1158a690f4d7760203d7d2347a80422671f43b07531871cf44990887eaaed35d924d4
+Size (libc-0.2.148.crate) = 690988 bytes
BLAKE2s (linux-raw-sys-0.4.7.crate) = dc88518e9d0b7c838ea7262f19df4c30d70df3919a3be6e4a6d1f575a2f66122
SHA512 (linux-raw-sys-0.4.7.crate) = df36f3f188767080f118aac32138233209a1f0cd11682425fc101cb054e138cf0582ad044d0f326a20ce517f425665ea1ad9ac5eda147712a994884101974d48
Size (linux-raw-sys-0.4.7.crate) = 1350647 bytes
@@ -414,12 +414,12 @@ Size (minimal-lexical-0.2.1.crate) = 94841 bytes
BLAKE2s (miniz_oxide-0.7.1.crate) = 8828f41da010ee5dff26a15deb1e0973dca6c69b22521812b366e0977103416d
SHA512 (miniz_oxide-0.7.1.crate) = 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c
Size (miniz_oxide-0.7.1.crate) = 55194 bytes
-BLAKE2s (mio-0.8.9.crate) = 49d72261274ce09bda98ac3a4ca8187b1b092dc95413bff2a4d10ae2ddda9b38
-SHA512 (mio-0.8.9.crate) = a078b1db6140d77452c24647aa91ec6563d00bc3516fb44c34b79797fdc953493cf844f1ab84d226582e9d61c383f4a743fd93853d71e362fb9dfc8dc6529808
-Size (mio-0.8.9.crate) = 102227 bytes
-BLAKE2s (mitmproxy_rs-0.5.1.tar.gz) = 600ffeabbea0424813a662f98c153da8e5d7e7959bc9f849d336d2b81cb30144
-SHA512 (mitmproxy_rs-0.5.1.tar.gz) = 1d3b4087aacb1bed0eb158cff30e09fd5e06f2b9ac6b4212c39eb329b1d85a84027eb8a6c3ddd9b3cb5404627b5cf6cbd5f26fce911b6a21fe3144b714c04886
-Size (mitmproxy_rs-0.5.1.tar.gz) = 1166684 bytes
+BLAKE2s (mio-0.8.8.crate) = 4b300d1e0a006717210bbb8aa794e898dd120da16112e46d3a38319d8437e6be
+SHA512 (mio-0.8.8.crate) = 448a05f19a147fe119965f7f1aaf24c2a40ed816ddf2e5c95ba3bdaded5e2812314c64a50dc7baada93bb005b65159cb6597f82a407936885ea376bb128b0c9a
+Size (mio-0.8.8.crate) = 94264 bytes
+BLAKE2s (mitmproxy_rs-0.4.1.tar.gz) = ce1280c179e57be84504d3cd9270687649827ccc2a2883729257d71d9b6a823f
+SHA512 (mitmproxy_rs-0.4.1.tar.gz) = 3f415572ad4657b0461057fba2ef95f76b247773ab30f06210a596b65e1d372ee64bcd5ca4af4d35e8e1c21a28c9fc4f3b8da2bc4e0cabf681193bf1e163cf7c
+Size (mitmproxy_rs-0.4.1.tar.gz) = 1129016 bytes
BLAKE2s (nix-0.25.1.crate) = 003570f673f1be824f135f2cde80331e753fd463965669c33a1b341ccd926747
SHA512 (nix-0.25.1.crate) = e80b3a4e38b26687ba39b52ebebc6415e9618ca41e037d571fcaa33638ef28d022be02e2265db0149088a927fb81935329e651e2cda5c29c92038eb07fe55538
Size (nix-0.25.1.crate) = 272312 bytes
@@ -495,9 +495,9 @@ Size (poly1305-0.8.0.crate) = 32633 bytes
BLAKE2s (ppv-lite86-0.2.17.crate) = ab4072222c214b8175c6e7fa7d669499ae1f66aade109c04ec533114fb702912
SHA512 (ppv-lite86-0.2.17.crate) = 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
Size (ppv-lite86-0.2.17.crate) = 22242 bytes
-BLAKE2s (pretty-hex-0.4.0.crate) = 25d7368106d99f1dd644e0fd16ab92835ee4012c27c4ff7d7a14d0126c0ec8df
-SHA512 (pretty-hex-0.4.0.crate) = ff6d6f9d3cc92db5a1b6b723a3e4805dcae9029e62e668ddc40e2bb5bd8df88076955aacce279cd19dc30104e226b6aad5e31318cd9fd6941addfd887794b547
-Size (pretty-hex-0.4.0.crate) = 6822 bytes
+BLAKE2s (pretty-hex-0.3.0.crate) = b76e95c0552f90505bbf0c78bfef0c4100cba7e8680ab829084d6e92c06bc45e
+SHA512 (pretty-hex-0.3.0.crate) = f6712b51429130950d47049cff5d98859c8b326d297c84f1c733964f2d22ce9b1b077c105a70ad4a3aa0b8e3a94b7239c7118581d523b982a62e170cfb0ff872
+Size (pretty-hex-0.3.0.crate) = 6677 bytes
BLAKE2s (proc-macro-error-1.0.4.crate) = 2877169f24a0bf3a09d9bfd388ac5d39082672d9258c1c96a851c1bc166b234a
SHA512 (proc-macro-error-1.0.4.crate) = 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
Size (proc-macro-error-1.0.4.crate) = 25293 bytes
@@ -507,12 +507,12 @@ Size (proc-macro-error-attr-1.0.4.crate) = 7971 bytes
BLAKE2s (proc-macro2-1.0.67.crate) = fd8a3954701f3c049b87668da5a007964a439fc4de64b497924ff3310116d0db
SHA512 (proc-macro2-1.0.67.crate) = 3827f5f698aaecc168a03643e330e03aca7b0de98bd57dc97507c1bd53b6ec64752a1f4dee4c8a12ab02f410775a11f5ce7b0d36ec0e1fbbec197e3d7e199eab
Size (proc-macro2-1.0.67.crate) = 43683 bytes
-BLAKE2s (prost-0.12.3.crate) = 7b69bb1fdfe808de1acf8467117fd11c043ef8d32ddb6bbeb89f7b80cf85185a
-SHA512 (prost-0.12.3.crate) = 08a910897ba623e2773964a016a16f5b40b8f95037825fd6b2160912346ef83522482745ff3a17a77a634867b9dece8d5c10a22ac1cf779e632c5c7501897f24
-Size (prost-0.12.3.crate) = 29461 bytes
-BLAKE2s (prost-derive-0.12.3.crate) = 4da7983e4775968e1de9884445c4700d0c1c4170409b9362479c8e9108332daa
-SHA512 (prost-derive-0.12.3.crate) = ec960fd57d51813f50ba7ab53ee2c67cbe405bda152cc4cbb29a37e2f571aaf97fa07eb1730ab6f338911355f3ec22b10ab17590d0bf8121b7ab48662f47604e
-Size (prost-derive-0.12.3.crate) = 19603 bytes
+BLAKE2s (prost-0.12.1.crate) = 10c1c5e70f72a731d426500e1b17e91af69d70940fa671f438f70daf48a639f3
+SHA512 (prost-0.12.1.crate) = 4d1785a3d6bc09454078749407a26f9617e755a495506ff31dd4f41bf73d6e392cddc478208547513b8b269aff06adefc7ef542cc651adeafa5a933669163508
+Size (prost-0.12.1.crate) = 29319 bytes
+BLAKE2s (prost-derive-0.12.1.crate) = 633560dfb829e4f71b3fd85a325147cec955f98b57b2d160d10d21124e839eb7
+SHA512 (prost-derive-0.12.1.crate) = d2dc2d40bf21e2166c960b39f4f6f2001155a2e2da46aa3837d6a64dc7217d0cc733a816ced0d2efd989efbe030926a3501879adc6645fd01673fe5b95befbd0
+Size (prost-derive-0.12.1.crate) = 19606 bytes
BLAKE2s (prost-types-0.12.1.crate) = 2c915281475232b2003a2b322dffe1e00df1d8918a3cfb29722fc69ce8b9ccb2
SHA512 (prost-types-0.12.1.crate) = e235358dddf77269a30ba76efa540f43b5984f5250095faac72ee53a95504fc20304aebb7d9161f798905ec8a01b547ab2191e526237b8eb4533fa672bdc59ac
Size (prost-types-0.12.1.crate) = 42092 bytes
@@ -633,9 +633,9 @@ Size (smoltcp-0.10.0.crate) = 300818 bytes
BLAKE2s (socket2-0.4.9.crate) = 65f11a4bb0daeb2cb7e6df79b73aa00eb1e46783e8dbd85971ed496f18fa3a23
SHA512 (socket2-0.4.9.crate) = 6cb2aabc409fc7d9942afc2073a36ad8730c06dcdab1866b9d3d72dc55afc643be6a2ca1f38c2e19fbfe782ae584512a1ab357c0f4974f98967a4f489e65331f
Size (socket2-0.4.9.crate) = 45421 bytes
-BLAKE2s (socket2-0.5.5.crate) = 40d74e70494598250b723b5a98e1a365b496645acfd7cf06ba56cc51273241c9
-SHA512 (socket2-0.5.5.crate) = afa8df546234d4e8f89289622448aa42d8c2ba74a0a3a4b13c0ff7bc30fa435a7d6d6e8c9e2a6933cfa23ebdfb4908c865e82c657611defbc16e1f1bf66f9f8c
-Size (socket2-0.5.5.crate) = 54863 bytes
+BLAKE2s (socket2-0.5.4.crate) = 840e12cf93b1713666bb8c359e088d8c0e66ffdb6358ede2eedbed445334f135
+SHA512 (socket2-0.5.4.crate) = 76ec5d712b24e0c42d0400abe2d6681f0e9d707f5ed562475a0496b80a2003991564519c555a175e8837f6e8083a7216b197634e5a1a68d2f5cc268ae6e30c2a
+Size (socket2-0.5.4.crate) = 54663 bytes
BLAKE2s (spin-0.5.2.crate) = d5bc3b486fe3a6db98d04b18e180a4588bd37bd5657c38528f7ab6c999df3dcf
SHA512 (spin-0.5.2.crate) = fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
Size (spin-0.5.2.crate) = 12004 bytes
@@ -681,15 +681,15 @@ Size (tiff-0.9.0.crate) = 1418215 bytes
BLAKE2s (tinytemplate-1.2.1.crate) = 0027e7b337b79cd45257e3b79454dc579ec1bd97811fd74824268704e3aa7454
SHA512 (tinytemplate-1.2.1.crate) = 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
Size (tinytemplate-1.2.1.crate) = 26490 bytes
-BLAKE2s (tokio-1.34.0.crate) = 70c044e9b24506522d754835116cf38168e8db8f9f5d73c95687070f24da609e
-SHA512 (tokio-1.34.0.crate) = 8749f5eb1a96bb13ffc6a431aafa618cc116a59be96700298ca52c7b129b48a087641f60e91c051f78dec61eafd9b5f1cb4de041e0a1abaab4509ffb81d02689
-Size (tokio-1.34.0.crate) = 736847 bytes
+BLAKE2s (tokio-1.33.0.crate) = f4203ac170a80d130a298bcca2e4880a1cea02b5e419a45f195a1f7697594de2
+SHA512 (tokio-1.33.0.crate) = 49fc49106064a637988619fdc5f949654b64b26e956801cdfcd46d8441bc4825683969bf65421e1466b5e2c8bff7212f738d8d5182980e4133e84d0187999b70
+Size (tokio-1.33.0.crate) = 733783 bytes
BLAKE2s (tokio-io-timeout-1.2.0.crate) = cab0252124a36a42793a3a078aba472b6fab99178d6f9f7b7d9ffdf433631e57
SHA512 (tokio-io-timeout-1.2.0.crate) = 861b8b2c7af6ace78ae223fa567f26fd347de92b3e67c788a140a7cf5bc6320926387ec633ac5bf32fc2b0b28b4f3be450b7c4cdc755eba4412eac7c390dcfd8
Size (tokio-io-timeout-1.2.0.crate) = 8993 bytes
-BLAKE2s (tokio-macros-2.2.0.crate) = 8c74c7936b49d10b8c08a25468aa89afdc7fca73e5ee75d62f20dd5df5a9a850
-SHA512 (tokio-macros-2.2.0.crate) = 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6
-Size (tokio-macros-2.2.0.crate) = 11520 bytes
+BLAKE2s (tokio-macros-2.1.0.crate) = d17f510bb009bdab3c39d8e089929c5ce18f01e580ae63905c9149b893a589bc
+SHA512 (tokio-macros-2.1.0.crate) = e2a24c1befd512d68b5d8b26a3f1d940dd10bfe0979b5d61a71052478d9fd19b28eb7bcbeaca4cf3c9736fd3da0386c899e3a619f47c2d9f7e6b497140586b9d
+Size (tokio-macros-2.1.0.crate) = 11472 bytes
BLAKE2s (tokio-stream-0.1.14.crate) = b173404a8b2949fd430378270e120b27313bf28d6e1f5e6dac9f7c1bba94501b
SHA512 (tokio-stream-0.1.14.crate) = b600ef2dd90e0f46d21e94cd04baba91ec3f586832125cc2f51f350b47e7f9cc1ff5bc7529843347fc60043a61243e5b846d8db8406014969a8935385f161303
Size (tokio-stream-0.1.14.crate) = 35881 bytes
@@ -801,63 +801,39 @@ Size (windivert-sys-0.10.0.crate) = 177259 bytes
BLAKE2s (windows-0.48.0.crate) = 2dd07bb8d0bbdbc2bf9b2f2dc28143fe85bafa5aad09f5feec84869582e58b97
SHA512 (windows-0.48.0.crate) = 7c906f885fa0a730f1cb1ef4e62f5b602a49d44343febe1d38fcd4cbc28e0342766983796042585fe457aa229333558715b6270e378946faa8f398a7ecc2af8c
Size (windows-0.48.0.crate) = 11864177 bytes
-BLAKE2s (windows-0.52.0.crate) = b61ab4c89b2cccd911515b6c40f21d0fa8eb5fe5c401c1400ba297747b0df440
-SHA512 (windows-0.52.0.crate) = 8a9d443cfae3b44ab50bdffd70b70ea3b3d536f464e4beb7cfa9e15eb4e4505cbac20266b44d589bb7231790a87f473ead6d2160b8cd18d62f31b78bf61417da
-Size (windows-0.52.0.crate) = 11843715 bytes
-BLAKE2s (windows-core-0.52.0.crate) = 77d9bb32ee278988564117784949be021514e73dbe8039a61a4606321aaa7d0b
-SHA512 (windows-core-0.52.0.crate) = 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36
-Size (windows-core-0.52.0.crate) = 42154 bytes
+BLAKE2s (windows-0.51.1.crate) = 659a877504dab77fbc07ca6cfb38a53c99f6ac81ad9708797e7d03a99e12d1c2
+SHA512 (windows-0.51.1.crate) = ccb118175cba992c567fdde85c729daceb121c97e31c1d95339bdf6c8a3a16e069f86ad3695e8450fd112a6bd60d4b37c443eeb29da78f43474c1bf52b46a9ad
+Size (windows-0.51.1.crate) = 12250614 bytes
+BLAKE2s (windows-core-0.51.1.crate) = 077883ef9a633225a2e41fac29a09dcf3b83ab9f314716e6094153e265b4f460
+SHA512 (windows-core-0.51.1.crate) = 90615ed84f11fdfe0725a4a8b112e45f93ae6cb7e65c16636f85217369fd8b708553ae5bd28aff66e18b180ffa3c0f6820a94022fc5eb202b4f8358f8926fde6
+Size (windows-core-0.51.1.crate) = 42364 bytes
BLAKE2s (windows-sys-0.48.0.crate) = cbec178b925ef01a7990a203a0725e6c42071170cebc4f9e0737f2eb4cdd7265
SHA512 (windows-sys-0.48.0.crate) = bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
Size (windows-sys-0.48.0.crate) = 2628884 bytes
BLAKE2s (windows-targets-0.48.5.crate) = 7f0625d0395de135ccc1832b157516dfffec6e9f905cec77029e73ee3b1ad784
SHA512 (windows-targets-0.48.5.crate) = e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
Size (windows-targets-0.48.5.crate) = 6904 bytes
-BLAKE2s (windows-targets-0.52.0.crate) = fcda082fc3eca330a478727bb44e92a5a333a3cf9c463db397add89290503d0a
-SHA512 (windows-targets-0.52.0.crate) = 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e
-Size (windows-targets-0.52.0.crate) = 6229 bytes
BLAKE2s (windows_aarch64_gnullvm-0.48.5.crate) = 16f1a40ad9d7f5c07494846417860a008e6ff77d14849feef2028cbf42101904
SHA512 (windows_aarch64_gnullvm-0.48.5.crate) = 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
Size (windows_aarch64_gnullvm-0.48.5.crate) = 418492 bytes
-BLAKE2s (windows_aarch64_gnullvm-0.52.0.crate) = b11649b9a222da40d8cdcfc55fa7f116efed150e299126f822473d0acbd26f96
-SHA512 (windows_aarch64_gnullvm-0.52.0.crate) = b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f
-Size (windows_aarch64_gnullvm-0.52.0.crate) = 430182 bytes
BLAKE2s (windows_aarch64_msvc-0.48.5.crate) = f6a2eccd6c79e9b8ea1ffb008c07418a153d1aead269ca75e783f53bdae4e54c
SHA512 (windows_aarch64_msvc-0.48.5.crate) = 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
Size (windows_aarch64_msvc-0.48.5.crate) = 798483 bytes
-BLAKE2s (windows_aarch64_msvc-0.52.0.crate) = 248386d0b0b4120fd90668641f55f4f9ee63ad748deddedf27b71a7f7cfa156b
-SHA512 (windows_aarch64_msvc-0.52.0.crate) = 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1
-Size (windows_aarch64_msvc-0.52.0.crate) = 821663 bytes
BLAKE2s (windows_i686_gnu-0.48.5.crate) = a2bb0938735f6a3ee123aea59a739152d9b6d75f791218bc1bcff2fd1f3efb12
SHA512 (windows_i686_gnu-0.48.5.crate) = 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
Size (windows_i686_gnu-0.48.5.crate) = 844891 bytes
-BLAKE2s (windows_i686_gnu-0.52.0.crate) = 25f17682dbaff5e63232c5e290f658e8ca20d031ce1fe6debe60f3ff2f62bc94
-SHA512 (windows_i686_gnu-0.52.0.crate) = fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e
-Size (windows_i686_gnu-0.52.0.crate) = 870285 bytes
BLAKE2s (windows_i686_msvc-0.48.5.crate) = 11c932ffbc45e09989e52ce8b8cf54444d2ad5c680854bb2eda91c02b94075c7
SHA512 (windows_i686_msvc-0.48.5.crate) = 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
Size (windows_i686_msvc-0.48.5.crate) = 864300 bytes
-BLAKE2s (windows_i686_msvc-0.52.0.crate) = 4e3de05952535e0cb7cbfddd1dccfadd90326f657424664c8550b3db6a8b2939
-SHA512 (windows_i686_msvc-0.52.0.crate) = 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671
-Size (windows_i686_msvc-0.52.0.crate) = 888693 bytes
BLAKE2s (windows_x86_64_gnu-0.48.5.crate) = 1e1cc23e73fb0179c9e53370dbc38e1ae896b746fc7f45e7cd52155965def55b
SHA512 (windows_x86_64_gnu-0.48.5.crate) = 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
Size (windows_x86_64_gnu-0.48.5.crate) = 801619 bytes
-BLAKE2s (windows_x86_64_gnu-0.52.0.crate) = f107487f4ed09118102c706bea40a024784228975148d1c9307efd647674a075
-SHA512 (windows_x86_64_gnu-0.52.0.crate) = 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7
-Size (windows_x86_64_gnu-0.52.0.crate) = 826213 bytes
BLAKE2s (windows_x86_64_gnullvm-0.48.5.crate) = e8ba031348f0408a94e96bda80a1acd3863a77a2647c581c50180b19d074f326
SHA512 (windows_x86_64_gnullvm-0.48.5.crate) = c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
Size (windows_x86_64_gnullvm-0.48.5.crate) = 418486 bytes
-BLAKE2s (windows_x86_64_gnullvm-0.52.0.crate) = 61ce28034c9b364676e36961d44c21a589fd72e46cb06d9bc9c8b3843e865d45
-SHA512 (windows_x86_64_gnullvm-0.52.0.crate) = e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
-Size (windows_x86_64_gnullvm-0.52.0.crate) = 430165 bytes
BLAKE2s (windows_x86_64_msvc-0.48.5.crate) = 5ba69908b0a28c92202626d76822599bf1b8a8db6cddce66137b133bf1d75a4b
SHA512 (windows_x86_64_msvc-0.48.5.crate) = fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
Size (windows_x86_64_msvc-0.48.5.crate) = 798412 bytes
-BLAKE2s (windows_x86_64_msvc-0.52.0.crate) = 9d872bb0e5202fd2b745fd8cd1252c44600ec04c398d0199ef0b0d014b41cb81
-SHA512 (windows_x86_64_msvc-0.52.0.crate) = 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
-Size (windows_x86_64_msvc-0.52.0.crate) = 821600 bytes
BLAKE2s (winres-0.1.12.crate) = 6b1d1857d9cbe3d4d3e1e414860bcfb543b4344f91b55e4a98ef26dfa3cc76fd
SHA512 (winres-0.1.12.crate) = 9f61edafb4a262b56d130e48ac6bba94f5a432bf0a8c20243e6c8fa98c3f9e0d2ab00a77b35a2e49dd63585a272af597e236e089641b5f488760ac42d22f5a67
Size (winres-0.1.12.crate) = 19772 bytes
@@ -876,3 +852,5 @@ Size (zeroize_derive-1.4.2.crate) = 11141 bytes
BLAKE2s (zune-inflate-0.2.54.crate) = c10d8be1628f8a0b68a2d35a2cc3ab5ca45461685e4d61623f4ef14b872fcb04
SHA512 (zune-inflate-0.2.54.crate) = 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd
Size (zune-inflate-0.2.54.crate) = 37973 bytes
+SHA1 (patch-.._vendor_boringtun-0.6.0_src_sleepyinstant_unix.rs) = e55a79b73298c0eed7dcb5d04bb25dbe1e463bf6
+SHA1 (patch-.._vendor_smoltcp-0.10.0_src_phy_sys_bpf.rs) = 5d090396368272eb67f518b558cbcd6ed25e9033
diff --git a/py-mitmproxy_rs/patches/patch-.._vendor_boringtun-0.6.0_src_sleepyinstant_unix.rs b/py-mitmproxy_rs/patches/patch-.._vendor_boringtun-0.6.0_src_sleepyinstant_unix.rs
new file mode 100644
index 0000000000..58a6726a72
--- /dev/null
+++ b/py-mitmproxy_rs/patches/patch-.._vendor_boringtun-0.6.0_src_sleepyinstant_unix.rs
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Add support for NetBSD.
+
+XXX: likely incorrect, double-check!
+
+--- ../vendor/boringtun-0.6.0/src/sleepyinstant/unix.rs.orig 2024-01-01 23:15:11.332028854 +0000
++++ ../vendor/boringtun-0.6.0/src/sleepyinstant/unix.rs
+@@ -3,9 +3,9 @@ use std::time::Duration;
+ use nix::sys::time::TimeSpec;
+ use nix::time::{clock_gettime, ClockId};
+
+-#[cfg(any(target_os = "macos", target_os = "ios"))]
++#[cfg(any(target_os = "macos", target_os = "ios", target_os = "netbsd"))]
+ const CLOCK_ID: ClockId = ClockId::CLOCK_MONOTONIC;
+-#[cfg(not(any(target_os = "macos", target_os = "ios")))]
++#[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "netbsd")))]
+ const CLOCK_ID: ClockId = ClockId::CLOCK_BOOTTIME;
+
+ #[derive(Clone, Copy, Debug)]
diff --git a/py-mitmproxy_rs/patches/patch-.._vendor_smoltcp-0.10.0_src_phy_sys_bpf.rs b/py-mitmproxy_rs/patches/patch-.._vendor_smoltcp-0.10.0_src_phy_sys_bpf.rs
new file mode 100644
index 0000000000..8c2ccc4fb8
--- /dev/null
+++ b/py-mitmproxy_rs/patches/patch-.._vendor_smoltcp-0.10.0_src_phy_sys_bpf.rs
@@ -0,0 +1,47 @@
+$NetBSD$
+
+Add support for NetBSD.
+
+XXX: likely incorrect, double-check!
+
+--- ../vendor/smoltcp-0.10.0/src/phy/sys/bpf.rs.orig 2024-01-01 23:09:33.311396101 +0000
++++ ../vendor/smoltcp-0.10.0/src/phy/sys/bpf.rs
+@@ -9,24 +9,24 @@ use crate::phy::Medium;
+ use crate::wire::ETHERNET_HEADER_LEN;
+
+ /// set interface
+-#[cfg(any(target_os = "macos", target_os = "openbsd"))]
++#[cfg(any(target_os = "macos", target_os = "netbsd", target_os = "openbsd"))]
+ const BIOCSETIF: libc::c_ulong = 0x8020426c;
+ /// get buffer length
+-#[cfg(any(target_os = "macos", target_os = "openbsd"))]
++#[cfg(any(target_os = "macos", target_os = "netbsd", target_os = "openbsd"))]
+ const BIOCGBLEN: libc::c_ulong = 0x40044266;
+ /// set immediate/nonblocking read
+-#[cfg(any(target_os = "macos", target_os = "openbsd"))]
++#[cfg(any(target_os = "macos", target_os = "netbsd", target_os = "openbsd"))]
+ const BIOCIMMEDIATE: libc::c_ulong = 0x80044270;
+ /// set bpf_hdr struct size
+ #[cfg(target_os = "macos")]
+ const SIZEOF_BPF_HDR: usize = 18;
+ /// set bpf_hdr struct size
+-#[cfg(target_os = "openbsd")]
++#[cfg(any(target_os = "netbsd", target_os = "openbsd"))]
+ const SIZEOF_BPF_HDR: usize = 24;
+ /// The actual header length may be larger than the bpf_hdr struct due to aligning
+ /// see https://github.com/openbsd/src/blob/37ecb4d066e5566411cc16b362d3960c93b1d0be/sys/net/bpf.c#L1649
+ /// and https://github.com/apple/darwin-xnu/blob/8f02f2a044b9bb1ad951987ef5bab20ec9486310/bsd/net/bpf.c#L3580
+-#[cfg(any(target_os = "macos", target_os = "openbsd"))]
++#[cfg(any(target_os = "macos", target_os = "netbsd", target_os = "openbsd"))]
+ const BPF_HDRLEN: usize = (((SIZEOF_BPF_HDR + ETHERNET_HEADER_LEN) + mem::align_of::<u32>() - 1)
+ & !(mem::align_of::<u32>() - 1))
+ - ETHERNET_HEADER_LEN;
+@@ -170,7 +170,7 @@ mod test {
+ }
+
+ #[test]
+- #[cfg(target_os = "openbsd")]
++ #[cfgany((target_os = "netbsd", target_os = "openbsd"))]
+ fn test_aligned_bpf_hdr_len() {
+ assert_eq!(26, BPF_HDRLEN);
+ }
diff --git a/py-mitmproxy_rs/patches/patch-vendor_boringtun.xxx b/py-mitmproxy_rs/patches/patch-vendor_boringtun.xxx
deleted file mode 100644
index a6a887ab45..0000000000
--- a/py-mitmproxy_rs/patches/patch-vendor_boringtun.xxx
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- ./vendor/boringtun-0.6.0/src/sleepyinstant/unix.rs.orig 2024-01-01 23:15:11.332028854 +0000
-+++ ./vendor/boringtun-0.6.0/src/sleepyinstant/unix.rs
-@@ -3,9 +3,9 @@ use std::time::Duration;
- use nix::sys::time::TimeSpec;
- use nix::time::{clock_gettime, ClockId};
-
--#[cfg(any(target_os = "macos", target_os = "ios"))]
-+#[cfg(any(target_os = "macos", target_os = "ios", target_os = "netbsd"))]
- const CLOCK_ID: ClockId = ClockId::CLOCK_MONOTONIC;
--#[cfg(not(any(target_os = "macos", target_os = "ios")))]
-+#[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "netbsd")))]
- const CLOCK_ID: ClockId = ClockId::CLOCK_BOOTTIME;
-
- #[derive(Clone, Copy, Debug)]
diff --git a/py-mitmproxy_rs/patches/patch-vendor_smoltcp.xxx b/py-mitmproxy_rs/patches/patch-vendor_smoltcp.xxx
deleted file mode 100644
index 0bf8cbf7d0..0000000000
--- a/py-mitmproxy_rs/patches/patch-vendor_smoltcp.xxx
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
---- ./vendor/smoltcp-0.10.0/src/phy/sys/bpf.rs.orig 2024-01-01 23:09:33.311396101 +0000
-+++ ./vendor/smoltcp-0.10.0/src/phy/sys/bpf.rs
-@@ -9,24 +9,24 @@ use crate::phy::Medium;
- use crate::wire::ETHERNET_HEADER_LEN;
-
- /// set interface
--#[cfg(any(target_os = "macos", target_os = "openbsd"))]
-+#[cfg(any(target_os = "macos", target_os = "netbsd", target_os = "openbsd"))]
- const BIOCSETIF: libc::c_ulong = 0x8020426c;
- /// get buffer length
--#[cfg(any(target_os = "macos", target_os = "openbsd"))]
-+#[cfg(any(target_os = "macos", target_os = "netbsd", target_os = "openbsd"))]
- const BIOCGBLEN: libc::c_ulong = 0x40044266;
- /// set immediate/nonblocking read
--#[cfg(any(target_os = "macos", target_os = "openbsd"))]
-+#[cfg(any(target_os = "macos", target_os = "netbsd", target_os = "openbsd"))]
- const BIOCIMMEDIATE: libc::c_ulong = 0x80044270;
- /// set bpf_hdr struct size
- #[cfg(target_os = "macos")]
- const SIZEOF_BPF_HDR: usize = 18;
- /// set bpf_hdr struct size
--#[cfg(target_os = "openbsd")]
-+#[cfg(any(target_os = "netbsd", target_os = "openbsd"))]
- const SIZEOF_BPF_HDR: usize = 24;
- /// The actual header length may be larger than the bpf_hdr struct due to aligning
- /// see https://github.com/openbsd/src/blob/37ecb4d066e5566411cc16b362d3960c93b1d0be/sys/net/bpf.c#L1649
- /// and https://github.com/apple/darwin-xnu/blob/8f02f2a044b9bb1ad951987ef5bab20ec9486310/bsd/net/bpf.c#L3580
--#[cfg(any(target_os = "macos", target_os = "openbsd"))]
-+#[cfg(any(target_os = "macos", target_os = "netbsd", target_os = "openbsd"))]
- const BPF_HDRLEN: usize = (((SIZEOF_BPF_HDR + ETHERNET_HEADER_LEN) + mem::align_of::<u32>() - 1)
- & !(mem::align_of::<u32>() - 1))
- - ETHERNET_HEADER_LEN;
-@@ -170,7 +170,7 @@ mod test {
- }
-
- #[test]
-- #[cfg(target_os = "openbsd")]
-+ #[cfgany((target_os = "netbsd", target_os = "openbsd"))]
- fn test_aligned_bpf_hdr_len() {
- assert_eq!(26, BPF_HDRLEN);
- }
Home |
Main Index |
Thread Index |
Old Index