mitmproxy: Update to 6.0.2

Changes:
15 December 2020: mitmproxy 6.0.2
=================================
* Fix reading of saved flows in mitmweb.

13 December 2020: mitmproxy 6.0.1
=================================
* Fix flow serialization in mitmweb.

13 December 2020: mitmproxy 6.0
===============================
* Mitmproxy now requires Python 3.8 or above.
* Deprecation of pathod and pathoc tools and modules. Future releases will not contain them! (@Kriechi)
* SSLKEYLOGFILE now supports TLS 1.3 secrets (@mhils)
* Fix query parameters in asgiapp addon (@jpstotz)
* Fix command history failing on file I/O errors (@Kriechi)
* Add example addon to suppress unwanted error messages sent by mitmproxy. (@anneborcherding)
* Updated imports and styles for web scanner helper addons. (@anneborcherding)
* Inform when underscore-formatted options are used in client arg. (@jrblixt)
* ASGIApp now ignores loaded HTTP flows from somewhere. (@linw1995)
* Binaries are now built with Python 3.9 (@mhils)
* Fixed the web UI showing blank page on clicking details tab when server address is missing (@samhita-sopho)
* Tests: Replace asynctest with stdlib mock (@felixonmars)
* MapLocal now keeps its configuration when other options are set. (@mhils)
* Host headers with non-standard ports are now properly updated in reverse proxy mode. (@mhils)
* Fix missing host header when replaying HTTP/2 flows (@Granitosaurus)

3 files changed, 30 insertions, 40 deletions

diff --git a/net/mitmproxy/Makefile b/net/mitmproxy/Makefile
index ae0d2a0fddf..3f057b4d935 100644
--- a/net/mitmproxy/Makefile
+++ b/net/mitmproxy/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2020/12/04 20:45:34 nia Exp $
+# $NetBSD: Makefile,v 1.33 2020/12/19 11:54:41 leot Exp $
 
