ports@,
Here an update of security/mitmproxy to 11.0.0.
Quite clean and allows to drop patch.
Tested on -curret/amd64
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/mitmproxy/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 5 Sep 2024 18:48:34 -0000 1.2
+++ Makefile 2 Oct 2024 21:22:19 -0000
@@ -1,7 +1,6 @@
COMMENT = interactive intercepting HTTP proxy
-MODPY_EGG_VERSION = 10.4.2
-REVISION = 0
+MODPY_EGG_VERSION = 11.0.0
DISTNAME = mitmproxy-${MODPY_EGG_VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/mitmproxy/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 25 Aug 2024 13:08:32 -0000 1.1.1.1
+++ distinfo 2 Oct 2024 21:22:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (mitmproxy-10.4.2.tar.gz) = 5ryHhLseIrEmHK+r+FSWzMsmac8EQU5Zk4RmZsf18+Y=
-SIZE (mitmproxy-10.4.2.tar.gz) = 1548656
+SHA256 (mitmproxy-11.0.0.tar.gz) = iACWP6BwAAhwBi9POMZLx4iRUf7WNv0JoSRG8GNG/hM=
+SIZE (mitmproxy-11.0.0.tar.gz) = 1559633
Index: patches/patch-mitmproxy_tools_main_py
===================================================================
RCS file: patches/patch-mitmproxy_tools_main_py
diff -N patches/patch-mitmproxy_tools_main_py
--- patches/patch-mitmproxy_tools_main_py 5 Sep 2024 18:48:34 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-https://github.com/mitmproxy/mitmproxy/pull/7130
-Index: mitmproxy/tools/main.py
---- mitmproxy/tools/main.py.orig
-+++ mitmproxy/tools/main.py
-@@ -116,10 +116,16 @@ def run(
- def _sigterm(*_):
- loop.call_soon_threadsafe(master.shutdown)
-
-- # We can't use loop.add_signal_handler because that's not available
on Windows' Proactorloop,
-- # but signal.signal just works fine for our purposes.
-- signal.signal(signal.SIGINT, _sigint)
-- signal.signal(signal.SIGTERM, _sigterm)
-+ try:
-+ # We use loop.add_signal_handler on supported platform to avoid
stuck on signal
-+ # See: https://github.com/mitmproxy/mitmproxy/issues/7128
-+ loop.add_signal_handler(signal.SIGINT, _sigint)
-+ loop.add_signal_handler(signal.SIGTERM, _sigterm)
-+ except NotImplementedError:
-+ # anyway, if platform hasn't got loop.add_signal_handler, use
signal.signal
-+ signal.signal(signal.SIGINT, _sigint)
-+ signal.signal(signal.SIGTERM, _sigterm)
-+
- # to fix the issue mentioned
https://github.com/mitmproxy/mitmproxy/issues/6744
- # by setting SIGPIPE to SIG_IGN, the process will not terminate and
continue to run
- if hasattr(signal, "SIGPIPE"):
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/mitmproxy/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 25 Aug 2024 13:08:34 -0000 1.1.1.1
+++ pkg/PLIST 2 Oct 2024 21:22:19 -0000
@@ -135,12 +135,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}stickyauth.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}stickycookie.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}stickycookie.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}strip_ech.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}strip_ech.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}strip_dns_https_records.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}strip_dns_https_records.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}termlog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}termlog.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}tlsconfig.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}tlsconfig.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}update_alt_svc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}update_alt_svc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}upstream_auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}upstream_auth.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/${MODPY_PYCACHE}view.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -201,9 +203,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/serverplayback.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/stickyauth.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/stickycookie.py
-lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/strip_ech.py
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/strip_dns_https_records.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/termlog.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/tlsconfig.py
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/update_alt_svc.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/upstream_auth.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/addons/view.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/certs.py
@@ -536,8 +539,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/${MODPY_PYCACHE}modes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/${MODPY_PYCACHE}modes.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/${MODPY_PYCACHE}quic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/${MODPY_PYCACHE}quic.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/${MODPY_PYCACHE}tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/${MODPY_PYCACHE}tcp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/${MODPY_PYCACHE}tls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -580,7 +581,29 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/http/_http_h3.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/http/_upstream_proxy.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/modes.py
-lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic.py
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}_client_hello_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}_client_hello_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}_commands.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}_commands.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}_events.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}_events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}_hooks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}_hooks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}_raw_layers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}_raw_layers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}_stream_layers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/${MODPY_PYCACHE}_stream_layers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/_client_hello_parser.py
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/_commands.py
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/_events.py
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/_hooks.py
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/_raw_layers.py
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/quic/_stream_layers.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/tcp.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/tls.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/proxy/layers/udp.py
@@ -743,6 +766,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/${MODPY_PYCACHE}master.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/${MODPY_PYCACHE}static_viewer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/${MODPY_PYCACHE}static_viewer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/${MODPY_PYCACHE}web_columns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/${MODPY_PYCACHE}web_columns.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/${MODPY_PYCACHE}webaddons.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/${MODPY_PYCACHE}webaddons.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/app.py
@@ -781,6 +806,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/static_viewer.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/templates/
lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/templates/index.html
+lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/web_columns.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/tools/web/webaddons.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/types.py
lib/python${MODPY_VERSION}/site-packages/mitmproxy/udp.py
--
wbr, Kirill
