Update net/mitmproxy to 2.0.1

Changes:
15 March 2017: mitmproxy 2.0.1
    * bump cryptography dependency
    * bump pyparsing dependency
    * HTTP/2: use header normalization from hyper-h2

21 February 2017: mitmproxy 2.0
    * HTTP/2 is now enabled by default.
    * Image ContentView: Parse images with Kaitai Struct (kaitai.io) instead of Pillow.
      This simplifies installation, reduces binary size, and allows parsing in pure Python.
    * Web: Add missing flow filters.
    * Add transparent proxy support for OpenBSD.
    * Check the mitmproxy CA for expiration and warn the user to regenerate it if necessary.
    * Testing: Tremendous improvements, enforced 100% coverage for large parts of the
      codebase, increased overall coverage.
    * Enforce individual coverage: one source file -> one test file with 100% coverage.
    * A myriad of other small improvements throughout the project.
    * Numerous bugfixes.

26 December 2016: mitmproxy 1.0
    * All mitmproxy tools are now Python 3 only! We plan to support Python 3.5 and higher.
    * Web-Based User Interface: Mitmproxy now offically has a web-based user interface
      called mitmweb. We consider it stable for all features currently exposed
      in the UI, but it still misses a lot of mitmproxy’s options.
    * Windows Compatibility: With mitmweb, mitmproxy is now useable on Windows.
      We are also introducing an installer (kindly sponsored by BitRock) that
      simplifies setup.
    * Configuration: The config file format is now a single YAML file. In most cases,
      converting to the new format should be trivial - please see the docs for
      more information.
    * Console: Significant UI improvements - including sorting of flows by
      size, type and url, status bar improvements, much faster indentation for
      HTTP views, and more.
    * HTTP/2: Significant improvements, but is temporarily disabled by default
      due to wide-spread protocol implementation errors on some large website
    * WebSocket: The protocol implementation is now mature, and is enabled by
      default. Complete UI support is coming in the next release. Hooks for
      message interception and manipulation are available.
    * A myriad of other small improvements throughout the project.

16 October 2016: mitmproxy 0.18
    * Python 3 Compatibility for mitmproxy and pathod (Shadab Zafar, GSoC 2016)
    * Major improvements to mitmweb (Clemens Brunner & Jason Hao, GSoC 2016)
    * Internal Core Refactor: Separation of most features into isolated Addons
    * Initial Support for WebSockets
    * Improved HTTP/2 Support
    * Reverse Proxy Mode now automatically adjusts host headers and TLS Server Name Indication
    * Improved HAR export
    * Improved export functionality for curl, python code, raw http etc.
    * Flow URLs are now truncated in the console for better visibility
    * New filters for TCP, HTTP and marked flows.
    * Mitmproxy now handles comma-separated Cookie headers
    * Merge mitmproxy and pathod documentation
    * Mitmdump now sanitizes its console output to not include control characters
    * Improved message body handling for HTTP messages:
      .raw_content provides the message body as seen on the wire
      .content provides the decompressed body (e.g. un-gzipped)
      .text provides the body decompressed and decoded body
    * New HTTP Message getters/setters for cookies and form contents.
    * Add ability to view only marked flows in mitmproxy
    * Improved Script Reloader (Always use polling, watch for whole directory)
    * Use tox for testing
    * Unicode support for tnetstrings
    * Add dumpfile converters for mitmproxy versions 0.11 and 0.12
    * Numerous bugfixes

1 files changed, 60 insertions, 64 deletions

diff --git a/net/mitmproxy/patches/patch-setup.py b/net/mitmproxy/patches/patch-setup.py
index 3ca534ed279..a2586e7eb01 100644
--- a/net/mitmproxy/patches/patch-setup.py
+++ b/net/mitmproxy/patches/patch-setup.py
@@ -1,113 +1,109 @@
-$NetBSD: patch-setup.py,v 1.4 2016/04/21 08:20:45 leot Exp $
+$NetBSD: patch-setup.py,v 1.5 2017/04/14 13:15:04 leot Exp $
 
 Avoid too strict version requirements.
 