-DISTNAME=	mitmproxy-5.3.0
-PKGREVISION=	1
+DISTNAME=	mitmproxy-6.0.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mitmproxy/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -11,14 +10,14 @@ HOMEPAGE=	https://mitmproxy.org/
 COMMENT=	Interactive console program for inspecting and editing traffic flows
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=19.1.0:../../security/py-OpenSSL
+DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=20.0:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-asgiref>=3.2.10:../../www/py-asgiref
 DEPENDS+=	${PYPKGPREFIX}-asn1>=0.3.1:../../security/py-asn1
 DEPENDS+=	${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker
 DEPENDS+=	${PYPKGPREFIX}-brotli>=1.0:../../archivers/py-brotli
 DEPENDS+=	${PYPKGPREFIX}-certifi>=2019.9.11:../../security/py-certifi
 DEPENDS+=	${PYPKGPREFIX}-click>=7.0:../../devel/py-click
-DEPENDS+=	${PYPKGPREFIX}-cryptography>=3.2:../../security/py-cryptography
+DEPENDS+=	${PYPKGPREFIX}-cryptography>=3.3:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-flask>=1.1.1:../../www/py-flask
 DEPENDS+=	${PYPKGPREFIX}-h2>=4.0:../../www/py-h2
 DEPENDS+=	${PYPKGPREFIX}-hyperframe>=6.0:../../www/py-hyperframe
@@ -26,15 +25,15 @@ DEPENDS+=	${PYPKGPREFIX}-kaitaistruct>=0.7:../../devel/py-kaitaistruct
 DEPENDS+=	${PYPKGPREFIX}-ldap3>=2.8:../../databases/py-ldap3
 DEPENDS+=	${PYPKGPREFIX}-msgpack>=1.0.0:../../devel/py-msgpack
 DEPENDS+=	${PYPKGPREFIX}-passlib>=1.6.5:../../security/py-passlib
-DEPENDS+=	${PYPKGPREFIX}-protobuf>=3.6.0:../../devel/py-protobuf
+DEPENDS+=	${PYPKGPREFIX}-protobuf>=3.14:../../devel/py-protobuf
 DEPENDS+=	${PYPKGPREFIX}-publicsuffix2>=2.20190812:../../www/py-publicsuffix2
 DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.4.2:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-pyperclip>=1.6.0:../../x11/py-pyperclip
 DEPENDS+=	${PYPKGPREFIX}-ruamel-yaml>=0.16:../../devel/py-ruamel-yaml
-DEPENDS+=	${PYPKGPREFIX}-sortedcontainers>=2.1.0:../../devel/py-sortedcontainers
+DEPENDS+=	${PYPKGPREFIX}-sortedcontainers>=2.3:../../devel/py-sortedcontainers
 DEPENDS+=	${PYPKGPREFIX}-tornado>=4.3.0:../../www/py-tornado
 DEPENDS+=	${PYPKGPREFIX}-urwid>=2.1.0:../../devel/py-urwid
-DEPENDS+=	${PYPKGPREFIX}-wsproto>=0.14.0:../../www/py-wsproto
+DEPENDS+=	${PYPKGPREFIX}-wsproto>=1.0:../../www/py-wsproto
 DEPENDS+=	${PYPKGPREFIX}-zstandard>=0.11.0:../../archivers/py-zstandard
 
 SUBST_CLASSES+=			setuppyversions
@@ -48,8 +47,8 @@ REPLACE_SH+=	mitmproxy/contrib/kaitaistruct/make.sh
 
 USE_LANGUAGES=			# none
 
-# Only for Python 3.x
-PYTHON_VERSIONS_INCOMPATIBLE=	27
+# Only for Python >=3.8
+PYTHON_VERSIONS_INCOMPATIBLE=	27 36 37
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/net/mitmproxy/PLIST b/net/mitmproxy/PLIST
index 6524e5ba648..0d75d6eeffe 100644
--- a/net/mitmproxy/PLIST
+++ b/net/mitmproxy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2020/11/24 17:06:50 leot Exp $
+@comment $NetBSD: PLIST,v 1.17 2020/12/19 11:54:42 leot Exp $
 bin/mitmdump
 bin/mitmproxy
 bin/mitmweb
@@ -351,15 +351,9 @@ ${PYSITELIB}/mitmproxy/net/http/http1/assemble.pyo
 ${PYSITELIB}/mitmproxy/net/http/http1/read.py
 ${PYSITELIB}/mitmproxy/net/http/http1/read.pyc
 ${PYSITELIB}/mitmproxy/net/http/http1/read.pyo
-${PYSITELIB}/mitmproxy/net/http/http2/__init__.py
-${PYSITELIB}/mitmproxy/net/http/http2/__init__.pyc
-${PYSITELIB}/mitmproxy/net/http/http2/__init__.pyo
-${PYSITELIB}/mitmproxy/net/http/http2/framereader.py
-${PYSITELIB}/mitmproxy/net/http/http2/framereader.pyc
-${PYSITELIB}/mitmproxy/net/http/http2/framereader.pyo
-${PYSITELIB}/mitmproxy/net/http/http2/utils.py
-${PYSITELIB}/mitmproxy/net/http/http2/utils.pyc
-${PYSITELIB}/mitmproxy/net/http/http2/utils.pyo
+${PYSITELIB}/mitmproxy/net/http/http2.py
+${PYSITELIB}/mitmproxy/net/http/http2.pyc
+${PYSITELIB}/mitmproxy/net/http/http2.pyo
 ${PYSITELIB}/mitmproxy/net/http/message.py
 ${PYSITELIB}/mitmproxy/net/http/message.pyc
 ${PYSITELIB}/mitmproxy/net/http/message.pyo
@@ -393,18 +387,9 @@ ${PYSITELIB}/mitmproxy/net/tcp.pyo
 ${PYSITELIB}/mitmproxy/net/tls.py
 ${PYSITELIB}/mitmproxy/net/tls.pyc
 ${PYSITELIB}/mitmproxy/net/tls.pyo
-${PYSITELIB}/mitmproxy/net/websockets/__init__.py
-${PYSITELIB}/mitmproxy/net/websockets/__init__.pyc
-${PYSITELIB}/mitmproxy/net/websockets/__init__.pyo
-${PYSITELIB}/mitmproxy/net/websockets/frame.py
-${PYSITELIB}/mitmproxy/net/websockets/frame.pyc
-${PYSITELIB}/mitmproxy/net/websockets/frame.pyo
-${PYSITELIB}/mitmproxy/net/websockets/masker.py
-${PYSITELIB}/mitmproxy/net/websockets/masker.pyc
-${PYSITELIB}/mitmproxy/net/websockets/masker.pyo
-${PYSITELIB}/mitmproxy/net/websockets/utils.py
-${PYSITELIB}/mitmproxy/net/websockets/utils.pyc
-${PYSITELIB}/mitmproxy/net/websockets/utils.pyo
+${PYSITELIB}/mitmproxy/net/websocket.py
+${PYSITELIB}/mitmproxy/net/websocket.pyc
+${PYSITELIB}/mitmproxy/net/websocket.pyo
 ${PYSITELIB}/mitmproxy/options.py
 ${PYSITELIB}/mitmproxy/options.pyc
 ${PYSITELIB}/mitmproxy/options.pyo
@@ -505,9 +490,6 @@ ${PYSITELIB}/mitmproxy/test/tutils.pyo
 ${PYSITELIB}/mitmproxy/tools/__init__.py
 ${PYSITELIB}/mitmproxy/tools/__init__.pyc
 ${PYSITELIB}/mitmproxy/tools/__init__.pyo
-${PYSITELIB}/mitmproxy/tools/_main.py
-${PYSITELIB}/mitmproxy/tools/_main.pyc
-${PYSITELIB}/mitmproxy/tools/_main.pyo
 ${PYSITELIB}/mitmproxy/tools/cmdline.py
 ${PYSITELIB}/mitmproxy/tools/cmdline.pyc
 ${PYSITELIB}/mitmproxy/tools/cmdline.pyo
@@ -659,9 +641,15 @@ ${PYSITELIB}/mitmproxy/utils/__init__.pyo
 ${PYSITELIB}/mitmproxy/utils/arg_check.py
 ${PYSITELIB}/mitmproxy/utils/arg_check.pyc
 ${PYSITELIB}/mitmproxy/utils/arg_check.pyo
+${PYSITELIB}/mitmproxy/utils/asyncio_utils.py
+${PYSITELIB}/mitmproxy/utils/asyncio_utils.pyc
+${PYSITELIB}/mitmproxy/utils/asyncio_utils.pyo
 ${PYSITELIB}/mitmproxy/utils/bits.py
 ${PYSITELIB}/mitmproxy/utils/bits.pyc
 ${PYSITELIB}/mitmproxy/utils/bits.pyo
+${PYSITELIB}/mitmproxy/utils/compat.py
+${PYSITELIB}/mitmproxy/utils/compat.pyc
+${PYSITELIB}/mitmproxy/utils/compat.pyo
 ${PYSITELIB}/mitmproxy/utils/data.py
 ${PYSITELIB}/mitmproxy/utils/data.pyc
 ${PYSITELIB}/mitmproxy/utils/data.pyo
@@ -719,6 +707,9 @@ ${PYSITELIB}/pathod/language/message.pyo
 ${PYSITELIB}/pathod/language/websockets.py
 ${PYSITELIB}/pathod/language/websockets.pyc
 ${PYSITELIB}/pathod/language/websockets.pyo
+${PYSITELIB}/pathod/language/websockets_frame.py
+${PYSITELIB}/pathod/language/websockets_frame.pyc
+${PYSITELIB}/pathod/language/websockets_frame.pyo
 ${PYSITELIB}/pathod/language/writer.py
 ${PYSITELIB}/pathod/language/writer.pyc
 ${PYSITELIB}/pathod/language/writer.pyo
diff --git a/net/mitmproxy/distinfo b/net/mitmproxy/distinfo
index cd51734f4a2..d2f64de52b2 100644
--- a/net/mitmproxy/distinfo
+++ b/net/mitmproxy/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.22 2020/11/24 17:06:50 leot Exp $
+$NetBSD: distinfo,v 1.23 2020/12/19 11:54:42 leot Exp $
 
-SHA1 (mitmproxy-5.3.0.tar.gz) = 383f56f0acd8d5cd92a2c442363d7ac29aaf865b
-RMD160 (mitmproxy-5.3.0.tar.gz) = b22745c42323c0832db92511a0b8105a24cc965f
-SHA512 (mitmproxy-5.3.0.tar.gz) = 3f52f5285869de49c7c04ef9b6c0f3ef66689eb45fb6f9e971111049bf1aa0777e3e84b51f7031c1bdf105ce3f17fa4b03036d72617985b92996c6eea7566c38
-Size (mitmproxy-5.3.0.tar.gz) = 27272534 bytes
+SHA1 (mitmproxy-6.0.2.tar.gz) = 5f7b9a79228569eedfc4b15ff48207c841c9082b
+RMD160 (mitmproxy-6.0.2.tar.gz) = cfcc6008453cab266d2bcb614915b6d398039770
+SHA512 (mitmproxy-6.0.2.tar.gz) = 27eb5e9736891148b5ebec963a2d18de6a69b44428538d2ed1cf9a1dcdd7cbcdeeed662edb2d25521098374e2f9a29b5bb8fba8da4f77ac0d32bf7881ac70d61
+Size (mitmproxy-6.0.2.tar.gz) = 27274682 bytes