aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Polański <michal@polanski.me>2021-04-08 21:10:24 +0200
committerMichał Polański <michal@polanski.me>2021-04-17 19:04:31 +0200
commit59efece9b647473dd7e3e07d74bb16b5171c52d0 (patch)
treef23f805c88de7b52fd0ce551573680a075efa46e
parent5c1f7ecfd7d0a155763a6c39003edbd318909f46 (diff)
downloadaports-59efece9b647473dd7e3e07d74bb16b5171c52d0.tar.gz
aports-59efece9b647473dd7e3e07d74bb16b5171c52d0.tar.bz2
aports-59efece9b647473dd7e3e07d74bb16b5171c52d0.tar.xz
testing/mitmproxy: upgrade to 6.0.2
-rw-r--r--testing/mitmproxy/APKBUILD11
-rw-r--r--testing/mitmproxy/test-proxy.patch16
2 files changed, 23 insertions, 4 deletions
diff --git a/testing/mitmproxy/APKBUILD b/testing/mitmproxy/APKBUILD
index 2b1e83d8a0..484bbbafa6 100644
--- a/testing/mitmproxy/APKBUILD
+++ b/testing/mitmproxy/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Michał Polański <michal@polanski.me>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=mitmproxy
-pkgver=5.3.0
-pkgrel=3
+pkgver=6.0.2
+pkgrel=0
pkgdesc="Interactive TLS-capable intercepting HTTP proxy"
url="https://mitmproxy.org/"
license="MIT"
@@ -44,7 +44,9 @@ checkdepends="
py3-pytest-asyncio
py3-requests
"
-source="$pkgname-$pkgver.tar.gz::https://github.com/mitmproxy/mitmproxy/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/mitmproxy/mitmproxy/archive/v$pkgver.tar.gz
+ test-proxy.patch
+ "
prepare() {
default_prepare
@@ -72,4 +74,5 @@ package() {
rm -r "$pkgdir"/usr/lib/python3.*/site-packages/pathod
}
-sha512sums="3f52f5285869de49c7c04ef9b6c0f3ef66689eb45fb6f9e971111049bf1aa0777e3e84b51f7031c1bdf105ce3f17fa4b03036d72617985b92996c6eea7566c38 mitmproxy-5.3.0.tar.gz"
+sha512sums="27eb5e9736891148b5ebec963a2d18de6a69b44428538d2ed1cf9a1dcdd7cbcdeeed662edb2d25521098374e2f9a29b5bb8fba8da4f77ac0d32bf7881ac70d61 mitmproxy-6.0.2.tar.gz
+b4809e4699e605666fc01aaad694ee8ea3a1e5cdf901b00723e49e9bb98a1ba88319b5e24a2f1c8e7435c5552b26de390655d0852ef7bfcace2e32ae4db348eb test-proxy.patch"
diff --git a/testing/mitmproxy/test-proxy.patch b/testing/mitmproxy/test-proxy.patch
new file mode 100644
index 0000000000..0a562085e8
--- /dev/null
+++ b/testing/mitmproxy/test-proxy.patch
@@ -0,0 +1,16 @@
+Upstream: No
+Reason: Skip test which fails when user can bind to privileged ports,
+see: https://github.com/mitmproxy/mitmproxy/issues/2730#issuecomment-354542118
+
+diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py
+index 6c82359b9..eb5f13d7e 100644
+--- a/test/mitmproxy/test_proxy.py
++++ b/test/mitmproxy/test_proxy.py
+@@ -52,6 +53,7 @@ class TestProxyServer:
+
+ @skip_windows
+ @pytest.mark.skipif(platform.system() != "Linux", reason="Linux-only")
++ @pytest.mark.skip(reason="CI can bind to privileged ports which makes this test fail")
+ def test_err(self):
+ # binding to 0.0.0.0:1 works without special permissions on Windows and macOS Mojave+
+ conf = ProxyConfig(options.Options(listen_port=1))