gentoo resync : 25.11.2020

3 files changed, 115 insertions, 1 deletions

diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 08ccb71bc2d2..2d9b248cc205 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,5 +1,7 @@
 DIST mitmproxy-5.1.1.tar.gz 27223155 BLAKE2B 38369eb07c41bde9f8e8c246ab5cc4fc6edfcd222f353624f4d2ae193f176228471aafdadd1b65238ccd808d778a69e1d140035be9116b87a75c286493747fe8 SHA512 ac5cd82d4d89590b57625661c493aca6a702605c612ea1acd9e0d0806067d47f60085ee68260bba2a10dc343410ae6a76ea1575287a0e312e4467a4e8485c6e1
 DIST mitmproxy-5.2.tar.gz 27251381 BLAKE2B d6bc5de8a3840a880664f52e011736cb640d324c6aa3846d4f2b3c2fc0d49467ab8ad3e8268a591cbe19d9f6dda5acc37fa2de705b4de1c1920b5003e10ea457 SHA512 6073c73b24618d6f64c4e99f199ebb6bc4157a3f83bfa7aff10a113f8dde823715e95bdf4202a1526dc0856d120858d32842b814327c3b98452b629fccb1790d
+DIST mitmproxy-5.3.0.tar.gz 27272534 BLAKE2B 2a35824616ca0a63a9e432a110adf14423df229568636456aa9d3959fc306b9ba30d8069c78cbc7c5950ef3e44526882b028c6ed05af417ef667b07215c258c6 SHA512 3f52f5285869de49c7c04ef9b6c0f3ef66689eb45fb6f9e971111049bf1aa0777e3e84b51f7031c1bdf105ce3f17fa4b03036d72617985b92996c6eea7566c38
 EBUILD mitmproxy-5.1.1.ebuild 2884 BLAKE2B a066a3006656839fb2e04efe8b17ae2db0b0db899958f359e5718341c3988d9870911c817eedd91680ee250ee2d2bd32c3b0706897c58ac8db73339a6d5ca5b7 SHA512 045fb1f56dcaf446d6d5396db7ee78c0dd9f10e15688b29a29fffde0efa1e1a2c5ee37795c2def434536da60cd8c0ae55142847cc2b7013e0a4a4406e46f046f
-EBUILD mitmproxy-5.2.ebuild 2382 BLAKE2B 899639d6769bd25192518d94f4352274c4bebaf4022d9309cdb8c6af81cd77f04c00d8605906b72d8dde7cc422bd45f4c965968d6ad1e324e6a51e40421c21c1 SHA512 46b95ce796156df2b5bf2b706a5cc8e06385db044a4337d3f624736d6ea7f2c2e5c711eef8cef0d724bcb2ac586a65fd20b97a18f3013ff1b93f7765ad3f338a
+EBUILD mitmproxy-5.2-r1.ebuild 3029 BLAKE2B 2d7de2fddfd8b9d939b33a66352fe830466135d32fe097588ede71d345fad0abd4881b3ddc89ad05a2e1e713f926fb7e133b94f0f5bfd7b6f82eec6a1f4fa140 SHA512 e803ead1473693b6a580db34eb958bf28b93866f37da5778e9586623eeb5e231957e53de2edc063e0d17807da28930085511b04bc1a51c4eabe7d80fdec54202
+EBUILD mitmproxy-5.3.0.ebuild 3164 BLAKE2B e5db2d54f2e1a065b7cab0b5f2a3823dc2ff455108aae1171b65d86b9896a21953dd5a5a9724e020cd26c04c58c72394d2c34b5f929c46e601a625f6715edbbd SHA512 fc0eae0b3b09742dd31a41045abdb9300f0bb5270bb08b498480549a62b2456eb31b470af3a9cce7693b674ffb68f2543035a8fc86d8d80d67d33e6b4704e10a
 MISC metadata.xml 1035 BLAKE2B 8d378cec75895df5c0fe8414ad37676de709f1c73242cbc23a0bfa6e4863ea234d99aa724c9ace560a91d6f9e533dd4281914ece0cd38df05dd7375b134211ff SHA512 3bdb95f97d85f63e93fafd18e5a6c82e20c12a1d27acae162b6aa6f3813d65dbc3f756e29cfb05cd9b515522e19973a636b05e28c01891dd2c1028172e7c3fb3
