<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[150245] trunk/dports/python/py-mitmproxy</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/150245">150245</a></dd>
<dt>Author</dt> <dd>petr@macports.org</dd>
<dt>Date</dt> <dd>2016-07-13 09:40:09 -0700 (Wed, 13 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-mitmproxy: update to @0.17.1, patch dependency versions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpymitmproxyPortfile">trunk/dports/python/py-mitmproxy/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/python/py-mitmproxy/files/</li>
<li><a href="#trunkdportspythonpymitmproxyfilespatchsetuppydiff">trunk/dports/python/py-mitmproxy/files/patch-setup.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpymitmproxyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-mitmproxy/Portfile (150244 => 150245)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,14 +5,11 @@
</span><span class="cx"> PortGroup python 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup mitmproxy mitmproxy 0.16 v
</del><span class="cx">
</span><ins>+github.setup mitmproxy mitmproxy 0.17.1 v
+
</ins><span class="cx"> name py-${github.project}
</span><span class="cx">
</span><del>-# 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`.
-
</del><span class="cx"> categories-append net www
</span><span class="cx"> platforms darwin
</span><span class="cx"> supported_archs noarch
</span><span class="lines">@@ -20,7 +17,6 @@
</span><span class="cx"> maintainers mdeaudelin.net:macports petr openmaintainer
</span><span class="cx">
</span><span class="cx"> description SSL-capable man-in-the-middle proxy for HTTP
</span><del>-
</del><span class="cx"> long_description \
</span><span class="cx"> mitmproxy is an SSL-capable man-in-the-middle proxy for HTTP. It provides \
</span><span class="cx"> a console interface that allows traffic flows to be inspected and edited \
</span><span class="lines">@@ -29,25 +25,57 @@
</span><span class="cx">
</span><span class="cx"> homepage http://mitmproxy.org/
</span><span class="cx">
</span><del>-checksums md5 7bf51041907b0b3fb83d7dd909e5be1a \
- rmd160 94fe6ce1bd502f11e6aa0ee9616838434d7a7a8c \
- sha256 9a69e03e2b96a913d89c1548690bf24b7da97dddfd4661d9bc70e1005dcdd859
</del><ins>+checksums md5 954b5796ab36c6d7e5dad5775e7178a3 \
+ rmd160 6d28eec42f4e410775a8d394f6c12232652df691 \
+ sha256 9b1460be1cf16ceb8b89c11f8593ad2de16ec9ce238964f26eb36e1bcfb13f24
</ins><span class="cx">
</span><span class="cx"> python.versions 27
</span><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><del>- 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
</del><ins>+ depends_build-append port:py${python.version}-setuptools
</ins><span class="cx">
</span><ins>+ 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]
+ }
+ }
+ }
+
</ins><span class="cx"> livecheck.type none
</span><del>-}
</del><ins>+}
</ins></span></pre></div>
<a id="trunkdportspythonpymitmproxyfilespatchsetuppydiff"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-mitmproxy/files/patch-setup.py.diff (0 => 150245)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+--- 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
+ ]
+ }
+ )
</ins></span></pre>
</div>
</div>
</body>
</html>