---- setup.py.orig	2016-04-10 00:43:47.000000000 +0000
+--- setup.py.orig	2017-03-15 18:44:08.000000000 +0000
 +++ setup.py
-@@ -59,64 +59,64 @@ setup(
+@@ -60,61 +60,61 @@ 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=[
--        "backports.ssl_match_hostname>=3.5.0.1, <3.6",
 -        "blinker>=1.4, <1.5",
--        "click>=6.2, <7.0",
-+        "backports.ssl_match_hostname>=3.5.0.1",
+-        "click>=6.2, <7",
 +        "blinker>=1.4",
 +        "click>=6.2",
          "certifi>=2015.11.20.1",  # no semver here - this should always be on the last release!
--        "configargparse>=0.10, <0.11",
--        "construct>=2.5.2, <2.6",
--        "cryptography>=1.3,<1.4",
--        "Flask>=0.10.1, <0.11",
--        "h2>=2.1.2, <3.0",
--        "hpack>=2.1.0, <3.0",
--        "html2text>=2016.1.8, <=2016.4.2",
--        "hyperframe>=3.2.0, <4.0",
--        "lxml>=3.5.0, <3.7",
--        "Pillow>=3.2, <3.3",
--        "passlib>=1.6.5, <1.7",
--        "pyasn1>=0.1.9, <0.2",
+-        "construct>=2.8, <2.9",
+-        "cryptography>=1.3, <1.9",
+-        "cssutils>=1.0.1, <1.1",
+-        "h2>=2.5.1, <3",
+-        "html2text>=2016.1.8, <=2016.9.19",
+-        "hyperframe>=4.0.1, <5",
+-        "jsbeautifier>=1.6.3, <1.7",
+-        "kaitaistruct>=0.6, <0.7",
+-        "passlib>=1.6.5, <1.8",
+-        "pyasn1>=0.1.9, <0.3",
 -        "pyOpenSSL>=16.0, <17.0",
--        "pyparsing>=2.1,<2.2",
+-        "pyparsing>=2.1.3, <2.3",
 -        "pyperclip>=1.5.22, <1.6",
--        "requests>=2.9.1, <2.10",
--        "six>=1.10, <1.11",
--        "tornado>=4.3, <4.4",
+-        "requests>=2.9.1, <3",
+-        "ruamel.yaml>=0.13.2, <0.14",
+-        "tornado>=4.3, <4.5",
 -        "urwid>=1.3.1, <1.4",
 -        "watchdog>=0.8.3, <0.9",
-+        "configargparse>=0.10",
-+        "construct>=2.5.2",
+-        "brotlipy>=0.5.1, <0.7",
+-        "sortedcontainers>=1.5.4, <1.6",
++        "construct>=2.8",
 +        "cryptography>=1.3",
-+        "Flask>=0.10.1",
-+        "h2>=2.1.2",
-+        "hpack>=2.1.0",
++        "cssutils>=1.0.1",
++        "h2>=2.5.1",
 +        "html2text>=2016.1.8",
-+        "hyperframe>=3.2.0",
-+        "lxml>=3.5.0",
-+        "Pillow>=3.2",
++        "hyperframe>=4.0.1",
++        "jsbeautifier>=1.6.3",
++        "kaitaistruct>=0.6",
 +        "passlib>=1.6.5",
 +        "pyasn1>=0.1.9",
 +        "pyOpenSSL>=16.0",
-+        "pyparsing>=2.1",
++        "pyparsing>=2.1.3",
 +        "pyperclip>=1.5.22",
 +        "requests>=2.9.1",
-+        "six>=1.10",
++        "ruamel.yaml>=0.13.2",
 +        "tornado>=4.3",
 +        "urwid>=1.3.1",
 +        "watchdog>=0.8.3",
++        "brotlipy>=0.5.1",
++        "sortedcontainers>=1.5.4",
+         # transitive from cryptography, we just blacklist here.
+         # https://github.com/pypa/setuptools/issues/861
+-        "setuptools>=11.3, !=29.0.0",
++        "setuptools>=11.3",
      ],
      extras_require={
          ':sys_platform == "win32"': [
--            "pydivert>=0.0.7, <0.1",
-+            "pydivert>=0.0.7",
+-            "pydivert>=2.0.3, <2.1",
++            "pydivert>=2.0.3",
          ],
          ':sys_platform != "win32"': [
          ],
-         # Do not use a range operator here: https://bitbucket.org/pypa/setuptools/issues/380
-         # Ubuntu Trusty and other still ship with setuptools < 17.1
-         ':python_version == "2.7"': [
--            "enum34>=1.0.4, <2",
--            "ipaddress>=1.0.15, <1.1",
-+            "enum34>=1.0.4",
-+            "ipaddress>=1.0.15",
-         ],
          'dev': [
--            "coveralls>=1.1, <1.2",
--            "mock>=1.3.0, <1.4",
--            "pytest>=2.8.7,<2.10",
--            "pytest-cov>=2.2.1, <2.3",
--            "pytest-timeout>=1.0.0, <1.1",
--            "pytest-xdist>=1.14, <1.15",
--            "sphinx>=1.3.5, <1.5",
+-            "Flask>=0.10.1, <0.13",
+-            "flake8>=3.2.1, <3.4",
+-            "mypy>=0.471, <0.480",
+-            "rstcheck>=2.2, <4.0",
+-            "tox>=2.3, <3",
+-            "pytest>=3, <3.1",
+-            "pytest-cov>=2.2.1, <3",
+-            "pytest-timeout>=1.0.0, <2",
+-            "pytest-xdist>=1.14, <2",
+-            "pytest-faulthandler>=1.3.0, <2",
+-            "sphinx>=1.3.5, <1.6",
 -            "sphinx-autobuild>=0.5.2, <0.7",
--            "sphinxcontrib-documentedlist>=0.3.0, <0.4",
+-            "sphinxcontrib-documentedlist>=0.5.0, <0.6",
 -            "sphinx_rtd_theme>=0.1.9, <0.2",
-+            "coveralls>=1.1",
-+            "mock>=1.3.0",
-+            "pytest>=2.8.7",
++            "Flask>=0.10.1",
++            "flake8>=3.2.1",
++            "mypy>=0.471",
++            "rstcheck>=2.2",
++            "tox>=2.3",
++            "pytest>=3",
 +            "pytest-cov>=2.2.1",
 +            "pytest-timeout>=1.0.0",
 +            "pytest-xdist>=1.14",
++            "pytest-faulthandler>=1.3.0",
 +            "sphinx>=1.3.5",
 +            "sphinx-autobuild>=0.5.2",
-+            "sphinxcontrib-documentedlist>=0.3.0",
++            "sphinxcontrib-documentedlist>=0.5.0",
 +            "sphinx_rtd_theme>=0.1.9",
          ],
          'contentviews': [
--            "cssutils>=1.0.1, <1.1",
--            "protobuf>=2.6.1, <2.7",
--            "pyamf>=0.8.0, <0.9",
-+            "cssutils>=1.0.1",
-+            "protobuf>=2.6.1",
-+            "pyamf>=0.8.0",
          ],
          'examples': [
--            "beautifulsoup4>=4.4.1, <4.5",
--            "harparser>=0.2, <0.3",
--            "pytz>=2015.07.0, <=2016.3",
+-            "beautifulsoup4>=4.4.1, <4.6",
+-            "pytz>=2015.07.0, <=2016.10",
+-            "Pillow>=3.2, <4.1",
 +            "beautifulsoup4>=4.4.1",
-+            "harparser>=0.2",
 +            "pytz>=2015.07.0",
++            "Pillow>=3.2",
          ]
      }
  )