diff --git a/net-proxy/mitmproxy/mitmproxy-5.2.ebuild b/net-proxy/mitmproxy/mitmproxy-5.2-r1.ebuild
index d5ba12b4c7c2..67c9373c73f7 100644
--- a/net-proxy/mitmproxy/mitmproxy-5.2.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-5.2-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="sqlite"
 inherit distutils-r1
 
 DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
@@ -68,8 +69,24 @@ python_prepare_all() {
 	# remove failing test
 	sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die
 
+	# https://github.com/mitmproxy/mitmproxy/issues/4136
+	# https://bugs.gentoo.org/740336
+	rm test/mitmproxy/addons/test_termlog.py || die
+
 	# requires asynctest
 	rm test/mitmproxy/addons/test_readfile.py || die
 
+	# Passes with OpenSSL 1.1.1g, fails with OpenSSL 1.1.1h
+	# https://github.com/gentoo/gentoo/pull/17411#discussion_r497270699
+	sed \
+		-e 's/test_mode_none_should_pass_without_sni/_&/g' \
+		-e 's/test_mode_strict_w_pemfile_should_pass/_&/g' \
+		-e 's/test_mode_strict_w_confdir_should_pass/_&/g' \
+		-i test/mitmproxy/net/test_tcp.py || die
+	sed \
+		-e 's/test_verification_w_confdir/_&/g' \
+		-e 's/test_verification_w_pemfile/_&/g' \
+		-i test/mitmproxy/proxy/test_server.py || die
+
 	distutils-r1_python_prepare_all
 }
diff --git a/net-proxy/mitmproxy/mitmproxy-5.3.0.ebuild b/net-proxy/mitmproxy/mitmproxy-5.3.0.ebuild
new file mode 100644
index 000000000000..2809a55fe100
--- /dev/null
+++ b/net-proxy/mitmproxy/mitmproxy-5.3.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
+HOMEPAGE="https://mitmproxy.org/"
+SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl test"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.2.10[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
+	>=dev-python/click-6.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.9[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/hyperframe-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
+	>=dev-python/ldap3-2.8[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-19.1[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.16[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.1[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
+	>=dev-python/urwid-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/wsproto-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( >=dev-libs/libressl-3.2.0:0 )
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/flask-1.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.50.8[${PYTHON_USEDEP}]
+		>=dev-python/parver-0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.10.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
+		>=dev-python/zstandard-0.8.1[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="!test? ( test )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# loosen dependencies
+	sed -i \
+		-e '/>/s/>.*/",/g' \
+		-e '/urwid/s/==2\.0\.1,!=2\.1\.0//' \
+		setup.py || die
+
+	# remove failing test
+	sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die
+
+	# https://github.com/mitmproxy/mitmproxy/issues/4136
+	# https://bugs.gentoo.org/740336
+	rm test/mitmproxy/addons/test_termlog.py || die
+
+	# requires asynctest
+	rm test/mitmproxy/addons/test_readfile.py || die
+
+	# Passes with OpenSSL 1.1.1g, fails with OpenSSL 1.1.1h
+	# https://github.com/gentoo/gentoo/pull/17411#discussion_r497270699
+	sed \
+		-e 's/test_mode_none_should_pass_without_sni/_&/g' \
+		-e 's/test_mode_strict_w_pemfile_should_pass/_&/g' \
+		-e 's/test_mode_strict_w_confdir_should_pass/_&/g' \
+		-i test/mitmproxy/net/test_tcp.py || die
+	sed \
+		-e 's/test_verification_w_confdir/_&/g' \
+		-e 's/test_verification_w_pemfile/_&/g' \
+		-i test/mitmproxy/proxy/test_server.py || die
+
+	distutils-r1_python_prepare_all
+}