From b099c1d3d0a76ab65dea9dbccca3dff222ecac87 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Mon, 2 Oct 2017 08:25:08 +0800
Subject: [PATCH] mitmproxy: (and sslyze) proper fix, issue #247

---
 .../{sslyze-1.1.4-r1.ebuild => sslyze-1.1.4-r2.ebuild}    | 6 +++++-
 net-proxy/mitmproxy/Manifest                              | 1 -
 ...itmproxy-2.0.2-r3.ebuild => mitmproxy-2.0.2-r4.ebuild} | 8 +++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)
 rename net-analyzer/sslyze/{sslyze-1.1.4-r1.ebuild => sslyze-1.1.4-r2.ebuild} (85%)
 rename net-proxy/mitmproxy/{mitmproxy-2.0.2-r3.ebuild => mitmproxy-2.0.2-r4.ebuild} (93%)

diff --git a/net-analyzer/sslyze/sslyze-1.1.4-r1.ebuild b/net-analyzer/sslyze/sslyze-1.1.4-r2.ebuild
similarity index 85%
rename from net-analyzer/sslyze/sslyze-1.1.4-r1.ebuild
rename to net-analyzer/sslyze/sslyze-1.1.4-r2.ebuild
index 695b33b10..6c3ee1518 100644
--- a/net-analyzer/sslyze/sslyze-1.1.4-r1.ebuild
+++ b/net-analyzer/sslyze/sslyze-1.1.4-r2.ebuild
@@ -23,6 +23,10 @@ RDEPEND="=dev-python/nassl-0.17*
 	>=dev-python/cryptography-1.9 <=dev-python/cryptography-2.0.3
 	=dev-python/tls_parser-1.1.0
 "
-
 #typing; python_version < '3.5'
 #enum34; python_version < '3.4'
+
+python_prepare_all(){
+	sed -e "s|cryptography==1.9|cryptography>=1.9, <=2.0.3|" -i setup.py
+	distutils-r1_python_prepare_all
+}
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 7827cadd9..ed34f3e85 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,2 +1 @@
-DIST mitmproxy-1.0.2.tar.gz 26781444 SHA256 0458b4ad3cedbc238decc7d736e693cd220c7977592b57052e181d404e1152b4 SHA512 9fc82da1557405476923dc3fa302c5489c0b71b0d834f8c1e804a67809e41fc997dcf608e6ce712393d35d73f316c7fa115d9014b9060419e4ebfa25fe3c4821 WHIRLPOOL 97c303d0e3b590a6d6e460d1c77cc84c102e01d3f9474ddf6906abede35abc441fd0b3c9824bcecdadb3b4c79c591630cfb93bd869ba1ed149dec8baad81a3c1
 DIST mitmproxy-2.0.2.tar.gz 28498343 SHA256 42e8cbcd27b85e60a165d1a28692098181813bbd9d7731a42b2cda68824c6c9d SHA512 8a38340b3b1dd73c99c9e9b06a59bff78a23b2a851e1032ee0b7354ac46c834a3d005a67dc5238030570719eb5f842cb2a8ce64ffc7c5a01cbfa9a9511c08e66 WHIRLPOOL 8c70b03b4838e7a0ad67de918b234bbcb22c57d4f627fef8cb646b3d2aac462af11aec282062874c7bf2d2a4a00424cacc4dacfa947596bef1cf3af83643afc3
diff --git a/net-proxy/mitmproxy/mitmproxy-2.0.2-r3.ebuild b/net-proxy/mitmproxy/mitmproxy-2.0.2-r4.ebuild
similarity index 93%
rename from net-proxy/mitmproxy/mitmproxy-2.0.2-r3.ebuild
rename to net-proxy/mitmproxy/mitmproxy-2.0.2-r4.ebuild
index 36d485a75..4ea8386cf 100644
--- a/net-proxy/mitmproxy/mitmproxy-2.0.2-r3.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-2.0.2-r4.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	>=dev-python/click-6.2[${PYTHON_USEDEP}] <dev-python/click-7
 	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
 	>=dev-python/construct-2.8[${PYTHON_USEDEP}] <dev-python/construct-2.9
-	>=dev-python/cryptography-1.3[${PYTHON_USEDEP}] <=dev-python/cryptography-2.0.2
+	>=dev-python/cryptography-1.3[${PYTHON_USEDEP}] <=dev-python/cryptography-2.0.3
 	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}] <dev-python/cssutils-1.1
 	>=dev-python/hyper-h2-2.5.1[${PYTHON_USEDEP}] <dev-python/hyper-h2-3
 	>=dev-python/html2text-2016.1.8[${PYTHON_USEDEP}] <=dev-python/html2text-2016.9.19
@@ -54,6 +54,12 @@ DEPEND="${RDEPEND}
 #fixme: bump it too
 #		=www-servers/pathod-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
 
+python_prepare_all() {
+	sed -e "s|cryptography>=1.3, <1.9|cryptography>=1.3, <=2.0.3|" -i setup.py
+	sed -e "s|pyOpenSSL>=16.0, <17.0|pyOpenSSL>=16.0, <=17.2.0|" -i setup.py
+	distutils-r1_python_prepare_all
+}
+
 python_prepare() {
 	#we allow to use 34 until 35 is stable
 	hack_python34() {