mitmproxy: Update to 7.0.0

Changes:
## 16 July 2021: mitmproxy 7.0.0

### New Proxy Core (@mhils, [blog post](https://www.mitmproxy.org/posts/releases/mitmproxy7/))

Mitmproxy has a completely new proxy core, fixing many longstanding issues:

* **Secure Web Proxy:** Mitmproxy now supports TLS-over-TLS to already
  encrypt the connection to the proxy.
* **Server-Side Greetings:** Mitmproxy now supports proxying raw TCP
  connections, including ones that start with a server-side greeting (e.g. SMTP).
* **HTTP/1 – HTTP/2 Interoperability:** mitmproxy can now accept an
  HTTP/2 connection from the client, and forward it to an HTTP/1 server.
* **HTTP/2 Redirects:** The request destination can now be changed on
  HTTP/2 flows.
* **Connection Strategy:** Users can now specify if they want mitmproxy
  to eagerly connect upstream or wait as long as possible. Eager
  connections are required to detect protocols with server-side
  greetings, lazy connections enable the replay of responses without
  connecting to an upstream server.
* **Timeout Handling:** Mitmproxy will now clean up idle connections
  and also abort requests if the client disconnects in the meantime.
* **Host Header-based Proxying:** If the request destination is
  unknown, mitmproxy now falls back to proxying based on the Host
  header. This means that requests can often be redirected to mitmproxy
  using DNS spoofing only.
