<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5cffb2c8a0334c4c98ac5461948185dbb8f672ad">https://github.com/macports/macports-ports/commit/5cffb2c8a0334c4c98ac5461948185dbb8f672ad</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5cffb2c8a0334c4c98ac5461948185dbb8f672ad
</span>Author: Chih-Hsuan Yen <yan12125@macports.org>
AuthorDate: Sun Mar 24 21:58:17 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> py-mitmproxy: workaround incompatibility with Tornado 6.x
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The onboarding addon intercepts traffic to mitm.im to enable easy
</span><span style='display:block; white-space:pre;color:#404040;'> installation of mitmproxy CA certificates. Users can still install CA
</span><span style='display:block; white-space:pre;color:#404040;'> certificates manually without this addon.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also dropped py36 variant.
</span>---
python/py-graveyard/Portfile | 1 +
python/py-mitmproxy/Portfile | 9 ++++++---
python/py-mitmproxy/files/no-onboarding.patch | 20 ++++++++++++++++++++
3 files changed, 27 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-graveyard/Portfile b/python/py-graveyard/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3ed5d18..10fe037 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-graveyard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-graveyard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -198,6 +198,7 @@ py-meta-devel 0.4.1_20130223 \
</span> 26 33
py-milk 0.6.1_1 26
py-minfx 1.0.3_1 26
<span style='display:block; white-space:pre;background:#e0ffe0;'>+py-mitmproxy 4.0.4_2 36
</span> py-mlpy 3.5.0_2 26 33
py-mongoengine 0.8.7_1 26
py-montage 0.9.8_1 26 33
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-mitmproxy/Portfile b/python/py-mitmproxy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ed8e45..8fafd43 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-mitmproxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-mitmproxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span>
github.setup mitmproxy mitmproxy 4.0.4 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
name py-${github.project}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,12 +34,14 @@ checksums md5 d9f58513ab46777b60c15bff52a2239b \
</span> # wsproto0.13: https://github.com/mitmproxy/mitmproxy/pull/3459
# pytest4: https://github.com/mitmproxy/mitmproxy/pull/3403
# mojave: https://github.com/mitmproxy/mitmproxy/pull/3437
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The onboarding addon is incompatible with Tornado 6.x
</span> patchfiles update-certs.patch \
wsproto0.13.patch \
pytest4.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mojave.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mojave.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-onboarding.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 36 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 37
</span>
if {${name} ne ${subport}} {
depends_build-append port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +83,7 @@ if {${name} ne ${subport}} {
</span>
test.run yes
test.cmd py.test-${python.branch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.args --ignore=test/mitmproxy/addons/test_onboarding.py
</span>
livecheck.type none
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-mitmproxy/files/no-onboarding.patch b/python/py-mitmproxy/files/no-onboarding.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..90b6951
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-mitmproxy/files/no-onboarding.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mitmproxy/addons/__init__.py mitmproxy/addons/__init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 838fba9b..5d21bf68 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mitmproxy/addons/__init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mitmproxy/addons/__init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,7 +8,6 @@ from mitmproxy.addons import core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from mitmproxy.addons import cut
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from mitmproxy.addons import disable_h2c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from mitmproxy.addons import export
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-from mitmproxy.addons import onboarding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from mitmproxy.addons import proxyauth
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from mitmproxy.addons import replace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from mitmproxy.addons import script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +32,6 @@ def default_addons():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cut.Cut(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ disable_h2c.DisableH2C(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export.Export(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- onboarding.Onboarding(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proxyauth.ProxyAuth(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replace.Replace(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ script.ScriptLoader(),
</span></pre><pre style='margin:0'>
</pre>