mitmproxy: Update net/mitmproxy to 4.0.1

pkgsrc changes:
 - Take MAINTAINERship
 - Sync DEPENDS with setup.py
 - Add Python 3.5 to PYTHON_VERSIONS_INCOMPATIBLE (mitmproxy now requires Python
   3.6)

Changes:
mitmproxy 4.0.1
---------------
The previous release had a packaging issue, so we bumped it to
v4.0.1 and re-released it. This contains no actual bugfixes or
new features.

mitmproxy 4.0
-------------
Features
--------
 * mitmproxy now requires Python 3.6!
 * Moved the core to asyncio - which gives us a very significant performance
   boost!
 * Reduce memory consumption by using `SO_KEEPALIVE` (#3076)
 * Export request as httpie command (#3031)
 * Configure mitmproxy console keybindings with the keys.yaml file. See docs
   for more.

Breaking Changes
----------------
 * The --conf command-line flag is now --confdir, and specifies the mitmproxy
   configuration directory, instead of the options yaml file (which is at
   `config.yaml` under the configuration directory).
 * `allow_remote` got replaced by `block_global` and `block_private` (#3100)
 * No more custom events (#3093)
 * The `cadir` option has been renamed to `confdir`
 * We no longer magically capture print statements in addons and translate
   them to logs. Please use `ctx.log.info` explicitly.

Bugfixes
--------
 * Correctly block connections from remote clients with IPv4-mapped IPv6
   client addresses (#3099)
 * Expand `~` in paths during the `cut` command (#3078)
 * Remove socket listen backlog constraint
 * Improve handling of user script exceptions (#3050, #2837)
 * Ignore signal errors on windows
 * Fix traceback for commands with un-terminated escape characters (#2810)
 * Fix request replay when proxy is bound to local interface (#2647)
 * Fix traceback when running scripts on a flow twice (#2838)
 * Fix traceback when killing intercepted flow (#2879)
 * And lots of typos, docs improvements, revamped examples, and general fixes!

4 files changed, 30 insertions, 37 deletions

diff --git a/net/mitmproxy/Makefile b/net/mitmproxy/Makefile
index 5e781554f93..5edc680582a 100644
--- a/net/mitmproxy/Makefile
+++ b/net/mitmproxy/Makefile
@@ -1,31 +1,26 @@
-# $NetBSD: Makefile,v 1.20 2018/04/05 17:53:02 leot Exp $
+# $NetBSD: Makefile,v 1.21 2018/05/17 13:06:13 leot Exp $
 
-DISTNAME=	mitmproxy-3.0.4
+DISTNAME=	mitmproxy-4.0.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mitmproxy/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	leot@NetBSD.org
 HOMEPAGE=	https://mitmproxy.org/
 COMMENT=	Interactive console program for inspecting and editing traffic flows
 LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=17.5:../../security/py-OpenSSL
-DEPENDS+=	${PYPKGPREFIX}-asn1>=0.1.9:../../security/py-asn1
+DEPENDS+=	${PYPKGPREFIX}-asn1>=0.3.1:../../security/py-asn1
 DEPENDS+=	${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker
 DEPENDS+=	${PYPKGPREFIX}-brotlipy>=0.7.0:../../archivers/py-brotlipy
 DEPENDS+=	${PYPKGPREFIX}-certifi>=2015.11.20.1:../../security/py-certifi
 DEPENDS+=	${PYPKGPREFIX}-click>=6.2:../../devel/py-click
-DEPENDS+=	${PYPKGPREFIX}-configargparse>=0.10.0:../../devel/py-configargparse
-DEPENDS+=	${PYPKGPREFIX}-construct>=2.5.2:../../devel/py-construct
 DEPENDS+=	${PYPKGPREFIX}-cryptography>=2.1.4:../../security/py-cryptography
-DEPENDS+=	${PYPKGPREFIX}-cssutils>=1.0.1:../../textproc/py-cssutils
 DEPENDS+=	${PYPKGPREFIX}-h2>=3.0.1:../../www/py-h2
-DEPENDS+=	${PYPKGPREFIX}-hpack>=2.1.0:../../net/py-hpack
-DEPENDS+=	${PYPKGPREFIX}-html2text>=2016.1.8:../../textproc/py-html2text
 DEPENDS+=	${PYPKGPREFIX}-hyperframe>=5.1.0:../../www/py-hyperframe
 DEPENDS+=	${PYPKGPREFIX}-kaitaistruct>=0.7:../../devel/py-kaitaistruct
-DEPENDS+=	${PYPKGPREFIX}-ldap3>=2.4:../../databases/py-ldap3
+DEPENDS+=	${PYPKGPREFIX}-ldap3>=2.5:../../databases/py-ldap3
 DEPENDS+=	${PYPKGPREFIX}-passlib>=1.6.5:../../security/py-passlib
 DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.1.3:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-pyperclip>=1.6.0:../../x11/py-pyperclip
@@ -33,13 +28,12 @@ DEPENDS+=	${PYPKGPREFIX}-ruamel-yaml>=0.13.2:../../devel/py-ruamel-yaml
 DEPENDS+=	${PYPKGPREFIX}-sortedcontainers>=1.5.4:../../devel/py-sortedcontainers
 DEPENDS+=	${PYPKGPREFIX}-tornado>=4.3.0:../../www/py-tornado
 DEPENDS+=	${PYPKGPREFIX}-urwid>=2.0.1:../../devel/py-urwid
-DEPENDS+=	${PYPKGPREFIX}-watchdog>=0.8.3:../../sysutils/py-watchdog
 DEPENDS+=	${PYPKGPREFIX}-wsproto>=0.11.0:../../www/py-wsproto
 
 REPLACE_SH+=	mitmproxy/contrib/kaitaistruct/make.sh
 
 USE_LANGUAGES=			# none
-PYTHON_VERSIONS_INCOMPATIBLE=	27 34
+PYTHON_VERSIONS_INCOMPATIBLE=	27 34 35
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/net/mitmproxy/PLIST b/net/mitmproxy/PLIST
index d5d34057d2b..c737aa29765 100644
--- a/net/mitmproxy/PLIST
+++ b/net/mitmproxy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2018/04/05 17:53:02 leot Exp $
+@comment $NetBSD: PLIST,v 1.11 2018/05/17 13:06:13 leot Exp $
 bin/mitmdump
 bin/mitmproxy
 bin/mitmweb
@@ -19,15 +19,15 @@ ${PYSITELIB}/mitmproxy/addonmanager.pyo
 ${PYSITELIB}/mitmproxy/addons/__init__.py
 ${PYSITELIB}/mitmproxy/addons/__init__.pyc
 ${PYSITELIB}/mitmproxy/addons/__init__.pyo
-${PYSITELIB}/mitmproxy/addons/allowremote.py
-${PYSITELIB}/mitmproxy/addons/allowremote.pyc
-${PYSITELIB}/mitmproxy/addons/allowremote.pyo
 ${PYSITELIB}/mitmproxy/addons/anticache.py
 ${PYSITELIB}/mitmproxy/addons/anticache.pyc
 ${PYSITELIB}/mitmproxy/addons/anticache.pyo
 ${PYSITELIB}/mitmproxy/addons/anticomp.py
 ${PYSITELIB}/mitmproxy/addons/anticomp.pyc
 ${PYSITELIB}/mitmproxy/addons/anticomp.pyo
+${PYSITELIB}/mitmproxy/addons/block.py
+${PYSITELIB}/mitmproxy/addons/block.pyc
+${PYSITELIB}/mitmproxy/addons/block.pyo
 ${PYSITELIB}/mitmproxy/addons/browser.py
 ${PYSITELIB}/mitmproxy/addons/browser.pyc
 ${PYSITELIB}/mitmproxy/addons/browser.pyo
@@ -444,9 +444,6 @@ ${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/http_replay.py
-${PYSITELIB}/mitmproxy/proxy/protocol/http_replay.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/http_replay.pyo
 ${PYSITELIB}/mitmproxy/proxy/protocol/rawtcp.py
 ${PYSITELIB}/mitmproxy/proxy/protocol/rawtcp.pyc
 ${PYSITELIB}/mitmproxy/proxy/protocol/rawtcp.pyo
diff --git a/net/mitmproxy/distinfo b/net/mitmproxy/distinfo
index 006f92e4ea4..fa229df0d77 100644
--- a/net/mitmproxy/distinfo
+++ b/net/mitmproxy/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2018/04/05 17:53:02 leot Exp $
+$NetBSD: distinfo,v 1.14 2018/05/17 13:06:13 leot Exp $
 
-SHA1 (mitmproxy-3.0.4.tar.gz) = c05ada3b10cb5fc42e86f25205a4a8823f64de2a
-RMD160 (mitmproxy-3.0.4.tar.gz) = 57a68e86b9719f27635bbe07d75ebc7c92495478
-SHA512 (mitmproxy-3.0.4.tar.gz) = a89b0bee6997ce51d23483101755dae9f5300339d65e4975679df5c6b60ff9af94e655651321cd8e831666a04ec5cc24c7af647f3aab913524b6755b47f1f57b
-Size (mitmproxy-3.0.4.tar.gz) = 27147733 bytes
-SHA1 (patch-setup.py) = 4b74c7546e3c513efeb9157ed232f833d514436f
+SHA1 (mitmproxy-4.0.1.tar.gz) = e15b8bff9a12e0c04ba44753f324dc8d55ebf639
+RMD160 (mitmproxy-4.0.1.tar.gz) = b2c099b8576dbf9cc69b96ff88b587c9caa757fb
+SHA512 (mitmproxy-4.0.1.tar.gz) = 2ba999854052a63182dbd2e1d5377fdef6b16c38a4d32912fc2c782ed8ad0e11694c6e010fd68bd6ecbc1c9f22ac7394444e6b2e8472990665bd7cb81a3cb82f
+Size (mitmproxy-4.0.1.tar.gz) = 27130121 bytes
+SHA1 (patch-setup.py) = 548c027490624509b9d8d0717c56a63ab333343b
diff --git a/net/mitmproxy/patches/patch-setup.py b/net/mitmproxy/patches/patch-setup.py
index ac660d97fcf..d97c4fe530e 100644
--- a/net/mitmproxy/patches/patch-setup.py
+++ b/net/mitmproxy/patches/patch-setup.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-setup.py,v 1.7 2018/04/05 17:53:02 leot Exp $
+$NetBSD: patch-setup.py,v 1.8 2018/05/17 13:06:13 leot Exp $
 
 Avoid too strict version requirements.
 
---- setup.py.orig	2018-04-05 15:09:51.000000000 +0000
+--- setup.py.orig	2018-05-17 07:39:27.000000000 +0000
 +++ setup.py
-@@ -61,45 +61,45 @@ setup(
+@@ -60,47 +60,47 @@ setup(
      # https://packaging.python.org/en/latest/requirements/#install-requires
      # It is not considered best practice to use install_requires to pin dependencies to specific versions.
      install_requires=[
@@ -18,7 +18,7 @@ Avoid too strict version requirements.
 -        "h2>=3.0.1,<4",
 -        "hyperframe>=5.1.0,<6",
 -        "kaitaistruct>=0.7,<0.9",
--        "ldap3>=2.4,<2.5",
+-        "ldap3>=2.5,<2.6",
 -        "passlib>=1.6.5, <1.8",
 -        "pyasn1>=0.3.1,<0.5",
 -        "pyOpenSSL>=17.5,<17.6",
@@ -34,7 +34,7 @@ Avoid too strict version requirements.
 +        "h2>=3.0.1",
 +        "hyperframe>=5.1.0",
 +        "kaitaistruct>=0.7",
-+        "ldap3>=2.4",
++        "ldap3>=2.5",
 +        "passlib>=1.6.5",
 +        "pyasn1>=0.3.1",
 +        "pyOpenSSL>=17.5",
@@ -52,27 +52,29 @@ Avoid too strict version requirements.
 +            "pydivert>=2.0.3",
          ],
          'dev': [
+             "asynctest>=0.12.0",
 -            "flake8>=3.5, <3.6",
--            "Flask>=0.10.1, <0.13",
--            "mypy>=0.580,<0.581",
+-            "Flask>=1.0,<1.1",
+-            "mypy>=0.590,<0.591",
++            "flake8>=3.5",
++            "Flask>=1.0",
++            "mypy>=0.590",
+             "pytest-asyncio>=0.8",
 -            "pytest-cov>=2.5.1,<3",
 -            "pytest-faulthandler>=1.3.1,<2",
 -            "pytest-timeout>=1.2.1,<2",
 -            "pytest-xdist>=1.22,<2",
 -            "pytest>=3.3,<4",
 -            "requests>=2.9.1, <3",
--            "tox>=2.3, <3",
+-            "tox>=3.0,<3.1",
 -            "rstcheck>=2.2, <4.0",
-+            "flake8>=3.5",
-+            "Flask>=0.10.1",
-+            "mypy>=0.580",
 +            "pytest-cov>=2.5.1",
 +            "pytest-faulthandler>=1.3.1",
 +            "pytest-timeout>=1.2.1",
 +            "pytest-xdist>=1.22",
 +            "pytest>=3.3",
 +            "requests>=2.9.1",
-+            "tox>=2.3",
++            "tox>=3.0",
 +            "rstcheck>=2.2",
          ],
          'examples': [