aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Polański <michal@polanski.me>2021-01-14 22:06:27 +0100
committerLeo <thinkabit.ukim@gmail.com>2021-01-14 21:42:01 +0000
commit159f660943949d618c2d0d7a4ccf7a876ee28bfe (patch)
treea39b0780ad4ebfe98f5af5ccb6371f7cc330facb
parentebd31e5d3c97a0db288c2623cf884caec927f41d (diff)
downloadaports-159f660943949d618c2d0d7a4ccf7a876ee28bfe.tar.gz
aports-159f660943949d618c2d0d7a4ccf7a876ee28bfe.tar.bz2
aports-159f660943949d618c2d0d7a4ccf7a876ee28bfe.tar.xz
testing/mitmproxy: depend on py3-certifi now that is uses system certs
-rw-r--r--testing/mitmproxy/APKBUILD12
-rw-r--r--testing/mitmproxy/use-system-ca-certificates.patch24
2 files changed, 4 insertions, 32 deletions
diff --git a/testing/mitmproxy/APKBUILD b/testing/mitmproxy/APKBUILD
index 7eea40c0d3..b6f43d35e0 100644
--- a/testing/mitmproxy/APKBUILD
+++ b/testing/mitmproxy/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=mitmproxy
pkgver=5.3.0
-pkgrel=0
+pkgrel=1
pkgdesc="Interactive TLS-capable intercepting HTTP proxy"
url="https://mitmproxy.org/"
license="MIT"
@@ -14,6 +14,7 @@ depends="
py3-asgiref
py3-blinker
py3-brotli
+ py3-certifi
py3-click
py3-cryptography
py3-flask
@@ -43,8 +44,7 @@ checkdepends="
py3-pytest-asyncio
py3-requests
"
-source="$pkgname-$pkgver.tar.gz::https://github.com/mitmproxy/mitmproxy/archive/v$pkgver.tar.gz
- use-system-ca-certificates.patch"
+source="$pkgname-$pkgver.tar.gz::https://github.com/mitmproxy/mitmproxy/archive/v$pkgver.tar.gz"
prepare() {
default_prepare
@@ -54,9 +54,6 @@ prepare() {
# relax constraints on required dependencies
sed -E "s/, *<[0-9=.]*//" -i setup.py
-
- # remove unneeded dependency on certifi
- sed "/certifi/d" -i setup.py
}
build() {
@@ -75,5 +72,4 @@ package() {
rm -r "$pkgdir"/usr/lib/python3.*/site-packages/pathod
}
-sha512sums="3f52f5285869de49c7c04ef9b6c0f3ef66689eb45fb6f9e971111049bf1aa0777e3e84b51f7031c1bdf105ce3f17fa4b03036d72617985b92996c6eea7566c38 mitmproxy-5.3.0.tar.gz
-c8f19067394169c2e85f203351b8a4753bec3bc6498fc184fd4691e8a9f60a60de3c671285b36c6808e209d87254a329eff296efd12b79702153e029754e7c5c use-system-ca-certificates.patch"
+sha512sums="3f52f5285869de49c7c04ef9b6c0f3ef66689eb45fb6f9e971111049bf1aa0777e3e84b51f7031c1bdf105ce3f17fa4b03036d72617985b92996c6eea7566c38 mitmproxy-5.3.0.tar.gz"
diff --git a/testing/mitmproxy/use-system-ca-certificates.patch b/testing/mitmproxy/use-system-ca-certificates.patch
deleted file mode 100644
index 2af14b093f..0000000000
--- a/testing/mitmproxy/use-system-ca-certificates.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream: No
-Reason: Use system CA certificates
-
-diff --git a/mitmproxy/net/tls.py b/mitmproxy/net/tls.py
-index 8e217ec0c..125d9874f 100644
---- a/mitmproxy/net/tls.py
-+++ b/mitmproxy/net/tls.py
-@@ -8,7 +8,6 @@ import struct
- import threading
- import typing
-
--import certifi
- from OpenSSL import SSL
- from kaitaistruct import KaitaiStream
-
-@@ -178,7 +177,7 @@ def _create_ssl_context(
- if verify is not None:
- context.set_verify(verify, verify_callback)
- if ca_path is None and ca_pemfile is None:
-- ca_pemfile = certifi.where()
-+ ca_pemfile = "/etc/ssl/certs/ca-certificates.crt"
- try:
- context.load_verify_locations(ca_pemfile, ca_path)
- except SSL.Error: