diff --git a/www/mitmproxy/Makefile b/www/mitmproxy/Makefile index c13a80cba6dd..fc7f32864b31 100644 --- a/www/mitmproxy/Makefile +++ b/www/mitmproxy/Makefile @@ -1,58 +1,59 @@ # Created by: Hung-Yi Chen PORTNAME= mitmproxy PORTVERSION= 7.0.4 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www python MAINTAINER= gaod@hychen.org COMMENT= SSL-capable man-in-the-middle proxy LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asgiref>=3.2.10:www/py-asgiref@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}blinker>=1.4:devel/py-blinker@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}brotli>=1.0:archivers/py-brotli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certifi>=2019.9.11:security/py-certifi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cryptography>=3.3:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Flask>=1.1.1:www/py-flask@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h11>=0.11:net/py-h11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h2>=4.0:www/py-h2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hyperframe>=6.0:www/py-hyperframe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}kaitaistruct>=0.7:devel/py-kaitaistruct@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ldap3>=2.8:net/py-ldap3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markupsafe>=2.0.0:textproc/py-markupsafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.0:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.5:security/py-passlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.14:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=20.0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.4.2:devel/py-pyparsing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.6.0:devel/py-pyperclip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.16:devel/py-ruamel.yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=2.3:devel/py-sortedcontainers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urwid>=2.1.1:devel/py-urwid@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wsproto>=1.0.0:net/py-wsproto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}publicsuffix2>=2.20190812:dns/py-publicsuffix2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zstandard>=0.11:archivers/py-zstandard@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parver>0:devel/py-parver@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USES= cpe python:3.8+ USE_PYTHON= distutils autoplist noflavors USE_GITHUB= yes NO_ARCH= yes do-test: @cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -rs -v .include diff --git a/www/mitmproxy/files/patch-setup.py b/www/mitmproxy/files/patch-setup.py index 148d88850985..96342f41ae46 100644 --- a/www/mitmproxy/files/patch-setup.py +++ b/www/mitmproxy/files/patch-setup.py @@ -1,29 +1,37 @@ --- setup.py.orig 2021-09-28 16:43:29 UTC +++ setup.py -@@ -67,7 +67,7 @@ setup( +@@ -67,14 +67,14 @@ setup( # https://packaging.python.org/en/latest/requirements/#install-requires # It is not considered best practice to use install_requires to pin dependencies to specific versions. install_requires=[ - "asgiref>=3.2.10,<3.5", + "asgiref>=3.2.10,<3.6", "blinker>=1.4, <1.5", "Brotli>=1.0,<1.1", "certifi>=2019.9.11", # no semver here - this should always be on the last release! + "click>=7.0,<8.1", + "cryptography>=3.3,<3.5", + "flask>=1.1.1,<2.1", +- "h11>=0.11,<0.13", ++ "h11>=0.11,<0.14", + "h2>=4.0,<5", + "hyperframe>=6.0,<7", + "kaitaistruct>=0.7,<0.10", @@ -83,7 +83,7 @@ setup( "passlib>=1.6.5, <1.8", "protobuf>=3.14,<3.19", "pyOpenSSL>=20.0,<20.1", - "pyparsing>=2.4.2,<2.5", + "pyparsing>=2.4.2,<3.1", "pyperclip>=1.6.0,<1.9", "ruamel.yaml>=0.16,<0.17.17", "sortedcontainers>=2.3,<2.5", @@ -91,7 +91,7 @@ setup( "urwid>=2.1.1,<2.2", "wsproto>=1.0,<1.1", "publicsuffix2>=2.20190812,<3", - "zstandard>=0.11,<0.16", + "zstandard>=0.11,<0.18", ], extras_require={ ':sys_platform == "win32"': [