* **Internals:** All protocol logic is now separated from I/O
  (["sans-io"](https://sans-io.readthedocs.io/)).
  This greatly improves testing capabilities, prevents a wide array of
  race conditions, and increases proper isolation between layers.


### Additional Changes

* mitmproxy's command line interface now supports Windows (@mhils)

* The `clientconnect`, `clientdisconnect`, `serverconnect`,
  `serverdisconnect`, and `log` events have been replaced with new
  events, see addon documentation for details (@mhils)

* Contentviews now implement `render_priority` instead of
  `should_render`, allowing more specialization (@mhils)
* Addition of block_list option to block requests with a set status
  code (@ericbeland)
* Make mitmweb columns configurable and customizable (@gorogoroumaru)
* Automatic JSON view mode when `+json` suffix in content type (@kam800)
* Use pyca/cryptography to generate certificates, not pyOpenSSL (@mhils)
* Remove the legacy protocol stack (@Kriechi)
* Remove all deprecated pathod and pathoc tools and modules (@Kriechi)
* In reverse proxy mode, mitmproxy now does not assume TLS if no scheme
  is given but a custom port is provided (@mhils)
* Remove the following options: `http2_priority`,
  `relax_http_form_validation`, `upstream_bind_address`,
  `spoof_source_address`, and `stream_websockets`. If you depended on
  one of them please let us know.  mitmproxy never phones home, which
  means we don't know how prominently these options were used. (@mhils)
* Fix IDNA host 'Bad HTTP request line' error (@grahamrobbins)
* Pressing `?` now exits console help view (@abitrolly)
* `--modify-headers` now works correctly when modifying a header that
  is also part of the filter expression (@Prinzhorn)
* Fix SNI-related reproducibility issues when exporting to curl/httpie
  commands. (@dkasak)
* Add option `export_preserve_original_ip` to force exported command to
  connect to IP from original request.
  Only supports curl at the moment. (@dkasak)
* Major proxy protocol testing (@r00t-)
* Switch Docker image release to be based on Debian (@PeterDaveHello)
* Multiple Browsers: The `browser.start` command may be executed more
  than once to start additional browser sessions. (@rbdixon)
* Improve readability of SHA256 fingerprint. (@wrekone)
* Metadata and Replay Flow Filters: Flows may be filtered based on
  metadata and replay status. (@rbdixon)
* Flow control: don't read connection data faster than it can be
  forwarded. (@hazcod)
* Docker images for ARM64 architecture (@hazcod, @mhils)
* Fix parsing of certificate issuer/subject with escaped special
  characters (@Prinzhorn)
* Customize markers with emoji, and filters: The `flow.mark` command
  may be used to mark a flow with either the default "red ball" marker,
  a single character, or an emoji like `:grapes:`.  Use the `~marker`
  filter to filter on marker characters. (@rbdixon)
* New `flow.comment` command to add a comment to the flow. Add
  `~comment <regex>` filter syntax to search flow comments. (@rbdixon)
* Fix multipart forms losing `boundary` values on edit. (@roytu)
* `Transfer-Encoding: chunked` HTTP message bodies are now retained if
  they are below the stream_large_bodies limit. (@mhils)
* `json()` method for HTTP Request and Response instances will return
  decoded JSON body. (@rbdixon)
* Support for HTTP/2 Push Promises has been dropped. (@mhils)
* Make it possible to set sequence options from the command line. (@Yopi)

3 files changed, 111 insertions, 180 deletions

diff --git a/net/mitmproxy/Makefile b/net/mitmproxy/Makefile
index e4d5e2540ee..08fb9ddb405 100644
--- a/net/mitmproxy/Makefile
+++ b/net/mitmproxy/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2021/02/26 08:47:03 leot Exp $
+# $NetBSD: Makefile,v 1.35 2021/07/17 14:14:47 leot Exp $
 
-DISTNAME=	mitmproxy-6.0.2
-PKGREVISION=	1
+DISTNAME=	mitmproxy-7.0.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mitmproxy/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -13,7 +12,6 @@ LICENSE=	mit
 
 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
@@ -34,7 +32,7 @@ DEPENDS+=	${PYPKGPREFIX}-ruamel-yaml>=0.16:../../devel/py-ruamel-yaml
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 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}-urwid>=2.1.1:../../devel/py-urwid
 DEPENDS+=	${PYPKGPREFIX}-wsproto>=1.0:../../www/py-wsproto
 DEPENDS+=	${PYPKGPREFIX}-zstandard>=0.11.0:../../archivers/py-zstandard
 
diff --git a/net/mitmproxy/PLIST b/net/mitmproxy/PLIST
index 0d75d6eeffe..746ea20b0f5 100644
--- a/net/mitmproxy/PLIST
+++ b/net/mitmproxy/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.17 2020/12/19 11:54:42 leot Exp $
+@comment $NetBSD: PLIST,v 1.18 2021/07/17 14:14:47 leot Exp $
 bin/mitmdump
 bin/mitmproxy
 bin/mitmweb
-bin/pathoc
-bin/pathod
 ${PYSITELIB}/${EGG_FILE}/PKG-INFO
 ${PYSITELIB}/${EGG_FILE}/SOURCES.txt
 ${PYSITELIB}/${EGG_FILE}/dependency_links.txt
@@ -31,18 +29,21 @@ ${PYSITELIB}/mitmproxy/addons/asgiapp.pyo
 ${PYSITELIB}/mitmproxy/addons/block.py
 ${PYSITELIB}/mitmproxy/addons/block.pyc
 ${PYSITELIB}/mitmproxy/addons/block.pyo
+${PYSITELIB}/mitmproxy/addons/blocklist.py
+${PYSITELIB}/mitmproxy/addons/blocklist.pyc
+${PYSITELIB}/mitmproxy/addons/blocklist.pyo
 ${PYSITELIB}/mitmproxy/addons/browser.py
 ${PYSITELIB}/mitmproxy/addons/browser.pyc
 ${PYSITELIB}/mitmproxy/addons/browser.pyo
-${PYSITELIB}/mitmproxy/addons/check_ca.py
-${PYSITELIB}/mitmproxy/addons/check_ca.pyc
-${PYSITELIB}/mitmproxy/addons/check_ca.pyo
 ${PYSITELIB}/mitmproxy/addons/clientplayback.py
 ${PYSITELIB}/mitmproxy/addons/clientplayback.pyc
 ${PYSITELIB}/mitmproxy/addons/clientplayback.pyo
 ${PYSITELIB}/mitmproxy/addons/command_history.py
 ${PYSITELIB}/mitmproxy/addons/command_history.pyc
 ${PYSITELIB}/mitmproxy/addons/command_history.pyo
+${PYSITELIB}/mitmproxy/addons/comment.py
+${PYSITELIB}/mitmproxy/addons/comment.pyc
+${PYSITELIB}/mitmproxy/addons/comment.pyo
 ${PYSITELIB}/mitmproxy/addons/core.py
 ${PYSITELIB}/mitmproxy/addons/core.pyc
 ${PYSITELIB}/mitmproxy/addons/core.pyo
@@ -79,6 +80,9 @@ ${PYSITELIB}/mitmproxy/addons/modifybody.pyo
 ${PYSITELIB}/mitmproxy/addons/modifyheaders.py
 ${PYSITELIB}/mitmproxy/addons/modifyheaders.pyc
 ${PYSITELIB}/mitmproxy/addons/modifyheaders.pyo
+${PYSITELIB}/mitmproxy/addons/next_layer.py
+${PYSITELIB}/mitmproxy/addons/next_layer.pyc
+${PYSITELIB}/mitmproxy/addons/next_layer.pyo
 ${PYSITELIB}/mitmproxy/addons/onboarding.py
 ${PYSITELIB}/mitmproxy/addons/onboarding.pyc
 ${PYSITELIB}/mitmproxy/addons/onboarding.pyo
@@ -100,6 +104,9 @@ ${PYSITELIB}/mitmproxy/addons/onboardingapp/templates/layout.html
 ${PYSITELIB}/mitmproxy/addons/proxyauth.py
 ${PYSITELIB}/mitmproxy/addons/proxyauth.pyc
 ${PYSITELIB}/mitmproxy/addons/proxyauth.pyo
+${PYSITELIB}/mitmproxy/addons/proxyserver.py
+${PYSITELIB}/mitmproxy/addons/proxyserver.pyc
+${PYSITELIB}/mitmproxy/addons/proxyserver.pyo
 ${PYSITELIB}/mitmproxy/addons/readfile.py
 ${PYSITELIB}/mitmproxy/addons/readfile.pyc
 ${PYSITELIB}/mitmproxy/addons/readfile.pyo
@@ -112,24 +119,18 @@ ${PYSITELIB}/mitmproxy/addons/script.pyo
 ${PYSITELIB}/mitmproxy/addons/serverplayback.py
 ${PYSITELIB}/mitmproxy/addons/serverplayback.pyc
 ${PYSITELIB}/mitmproxy/addons/serverplayback.pyo
-${PYSITELIB}/mitmproxy/addons/session.py
-${PYSITELIB}/mitmproxy/addons/session.pyc
-${PYSITELIB}/mitmproxy/addons/session.pyo
 ${PYSITELIB}/mitmproxy/addons/stickyauth.py
 ${PYSITELIB}/mitmproxy/addons/stickyauth.pyc
 ${PYSITELIB}/mitmproxy/addons/stickyauth.pyo
 ${PYSITELIB}/mitmproxy/addons/stickycookie.py
 ${PYSITELIB}/mitmproxy/addons/stickycookie.pyc
 ${PYSITELIB}/mitmproxy/addons/stickycookie.pyo
-${PYSITELIB}/mitmproxy/addons/streambodies.py
-${PYSITELIB}/mitmproxy/addons/streambodies.pyc
-${PYSITELIB}/mitmproxy/addons/streambodies.pyo
 ${PYSITELIB}/mitmproxy/addons/termlog.py
 ${PYSITELIB}/mitmproxy/addons/termlog.pyc
 ${PYSITELIB}/mitmproxy/addons/termlog.pyo
-${PYSITELIB}/mitmproxy/addons/termstatus.py
-${PYSITELIB}/mitmproxy/addons/termstatus.pyc
-${PYSITELIB}/mitmproxy/addons/termstatus.pyo
+${PYSITELIB}/mitmproxy/addons/tlsconfig.py
+${PYSITELIB}/mitmproxy/addons/tlsconfig.pyc
+${PYSITELIB}/mitmproxy/addons/tlsconfig.pyo
 ${PYSITELIB}/mitmproxy/addons/upstream_auth.py
 ${PYSITELIB}/mitmproxy/addons/upstream_auth.pyc
 ${PYSITELIB}/mitmproxy/addons/upstream_auth.pyo
@@ -145,9 +146,9 @@ ${PYSITELIB}/mitmproxy/command.pyo
 ${PYSITELIB}/mitmproxy/command_lexer.py
 ${PYSITELIB}/mitmproxy/command_lexer.pyc
 ${PYSITELIB}/mitmproxy/command_lexer.pyo
-${PYSITELIB}/mitmproxy/connections.py
-${PYSITELIB}/mitmproxy/connections.pyc
-${PYSITELIB}/mitmproxy/connections.pyo
+${PYSITELIB}/mitmproxy/connection.py
+${PYSITELIB}/mitmproxy/connection.pyc
+${PYSITELIB}/mitmproxy/connection.pyo
 ${PYSITELIB}/mitmproxy/contentviews/__init__.py
 ${PYSITELIB}/mitmproxy/contentviews/__init__.pyc
 ${PYSITELIB}/mitmproxy/contentviews/__init__.pyo
@@ -160,6 +161,9 @@ ${PYSITELIB}/mitmproxy/contentviews/base.pyo
 ${PYSITELIB}/mitmproxy/contentviews/css.py
 ${PYSITELIB}/mitmproxy/contentviews/css.pyc
 ${PYSITELIB}/mitmproxy/contentviews/css.pyo
+${PYSITELIB}/mitmproxy/contentviews/graphql.py
+${PYSITELIB}/mitmproxy/contentviews/graphql.pyc
+${PYSITELIB}/mitmproxy/contentviews/graphql.pyo
 ${PYSITELIB}/mitmproxy/contentviews/hex.py
 ${PYSITELIB}/mitmproxy/contentviews/hex.pyc
 ${PYSITELIB}/mitmproxy/contentviews/hex.pyo
@@ -206,6 +210,9 @@ ${PYSITELIB}/mitmproxy/contrib/README
 ${PYSITELIB}/mitmproxy/contrib/__init__.py
 ${PYSITELIB}/mitmproxy/contrib/__init__.pyc
 ${PYSITELIB}/mitmproxy/contrib/__init__.pyo
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/__init__.py
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/__init__.pyc
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/__init__.pyo
 ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif.py
 ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif.pyc
 ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif.pyo
@@ -238,6 +245,15 @@ ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/tls_client_hello.pyo
 ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/vlq_base128_le.py
 ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/vlq_base128_le.pyc
 ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/vlq_base128_le.pyo
+${PYSITELIB}/mitmproxy/contrib/urwid/__init__.py
+${PYSITELIB}/mitmproxy/contrib/urwid/__init__.pyc
+${PYSITELIB}/mitmproxy/contrib/urwid/__init__.pyo
+${PYSITELIB}/mitmproxy/contrib/urwid/raw_display.py
+${PYSITELIB}/mitmproxy/contrib/urwid/raw_display.pyc
+${PYSITELIB}/mitmproxy/contrib/urwid/raw_display.pyo
+${PYSITELIB}/mitmproxy/contrib/urwid/win32.py
+${PYSITELIB}/mitmproxy/contrib/urwid/win32.pyc
+${PYSITELIB}/mitmproxy/contrib/urwid/win32.pyo
 ${PYSITELIB}/mitmproxy/contrib/wbxml/ASCommandResponse.py
 ${PYSITELIB}/mitmproxy/contrib/wbxml/ASCommandResponse.pyc
 ${PYSITELIB}/mitmproxy/contrib/wbxml/ASCommandResponse.pyo
@@ -292,6 +308,9 @@ ${PYSITELIB}/mitmproxy/flow.pyo
 ${PYSITELIB}/mitmproxy/flowfilter.py
 ${PYSITELIB}/mitmproxy/flowfilter.pyc
 ${PYSITELIB}/mitmproxy/flowfilter.pyo
+${PYSITELIB}/mitmproxy/hooks.py
+${PYSITELIB}/mitmproxy/hooks.pyc
+${PYSITELIB}/mitmproxy/hooks.pyo
 ${PYSITELIB}/mitmproxy/http.py
 ${PYSITELIB}/mitmproxy/http.pyc
 ${PYSITELIB}/mitmproxy/http.pyo
@@ -301,20 +320,9 @@ ${PYSITELIB}/mitmproxy/io/__init__.pyo
 ${PYSITELIB}/mitmproxy/io/compat.py
 ${PYSITELIB}/mitmproxy/io/compat.pyc
 ${PYSITELIB}/mitmproxy/io/compat.pyo
-${PYSITELIB}/mitmproxy/io/db.py
-${PYSITELIB}/mitmproxy/io/db.pyc
-${PYSITELIB}/mitmproxy/io/db.pyo
 ${PYSITELIB}/mitmproxy/io/io.py
 ${PYSITELIB}/mitmproxy/io/io.pyc
 ${PYSITELIB}/mitmproxy/io/io.pyo
-${PYSITELIB}/mitmproxy/io/proto/http.proto
-${PYSITELIB}/mitmproxy/io/proto/http_pb2.py
-${PYSITELIB}/mitmproxy/io/proto/http_pb2.pyc
-${PYSITELIB}/mitmproxy/io/proto/http_pb2.pyo
-${PYSITELIB}/mitmproxy/io/protobuf.py
-${PYSITELIB}/mitmproxy/io/protobuf.pyc
-${PYSITELIB}/mitmproxy/io/protobuf.pyo
-${PYSITELIB}/mitmproxy/io/sql/session_create.sql
 ${PYSITELIB}/mitmproxy/io/tnetstring.py
 ${PYSITELIB}/mitmproxy/io/tnetstring.pyc
 ${PYSITELIB}/mitmproxy/io/tnetstring.pyo
@@ -330,15 +338,15 @@ ${PYSITELIB}/mitmproxy/net/__init__.pyo
 ${PYSITELIB}/mitmproxy/net/check.py
 ${PYSITELIB}/mitmproxy/net/check.pyc
 ${PYSITELIB}/mitmproxy/net/check.pyo
+${PYSITELIB}/mitmproxy/net/encoding.py
+${PYSITELIB}/mitmproxy/net/encoding.pyc
+${PYSITELIB}/mitmproxy/net/encoding.pyo
 ${PYSITELIB}/mitmproxy/net/http/__init__.py
 ${PYSITELIB}/mitmproxy/net/http/__init__.pyc
 ${PYSITELIB}/mitmproxy/net/http/__init__.pyo
 ${PYSITELIB}/mitmproxy/net/http/cookies.py
 ${PYSITELIB}/mitmproxy/net/http/cookies.pyc
 ${PYSITELIB}/mitmproxy/net/http/cookies.pyo
-${PYSITELIB}/mitmproxy/net/http/encoding.py
-${PYSITELIB}/mitmproxy/net/http/encoding.pyc
-${PYSITELIB}/mitmproxy/net/http/encoding.pyo
 ${PYSITELIB}/mitmproxy/net/http/headers.py
 ${PYSITELIB}/mitmproxy/net/http/headers.pyc
 ${PYSITELIB}/mitmproxy/net/http/headers.pyo
@@ -351,21 +359,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.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
 ${PYSITELIB}/mitmproxy/net/http/multipart.py
 ${PYSITELIB}/mitmproxy/net/http/multipart.pyc
 ${PYSITELIB}/mitmproxy/net/http/multipart.pyo
-${PYSITELIB}/mitmproxy/net/http/request.py
-${PYSITELIB}/mitmproxy/net/http/request.pyc
-${PYSITELIB}/mitmproxy/net/http/request.pyo
-${PYSITELIB}/mitmproxy/net/http/response.py
-${PYSITELIB}/mitmproxy/net/http/response.pyc
-${PYSITELIB}/mitmproxy/net/http/response.pyo
 ${PYSITELIB}/mitmproxy/net/http/status_codes.py
 ${PYSITELIB}/mitmproxy/net/http/status_codes.pyc
 ${PYSITELIB}/mitmproxy/net/http/status_codes.pyo
@@ -378,18 +374,9 @@ ${PYSITELIB}/mitmproxy/net/http/user_agents.pyo
 ${PYSITELIB}/mitmproxy/net/server_spec.py
 ${PYSITELIB}/mitmproxy/net/server_spec.pyc
 ${PYSITELIB}/mitmproxy/net/server_spec.pyo
-${PYSITELIB}/mitmproxy/net/socks.py
-${PYSITELIB}/mitmproxy/net/socks.pyc
-${PYSITELIB}/mitmproxy/net/socks.pyo
-${PYSITELIB}/mitmproxy/net/tcp.py
-${PYSITELIB}/mitmproxy/net/tcp.pyc
-${PYSITELIB}/mitmproxy/net/tcp.pyo
 ${PYSITELIB}/mitmproxy/net/tls.py
 ${PYSITELIB}/mitmproxy/net/tls.pyc
 ${PYSITELIB}/mitmproxy/net/tls.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
@@ -417,54 +404,69 @@ ${PYSITELIB}/mitmproxy/platform/windows.pyo
 ${PYSITELIB}/mitmproxy/proxy/__init__.py
 ${PYSITELIB}/mitmproxy/proxy/__init__.pyc
 ${PYSITELIB}/mitmproxy/proxy/__init__.pyo
-${PYSITELIB}/mitmproxy/proxy/config.py
-${PYSITELIB}/mitmproxy/proxy/config.pyc
-${PYSITELIB}/mitmproxy/proxy/config.pyo
-${PYSITELIB}/mitmproxy/proxy/modes/__init__.py
-${PYSITELIB}/mitmproxy/proxy/modes/__init__.pyc
-${PYSITELIB}/mitmproxy/proxy/modes/__init__.pyo
-${PYSITELIB}/mitmproxy/proxy/modes/http_proxy.py
-${PYSITELIB}/mitmproxy/proxy/modes/http_proxy.pyc
-${PYSITELIB}/mitmproxy/proxy/modes/http_proxy.pyo
-${PYSITELIB}/mitmproxy/proxy/modes/reverse_proxy.py
-${PYSITELIB}/mitmproxy/proxy/modes/reverse_proxy.pyc
-${PYSITELIB}/mitmproxy/proxy/modes/reverse_proxy.pyo
-${PYSITELIB}/mitmproxy/proxy/modes/socks_proxy.py
-${PYSITELIB}/mitmproxy/proxy/modes/socks_proxy.pyc
-${PYSITELIB}/mitmproxy/proxy/modes/socks_proxy.pyo
-${PYSITELIB}/mitmproxy/proxy/modes/transparent_proxy.py
-${PYSITELIB}/mitmproxy/proxy/modes/transparent_proxy.pyc
-${PYSITELIB}/mitmproxy/proxy/modes/transparent_proxy.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/__init__.py
-${PYSITELIB}/mitmproxy/proxy/protocol/__init__.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/__init__.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/base.py
-${PYSITELIB}/mitmproxy/proxy/protocol/base.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/base.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/http.py
-${PYSITELIB}/mitmproxy/proxy/protocol/http.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/http.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/http1.py
-${PYSITELIB}/mitmproxy/proxy/protocol/http1.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/http1.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/http2.py
-${PYSITELIB}/mitmproxy/proxy/protocol/http2.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/http2.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/rawtcp.py
-${PYSITELIB}/mitmproxy/proxy/protocol/rawtcp.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/rawtcp.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/tls.py
-${PYSITELIB}/mitmproxy/proxy/protocol/tls.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/tls.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/websocket.py
-${PYSITELIB}/mitmproxy/proxy/protocol/websocket.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/websocket.pyo
-${PYSITELIB}/mitmproxy/proxy/root_context.py
-${PYSITELIB}/mitmproxy/proxy/root_context.pyc
-${PYSITELIB}/mitmproxy/proxy/root_context.pyo
+${PYSITELIB}/mitmproxy/proxy/commands.py
+${PYSITELIB}/mitmproxy/proxy/commands.pyc
+${PYSITELIB}/mitmproxy/proxy/commands.pyo
+${PYSITELIB}/mitmproxy/proxy/context.py
+${PYSITELIB}/mitmproxy/proxy/context.pyc
+${PYSITELIB}/mitmproxy/proxy/context.pyo
+${PYSITELIB}/mitmproxy/proxy/events.py
+${PYSITELIB}/mitmproxy/proxy/events.pyc
+${PYSITELIB}/mitmproxy/proxy/events.pyo
+${PYSITELIB}/mitmproxy/proxy/layer.py
+${PYSITELIB}/mitmproxy/proxy/layer.pyc
+${PYSITELIB}/mitmproxy/proxy/layer.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/__init__.py
+${PYSITELIB}/mitmproxy/proxy/layers/__init__.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/__init__.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/http/__init__.py
+${PYSITELIB}/mitmproxy/proxy/layers/http/__init__.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/http/__init__.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/http/_base.py
+${PYSITELIB}/mitmproxy/proxy/layers/http/_base.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/http/_base.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/http/_events.py
+${PYSITELIB}/mitmproxy/proxy/layers/http/_events.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/http/_events.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/http/_hooks.py
+${PYSITELIB}/mitmproxy/proxy/layers/http/_hooks.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/http/_hooks.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/http/_http1.py
+${PYSITELIB}/mitmproxy/proxy/layers/http/_http1.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/http/_http1.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/http/_http2.py
+${PYSITELIB}/mitmproxy/proxy/layers/http/_http2.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/http/_http2.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/http/_http_h2.py
+${PYSITELIB}/mitmproxy/proxy/layers/http/_http_h2.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/http/_http_h2.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/http/_upstream_proxy.py
+${PYSITELIB}/mitmproxy/proxy/layers/http/_upstream_proxy.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/http/_upstream_proxy.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/modes.py
+${PYSITELIB}/mitmproxy/proxy/layers/modes.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/modes.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/tcp.py
+${PYSITELIB}/mitmproxy/proxy/layers/tcp.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/tcp.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/tls.py
+${PYSITELIB}/mitmproxy/proxy/layers/tls.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/tls.pyo
+${PYSITELIB}/mitmproxy/proxy/layers/websocket.py
+${PYSITELIB}/mitmproxy/proxy/layers/websocket.pyc
+${PYSITELIB}/mitmproxy/proxy/layers/websocket.pyo
 ${PYSITELIB}/mitmproxy/proxy/server.py
 ${PYSITELIB}/mitmproxy/proxy/server.pyc
 ${PYSITELIB}/mitmproxy/proxy/server.pyo
+${PYSITELIB}/mitmproxy/proxy/server_hooks.py
+${PYSITELIB}/mitmproxy/proxy/server_hooks.pyc
+${PYSITELIB}/mitmproxy/proxy/server_hooks.pyo
+${PYSITELIB}/mitmproxy/proxy/tunnel.py
+${PYSITELIB}/mitmproxy/proxy/tunnel.pyc
+${PYSITELIB}/mitmproxy/proxy/tunnel.pyo
+${PYSITELIB}/mitmproxy/proxy/utils.py
+${PYSITELIB}/mitmproxy/proxy/utils.pyc
+${PYSITELIB}/mitmproxy/proxy/utils.pyo
 ${PYSITELIB}/mitmproxy/py.typed
 ${PYSITELIB}/mitmproxy/script/__init__.py
 ${PYSITELIB}/mitmproxy/script/__init__.pyc
@@ -647,15 +649,15 @@ ${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
 ${PYSITELIB}/mitmproxy/utils/debug.py
 ${PYSITELIB}/mitmproxy/utils/debug.pyc
 ${PYSITELIB}/mitmproxy/utils/debug.pyo
+${PYSITELIB}/mitmproxy/utils/emoji.py
+${PYSITELIB}/mitmproxy/utils/emoji.pyc
+${PYSITELIB}/mitmproxy/utils/emoji.pyo
 ${PYSITELIB}/mitmproxy/utils/human.py
 ${PYSITELIB}/mitmproxy/utils/human.pyc
 ${PYSITELIB}/mitmproxy/utils/human.pyo
@@ -677,72 +679,3 @@ ${PYSITELIB}/mitmproxy/version.pyo
 ${PYSITELIB}/mitmproxy/websocket.py
 ${PYSITELIB}/mitmproxy/websocket.pyc
 ${PYSITELIB}/mitmproxy/websocket.pyo
-${PYSITELIB}/pathod/__init__.py
-${PYSITELIB}/pathod/__init__.pyc
-${PYSITELIB}/pathod/__init__.pyo
-${PYSITELIB}/pathod/language/__init__.py
-${PYSITELIB}/pathod/language/__init__.pyc
-${PYSITELIB}/pathod/language/__init__.pyo
-${PYSITELIB}/pathod/language/actions.py
-${PYSITELIB}/pathod/language/actions.pyc
-${PYSITELIB}/pathod/language/actions.pyo
-${PYSITELIB}/pathod/language/base.py
-${PYSITELIB}/pathod/language/base.pyc
-${PYSITELIB}/pathod/language/base.pyo
-${PYSITELIB}/pathod/language/exceptions.py
-${PYSITELIB}/pathod/language/exceptions.pyc
-${PYSITELIB}/pathod/language/exceptions.pyo
-${PYSITELIB}/pathod/language/generators.py
-${PYSITELIB}/pathod/language/generators.pyc
-${PYSITELIB}/pathod/language/generators.pyo
-${PYSITELIB}/pathod/language/http.py
-${PYSITELIB}/pathod/language/http.pyc
-${PYSITELIB}/pathod/language/http.pyo
-${PYSITELIB}/pathod/language/http2.py
-${PYSITELIB}/pathod/language/http2.pyc
-${PYSITELIB}/pathod/language/http2.pyo
-${PYSITELIB}/pathod/language/message.py
-${PYSITELIB}/pathod/language/message.pyc
-${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
-${PYSITELIB}/pathod/log.py
-${PYSITELIB}/pathod/log.pyc
-${PYSITELIB}/pathod/log.pyo
-${PYSITELIB}/pathod/pathoc.py
-${PYSITELIB}/pathod/pathoc.pyc
-${PYSITELIB}/pathod/pathoc.pyo
-${PYSITELIB}/pathod/pathoc_cmdline.py
-${PYSITELIB}/pathod/pathoc_cmdline.pyc
-${PYSITELIB}/pathod/pathoc_cmdline.pyo
-${PYSITELIB}/pathod/pathod.py
-${PYSITELIB}/pathod/pathod.pyc
-${PYSITELIB}/pathod/pathod.pyo
-${PYSITELIB}/pathod/pathod_cmdline.py
-${PYSITELIB}/pathod/pathod_cmdline.pyc
-${PYSITELIB}/pathod/pathod_cmdline.pyo
-${PYSITELIB}/pathod/protocols/__init__.py
-${PYSITELIB}/pathod/protocols/__init__.pyc
-${PYSITELIB}/pathod/protocols/__init__.pyo
-${PYSITELIB}/pathod/protocols/http.py
-${PYSITELIB}/pathod/protocols/http.pyc
-${PYSITELIB}/pathod/protocols/http.pyo
-${PYSITELIB}/pathod/protocols/http2.py
-${PYSITELIB}/pathod/protocols/http2.pyc
-${PYSITELIB}/pathod/protocols/http2.pyo
-${PYSITELIB}/pathod/protocols/websockets.py
-${PYSITELIB}/pathod/protocols/websockets.pyc
-${PYSITELIB}/pathod/protocols/websockets.pyo
-${PYSITELIB}/pathod/test.py
-${PYSITELIB}/pathod/test.pyc
-${PYSITELIB}/pathod/test.pyo
-${PYSITELIB}/pathod/utils.py
-${PYSITELIB}/pathod/utils.pyc
-${PYSITELIB}/pathod/utils.pyo
diff --git a/net/mitmproxy/distinfo b/net/mitmproxy/distinfo
index d2f64de52b2..494d2c9dfcf 100644
--- a/net/mitmproxy/distinfo
+++ b/net/mitmproxy/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.23 2020/12/19 11:54:42 leot Exp $
+$NetBSD: distinfo,v 1.24 2021/07/17 14:14:47 leot Exp $
 
-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
+SHA1 (mitmproxy-7.0.0.tar.gz) = c014af7f0798dd81a488f0920d4c1862b2a1fdb9
+RMD160 (mitmproxy-7.0.0.tar.gz) = bd1d2ea67f9ecd8f899ce6f345faa825f43571db
+SHA512 (mitmproxy-7.0.0.tar.gz) = 3836a33e5d2be09fb89987d2b0b898183dab9f17b990b98ab754d07cc5d7275786cfac0ab946e65a099ece054c7bbd65d62d01e4e4281e5f9b5f3dcdd0ac80b4
+Size (mitmproxy-7.0.0.tar.gz) = 27308204 bytes