[150245] trunk/dports/python/py-mitmproxy

petr at macports.org petr at macports.org
Wed Jul 13 09:40:09 PDT 2016


Revision: 150245
          https://trac.macports.org/changeset/150245
Author:   petr at macports.org
Date:     2016-07-13 09:40:09 -0700 (Wed, 13 Jul 2016)
Log Message:
-----------
py-mitmproxy: update to @0.17.1, patch dependency versions

Modified Paths:
--------------
    trunk/dports/python/py-mitmproxy/Portfile

Added Paths:
-----------
    trunk/dports/python/py-mitmproxy/files/
    trunk/dports/python/py-mitmproxy/files/patch-setup.py.diff

Modified: trunk/dports/python/py-mitmproxy/Portfile
===================================================================
--- trunk/dports/python/py-mitmproxy/Portfile	2016-07-13 14:37:42 UTC (rev 150244)
+++ trunk/dports/python/py-mitmproxy/Portfile	2016-07-13 16:40:09 UTC (rev 150245)
@@ -5,14 +5,11 @@
 PortGroup           python 1.0
 PortGroup           github 1.0
 
-github.setup        mitmproxy mitmproxy 0.16 v
 
+github.setup        mitmproxy mitmproxy 0.17.1 v
+
 name                py-${github.project}
 
-# Attention: 
-# It looks like package `netlib` is about to be merged into `mitmproxy`.
-# After update of mitmproxy > 0.16, this might cause a conflict with `netlib`.
-
 categories-append   net www
 platforms           darwin
 supported_archs     noarch
@@ -20,7 +17,6 @@
 maintainers         mdeaudelin.net:macports petr openmaintainer
 
 description         SSL-capable man-in-the-middle proxy for HTTP
-
 long_description    \
     mitmproxy is an SSL-capable man-in-the-middle proxy for HTTP. It provides \
     a console interface that allows traffic flows to be inspected and edited \
@@ -29,25 +25,57 @@
 
 homepage            http://mitmproxy.org/
 
-checksums           md5     7bf51041907b0b3fb83d7dd909e5be1a \
-                    rmd160  94fe6ce1bd502f11e6aa0ee9616838434d7a7a8c \
-                    sha256  9a69e03e2b96a913d89c1548690bf24b7da97dddfd4661d9bc70e1005dcdd859
+checksums           md5     954b5796ab36c6d7e5dad5775e7178a3 \
+                    rmd160  6d28eec42f4e410775a8d394f6c12232652df691 \
+                    sha256  9b1460be1cf16ceb8b89c11f8593ad2de16ec9ce238964f26eb36e1bcfb13f24
 
 python.versions     27
 
 if {${name} ne ${subport}} {
-    depends_lib-append  port:py${python.version}-asn1 \
-                        port:py${python.version}-blinker \
-                        port:py${python.version}-configargparse \
-                        port:py${python.version}-html2text \
-                        port:py${python.version}-lxml \
-                        port:py${python.version}-netlib \
-                        port:py${python.version}-openssl \
-                        port:py${python.version}-parsing \
-                        port:py${python.version}-Pillow \
-                        port:py${python.version}-pyperclip \
-                        port:py${python.version}-tornado \
-                        port:py${python.version}-urwid
+    depends_build-append    port:py${python.version}-setuptools
 
+    depends_lib-append      port:py${python.version}-asn1 \
+                            port:py${python.version}-blinker \
+                            port:py${python.version}-click \
+                            port:py${python.version}-certifi \
+                            port:py${python.version}-configargparse \
+                            port:py${python.version}-construct \
+                            port:py${python.version}-cryptography \
+                            port:py${python.version}-flask \
+                            port:py${python.version}-h2 \
+                            port:py${python.version}-hpack \
+                            port:py${python.version}-html2text \
+                            port:py${python.version}-hyperframe \
+                            port:py${python.version}-lxml \
+                            port:py${python.version}-openssl \
+                            port:py${python.version}-parsing \
+                            port:py${python.version}-passlib \
+                            port:py${python.version}-Pillow \
+                            port:py${python.version}-pyperclip \
+                            port:py${python.version}-requests \
+                            port:py${python.version}-six \
+                            port:py${python.version}-tornado \
+                            port:py${python.version}-urwid \
+                            port:py${python.version}-watchdog
+
+    if { ${python.version} < 35 } {
+        depends_lib-append \
+            port:py${python.version}-backports-ssl_match_hostname
+    }
+
+    patchfiles      patch-setup.py.diff
+
+    # Deactivation hack
+    # Python package `netlib` has been merged into `mitmproxy`, after version 0.16.
+    # This requires that that port `py27-netlib` is deacitavated. 
+    pre-activate {
+        if {![catch {set installed [lindex [registry_active py${python.version}-netlib] 0]}]} {
+            set _version [lindex $installed 1]
+            if {[vercmp $_version 0.16] <= 0} {
+                registry_deactivate_composite  py${python.version}-netlib "" [list ports_nodepcheck 1]
+            }
+        }
+    }
+
     livecheck.type  none
-} 
+}

Added: trunk/dports/python/py-mitmproxy/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-mitmproxy/files/patch-setup.py.diff	                        (rev 0)
+++ trunk/dports/python/py-mitmproxy/files/patch-setup.py.diff	2016-07-13 16:40:09 UTC (rev 150245)
@@ -0,0 +1,39 @@
+--- setup.orig.py	2016-04-22 05:01:41.000000000 +0200
++++ setup.py	2016-07-13 18:34:31.000000000 +0200
+@@ -65,20 +65,20 @@
+         "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",
++        "cryptography>=1.3,<1.5",               # upstream commit ef363270b8
++        "Flask>=0.10.1, <0.12",                 # upstream commit b5a39f7d6a
+         "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",
++        "html2text>=2016.1.8, <=2016.5.29",     # upstream commit b5a39f7d6a
++        "hyperframe>=3.2.0, !=4.0.0, <5",       # upstream commit ecf4adf30b, f969c70015
+         "lxml>=3.5.0, <3.7",
+-        "Pillow>=3.2, <3.3",
++        "Pillow>=3.2, <3.4",                    # upstream commit e89defe9ad
+         "passlib>=1.6.5, <1.7",
+         "pyasn1>=0.1.9, <0.2",
+         "pyOpenSSL>=16.0, <17.0",
+-        "pyparsing>=2.0,<2.1",  # 2.1.1 breaks our binaries, see https://sourceforge.net/p/pyparsing/bugs/93/
++        "pyparsing>=2.1.3,<2.2",                # upstream commit c973fd881f
+         "pyperclip>=1.5.22, <1.6",
+-        "requests>=2.9.1, <2.10",
++        "requests>=2.9.1, <2.11",               # upstream commit b5a39f7d6a
+         "six>=1.10, <1.11",
+         "tornado>=4.3, <4.4",
+         "urwid>=1.3.1, <1.4",
+@@ -116,7 +116,7 @@
+         'examples': [
+             "beautifulsoup4>=4.4.1, <4.5",
+             "harparser>=0.2, <0.3",
+-            "pytz>=2015.07.0, <=2016.3",
++            "pytz>=2015.07.0, <=2016.4",        # upstream commit b5a39f7d6a
+         ]
+     }
+ )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160713/55fa9c7e/attachment.html>


More information about the macports-changes mailing list