Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 0 insertions, 37 deletions

diff --git a/www/mitmproxy/files/patch-setup.py b/www/mitmproxy/files/patch-setup.py
deleted file mode 100644
index 96342f41ae46..000000000000
--- a/www/mitmproxy/files/patch-setup.py
+++ /dev/null
@@ -1,37 +0,0 @@
---- setup.py.orig	2021-09-28 16:43:29 UTC
-+++ setup.py
-@@ -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"': [