mitmproxy: Update net/mitmproxy to 4.0.4

pkgsrc changes:
 - Instead of maintaining patches/patch-setup.py rewrite the logic to avoid
   too strict version dependencies via SUBST.

Changes:
31 July 2018: mitmproxy 4.0.4
    * Security: Protect mitmweb against DNS rebinding. (CVE-2018-14505, @atx)
    * Reduce certificate lifetime to two years to be conformant with
      the current CA/Browser Forum Baseline Requirements. (@muffl0n)
      (https://cabforum.org/2017/03/17/ballot-193-825-day-certificate-lifetimes/)
    * Update cryptography to version 2.3.

15 June 2018: mitmproxy 4.0.3
    * Add support for IPv6 transparent mode on Windows (#3174)
    * Add Docker images for ARMv7 - Raspberry Pi (#3190)
    * Major overhaul of our release workflow - you probably won't notice it, but for us it's a big thing!
    * Fix the Python version detection on Python 3.5, we now show a more intuitive error message (#3188)
    * Fix application shutdown on Windows (#3172)
    * Fix IPv6 scope suffixes in block addon (#3164)
    * Fix options update when added (#3157)
    * Fix "Edit Flow" button in mitmweb (#3136)

15 June 2018: mitmproxy 4.0.2
    * Skipped!

4 files changed, 17 insertions, 94 deletions

diff --git a/net/mitmproxy/Makefile b/net/mitmproxy/Makefile
index 5edc680582a..1ea0720132f 100644
--- a/net/mitmproxy/Makefile
+++ b/net/mitmproxy/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2018/05/17 13:06:13 leot Exp $
+# $NetBSD: Makefile,v 1.22 2018/08/09 11:51:41 leot Exp $
 
-DISTNAME=	mitmproxy-4.0.1
+DISTNAME=	mitmproxy-4.0.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mitmproxy/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -30,6 +30,12 @@ DEPENDS+=	${PYPKGPREFIX}-tornado>=4.3.0:../../www/py-tornado
 DEPENDS+=	${PYPKGPREFIX}-urwid>=2.0.1:../../devel/py-urwid
 DEPENDS+=	${PYPKGPREFIX}-wsproto>=0.11.0:../../www/py-wsproto
 
+SUBST_CLASSES+=			setuppyversions
+SUBST_STAGE.setuppyversions=	pre-configure
+SUBST_MESSAGE.setuppyversions=	Avoid too strict version requirements
+SUBST_FILES.setuppyversions=	setup.py
+SUBST_SED.setuppyversions=	-E -e '/>=/ s/, *<[^"]+//g'
+
 REPLACE_SH+=	mitmproxy/contrib/kaitaistruct/make.sh
 
 USE_LANGUAGES=			# none
diff --git a/net/mitmproxy/PLIST b/net/mitmproxy/PLIST
index c737aa29765..d14665fd976 100644
--- a/net/mitmproxy/PLIST
+++ b/net/mitmproxy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2018/05/17 13:06:13 leot Exp $
+@comment $NetBSD: PLIST,v 1.12 2018/08/09 11:51:41 leot Exp $
 bin/mitmdump
 bin/mitmproxy
 bin/mitmweb
@@ -483,6 +483,9 @@ ${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
diff --git a/net/mitmproxy/distinfo b/net/mitmproxy/distinfo
index fa229df0d77..793f91d52f9 100644
--- a/net/mitmproxy/distinfo
+++ b/net/mitmproxy/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2018/05/17 13:06:13 leot Exp $
+$NetBSD: distinfo,v 1.15 2018/08/09 11:51:41 leot Exp $
 
-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
+SHA1 (mitmproxy-4.0.4.tar.gz) = 67871cbf7751d34d254ccc733f5e2cd23fbe8faf
+RMD160 (mitmproxy-4.0.4.tar.gz) = d4935a325081544ef0cc9b5551d5eb976ce21777
+SHA512 (mitmproxy-4.0.4.tar.gz) = e08ea8b1c75a95b822c463625509037bbc8a979161cacaa1f0185f98df8d6d7e5400925365dbbe70d18751251b1005824f739a8cd035c0389f7b4aea562adfb3
+Size (mitmproxy-4.0.4.tar.gz) = 27131713 bytes
diff --git a/net/mitmproxy/patches/patch-setup.py b/net/mitmproxy/patches/patch-setup.py
deleted file mode 100644
index d97c4fe530e..00000000000
--- a/net/mitmproxy/patches/patch-setup.py
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-setup.py,v 1.8 2018/05/17 13:06:13 leot Exp $
-
-Avoid too strict version requirements.
-
---- setup.py.orig	2018-05-17 07:39:27.000000000 +0000
-+++ setup.py
-@@ -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=[
--        "blinker>=1.4, <1.5",
--        "brotlipy>=0.7.0,<0.8",
-+        "blinker>=1.4",
-+        "brotlipy>=0.7.0",
-         "certifi>=2015.11.20.1",  # no semver here - this should always be on the last release!
--        "click>=6.2, <7",
--        "cryptography>=2.1.4,<2.3",
--        "h2>=3.0.1,<4",
--        "hyperframe>=5.1.0,<6",
--        "kaitaistruct>=0.7,<0.9",
--        "ldap3>=2.5,<2.6",
--        "passlib>=1.6.5, <1.8",
--        "pyasn1>=0.3.1,<0.5",
--        "pyOpenSSL>=17.5,<17.6",
--        "pyparsing>=2.1.3, <2.3",
--        "pyperclip>=1.6.0, <1.7",
--        "ruamel.yaml>=0.13.2, <0.16",
--        "sortedcontainers>=1.5.4, <1.6",
--        "tornado>=4.3,<5.1",
--        "urwid>=2.0.1,<2.1",
--        "wsproto>=0.11.0,<0.12.0",
-+        "click>=6.2",
-+        "cryptography>=2.1.4",
-+        "h2>=3.0.1",
-+        "hyperframe>=5.1.0",
-+        "kaitaistruct>=0.7",
-+        "ldap3>=2.5",
-+        "passlib>=1.6.5",
-+        "pyasn1>=0.3.1",
-+        "pyOpenSSL>=17.5",
-+        "pyparsing>=2.1.3",
-+        "pyperclip>=1.6.0",
-+        "ruamel.yaml>=0.13.2",
-+        "sortedcontainers>=1.5.4",
-+        "tornado>=4.3",
-+        "urwid>=2.0.1",
-+        "wsproto>=0.11.0",
-     ],
-     extras_require={
-         ':sys_platform == "win32"': [
--            "pydivert>=2.0.3,<2.2",
-+            "pydivert>=2.0.3",
-         ],
-         'dev': [
-             "asynctest>=0.12.0",
--            "flake8>=3.5, <3.6",
--            "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>=3.0,<3.1",
--            "rstcheck>=2.2, <4.0",
-+            "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>=3.0",
-+            "rstcheck>=2.2",
-         ],
-         'examples': [
--            "beautifulsoup4>=4.4.1, <4.7"
-+            "beautifulsoup4>=4.4.1"
-         ]
-     }
- )