Received: by mail.netbsd.org (Postfix, from userid 605) id 1383884D80; Sat, 18 Jun 2022 20:38:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4C55684D45 for ; Sat, 18 Jun 2022 20:38:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id vtcSVEFPVYqH for ; Sat, 18 Jun 2022 20:38:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 03A7884D27 for ; Sat, 18 Jun 2022 20:38:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0BF52FB1A; Sat, 18 Jun 2022 20:40:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1655584818292310" MIME-Version: 1.0 Date: Sat, 18 Jun 2022 20:40:18 +0000 From: "Leonardo Taccari" Subject: CVS commit: pkgsrc/net/mitmproxy To: pkgsrc-changes@NetBSD.org Reply-To: leot@netbsd.org X-Mailer: log_accum Message-Id: <20220618204018.0BF52FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1655584818292310 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Sat Jun 18 20:40:17 UTC 2022 Modified Files: pkgsrc/net/mitmproxy: Makefile PLIST distinfo Log Message: mitmproxy: Update to 8.1.0 pkgsrc changes: - Now needs Python>=3.9 per upstream - Further relax py-cryptography needs (seems to runs fine also with older py-cryptography) because in pkgsrc we do not have yet cryptography>=36. Changes: ## 15 May 2022: mitmproxy 8.1.0 * Mostly a Bug fix release * DNS support * Mitmproxy now requires Python 3.9 or above. ## 19 March 2022: mitmproxy 8.0.0 ### Major Changes * Major improvements to the web interface * Event hooks can now be async * New `tls_{established,failed}_{client,server}` event hooks to record negotiation success/failure ### Security Fixes * CVE-2022-24766: Fix request smuggling vulnerability reported by @zeyu2001 To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/mitmproxy/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/mitmproxy/PLIST cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/mitmproxy/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1655584818292310 Content-Disposition: inline Content-Length: 13052 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/mitmproxy/Makefile diff -u pkgsrc/net/mitmproxy/Makefile:1.38 pkgsrc/net/mitmproxy/Makefile:1.39 --- pkgsrc/net/mitmproxy/Makefile:1.38 Mon Jan 10 22:43:41 2022 +++ pkgsrc/net/mitmproxy/Makefile Sat Jun 18 20:40:17 2022 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.38 2022/01/10 22:43:41 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2022/06/18 20:40:17 leot Exp $ -DISTNAME= mitmproxy-7.0.3 -PKGREVISION= 1 +DISTNAME= mitmproxy-8.1.0 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=mitmproxy/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -11,15 +10,16 @@ HOMEPAGE= https://mitmproxy.org/ COMMENT= Interactive console program for inspecting and editing traffic flows LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=20.0:../../security/py-OpenSSL +DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=21.0:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-asgiref>=3.2.10:../../www/py-asgiref DEPENDS+= ${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker DEPENDS+= ${PYPKGPREFIX}-brotli>=1.0:../../archivers/py-brotli DEPENDS+= ${PYPKGPREFIX}-certifi>=2019.9.11:../../security/py-certifi DEPENDS+= ${PYPKGPREFIX}-click>=7.0:../../devel/py-click -DEPENDS+= ${PYPKGPREFIX}-cryptography>=3.3:../../security/py-cryptography +DEPENDS+= ${PYPKGPREFIX}-cryptography>=3.3:../../security/py-cryptography # XXX: should be >=36 DEPENDS+= ${PYPKGPREFIX}-flask>=1.1.1:../../www/py-flask -DEPENDS+= ${PYPKGPREFIX}-h2>=4.0:../../www/py-h2 +DEPENDS+= ${PYPKGPREFIX}-h11>=0.11:../../www/py-h11 +DEPENDS+= ${PYPKGPREFIX}-h2>=4.1:../../www/py-h2 DEPENDS+= ${PYPKGPREFIX}-hyperframe>=6.0:../../www/py-hyperframe DEPENDS+= ${PYPKGPREFIX}-kaitaistruct>=0.7:../../devel/py-kaitaistruct DEPENDS+= ${PYPKGPREFIX}-ldap3>=2.8:../../databases/py-ldap3 @@ -32,7 +32,7 @@ DEPENDS+= ${PYPKGPREFIX}-pyperclip>=1.6. DEPENDS+= ${PYPKGPREFIX}-ruamel-yaml>=0.16:../../devel/py-ruamel-yaml DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=2.3:../../devel/py-sortedcontainers -DEPENDS+= ${PYPKGPREFIX}-tornado>=4.3.0:../../www/py-tornado +DEPENDS+= ${PYPKGPREFIX}-tornado>=6.1:../../www/py-tornado DEPENDS+= ${PYPKGPREFIX}-urwid>=2.1.1:../../devel/py-urwid DEPENDS+= ${PYPKGPREFIX}-wsproto>=1.0:../../www/py-wsproto DEPENDS+= ${PYPKGPREFIX}-zstandard>=0.11.0:../../archivers/py-zstandard @@ -41,15 +41,18 @@ SUBST_CLASSES+= setuppyversions SUBST_STAGE.setuppyversions= pre-configure SUBST_MESSAGE.setuppyversions= Avoid too strict version requirements SUBST_FILES.setuppyversions= setup.py -SUBST_SED.setuppyversions= -E -e '/[>=]=/ s/, *(<|!=)[^"]+//g' +SUBST_SED.setuppyversions+= -E -e '/[>=]=/ s/, *(<|!=)[^"]+//g' SUBST_SED.setuppyversions+= -E -e '/==[0-9.]+",/ s/==/>=/g' +# XXX: Lower down crypography requirements to avoid possible big cryptography +# XXX: update to >=36 not yet done in pkgsrc. +SUBST_SED.setuppyversions+= -E -e 's/cryptography>=36/cryptography>=3.3/' REPLACE_SH+= mitmproxy/contrib/kaitaistruct/make.sh USE_LANGUAGES= # none -# Only for Python >=3.8 -PYTHON_VERSIONS_INCOMPATIBLE= 27 37 +# Only for Python >=3.9 +PYTHON_VERSIONS_INCOMPATIBLE= 27 37 38 .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" Index: pkgsrc/net/mitmproxy/PLIST diff -u pkgsrc/net/mitmproxy/PLIST:1.19 pkgsrc/net/mitmproxy/PLIST:1.20 --- pkgsrc/net/mitmproxy/PLIST:1.19 Mon Jan 10 22:43:41 2022 +++ pkgsrc/net/mitmproxy/PLIST Sat Jun 18 20:40:17 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2022/01/10 22:43:41 wiz Exp $ +@comment $NetBSD: PLIST,v 1.20 2022/06/18 20:40:17 leot Exp $ bin/mitmdump bin/mitmproxy bin/mitmweb @@ -53,9 +53,15 @@ ${PYSITELIB}/mitmproxy/addons/cut.pyo ${PYSITELIB}/mitmproxy/addons/disable_h2c.py ${PYSITELIB}/mitmproxy/addons/disable_h2c.pyc ${PYSITELIB}/mitmproxy/addons/disable_h2c.pyo +${PYSITELIB}/mitmproxy/addons/dns_resolver.py +${PYSITELIB}/mitmproxy/addons/dns_resolver.pyc +${PYSITELIB}/mitmproxy/addons/dns_resolver.pyo ${PYSITELIB}/mitmproxy/addons/dumper.py ${PYSITELIB}/mitmproxy/addons/dumper.pyc ${PYSITELIB}/mitmproxy/addons/dumper.pyo +${PYSITELIB}/mitmproxy/addons/errorcheck.py +${PYSITELIB}/mitmproxy/addons/errorcheck.pyc +${PYSITELIB}/mitmproxy/addons/errorcheck.pyo ${PYSITELIB}/mitmproxy/addons/eventstore.py ${PYSITELIB}/mitmproxy/addons/eventstore.pyc ${PYSITELIB}/mitmproxy/addons/eventstore.pyo @@ -116,6 +122,9 @@ ${PYSITELIB}/mitmproxy/addons/save.pyo ${PYSITELIB}/mitmproxy/addons/script.py ${PYSITELIB}/mitmproxy/addons/script.pyc ${PYSITELIB}/mitmproxy/addons/script.pyo +${PYSITELIB}/mitmproxy/addons/server_side_events.py +${PYSITELIB}/mitmproxy/addons/server_side_events.pyc +${PYSITELIB}/mitmproxy/addons/server_side_events.pyo ${PYSITELIB}/mitmproxy/addons/serverplayback.py ${PYSITELIB}/mitmproxy/addons/serverplayback.pyc ${PYSITELIB}/mitmproxy/addons/serverplayback.pyo @@ -164,6 +173,9 @@ ${PYSITELIB}/mitmproxy/contentviews/css. ${PYSITELIB}/mitmproxy/contentviews/graphql.py ${PYSITELIB}/mitmproxy/contentviews/graphql.pyc ${PYSITELIB}/mitmproxy/contentviews/graphql.pyo +${PYSITELIB}/mitmproxy/contentviews/grpc.py +${PYSITELIB}/mitmproxy/contentviews/grpc.pyc +${PYSITELIB}/mitmproxy/contentviews/grpc.pyo ${PYSITELIB}/mitmproxy/contentviews/hex.py ${PYSITELIB}/mitmproxy/contentviews/hex.pyc ${PYSITELIB}/mitmproxy/contentviews/hex.pyo @@ -210,6 +222,9 @@ ${PYSITELIB}/mitmproxy/contrib/README ${PYSITELIB}/mitmproxy/contrib/__init__.py ${PYSITELIB}/mitmproxy/contrib/__init__.pyc ${PYSITELIB}/mitmproxy/contrib/__init__.pyo +${PYSITELIB}/mitmproxy/contrib/click/__init__.py +${PYSITELIB}/mitmproxy/contrib/click/__init__.pyc +${PYSITELIB}/mitmproxy/contrib/click/__init__.pyo ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/__init__.py ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/__init__.pyc ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/__init__.pyo @@ -245,9 +260,15 @@ ${PYSITELIB}/mitmproxy/contrib/kaitaistr ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/vlq_base128_le.py ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/vlq_base128_le.pyc ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/vlq_base128_le.pyo +${PYSITELIB}/mitmproxy/contrib/tornado/__init__.py +${PYSITELIB}/mitmproxy/contrib/tornado/__init__.pyc +${PYSITELIB}/mitmproxy/contrib/tornado/__init__.pyo ${PYSITELIB}/mitmproxy/contrib/urwid/__init__.py ${PYSITELIB}/mitmproxy/contrib/urwid/__init__.pyc ${PYSITELIB}/mitmproxy/contrib/urwid/__init__.pyo +${PYSITELIB}/mitmproxy/contrib/urwid/escape_patches.py +${PYSITELIB}/mitmproxy/contrib/urwid/escape_patches.pyc +${PYSITELIB}/mitmproxy/contrib/urwid/escape_patches.pyo ${PYSITELIB}/mitmproxy/contrib/urwid/raw_display.py ${PYSITELIB}/mitmproxy/contrib/urwid/raw_display.pyc ${PYSITELIB}/mitmproxy/contrib/urwid/raw_display.pyo @@ -275,9 +296,6 @@ ${PYSITELIB}/mitmproxy/contrib/wbxml/Inv ${PYSITELIB}/mitmproxy/contrib/wbxml/__init__.py ${PYSITELIB}/mitmproxy/contrib/wbxml/__init__.pyc ${PYSITELIB}/mitmproxy/contrib/wbxml/__init__.pyo -${PYSITELIB}/mitmproxy/controller.py -${PYSITELIB}/mitmproxy/controller.pyc -${PYSITELIB}/mitmproxy/controller.pyo ${PYSITELIB}/mitmproxy/coretypes/__init__.py ${PYSITELIB}/mitmproxy/coretypes/__init__.pyc ${PYSITELIB}/mitmproxy/coretypes/__init__.pyo @@ -296,6 +314,9 @@ ${PYSITELIB}/mitmproxy/coretypes/seriali ${PYSITELIB}/mitmproxy/ctx.py ${PYSITELIB}/mitmproxy/ctx.pyc ${PYSITELIB}/mitmproxy/ctx.pyo +${PYSITELIB}/mitmproxy/dns.py +${PYSITELIB}/mitmproxy/dns.pyc +${PYSITELIB}/mitmproxy/dns.pyo ${PYSITELIB}/mitmproxy/eventsequence.py ${PYSITELIB}/mitmproxy/eventsequence.pyc ${PYSITELIB}/mitmproxy/eventsequence.pyo @@ -338,6 +359,24 @@ ${PYSITELIB}/mitmproxy/net/__init__.pyo ${PYSITELIB}/mitmproxy/net/check.py ${PYSITELIB}/mitmproxy/net/check.pyc ${PYSITELIB}/mitmproxy/net/check.pyo +${PYSITELIB}/mitmproxy/net/dns/__init__.py +${PYSITELIB}/mitmproxy/net/dns/__init__.pyc +${PYSITELIB}/mitmproxy/net/dns/__init__.pyo +${PYSITELIB}/mitmproxy/net/dns/classes.py +${PYSITELIB}/mitmproxy/net/dns/classes.pyc +${PYSITELIB}/mitmproxy/net/dns/classes.pyo +${PYSITELIB}/mitmproxy/net/dns/domain_names.py +${PYSITELIB}/mitmproxy/net/dns/domain_names.pyc +${PYSITELIB}/mitmproxy/net/dns/domain_names.pyo +${PYSITELIB}/mitmproxy/net/dns/op_codes.py +${PYSITELIB}/mitmproxy/net/dns/op_codes.pyc +${PYSITELIB}/mitmproxy/net/dns/op_codes.pyo +${PYSITELIB}/mitmproxy/net/dns/response_codes.py +${PYSITELIB}/mitmproxy/net/dns/response_codes.pyc +${PYSITELIB}/mitmproxy/net/dns/response_codes.pyo +${PYSITELIB}/mitmproxy/net/dns/types.py +${PYSITELIB}/mitmproxy/net/dns/types.pyc +${PYSITELIB}/mitmproxy/net/dns/types.pyo ${PYSITELIB}/mitmproxy/net/encoding.py ${PYSITELIB}/mitmproxy/net/encoding.pyc ${PYSITELIB}/mitmproxy/net/encoding.pyo @@ -377,6 +416,9 @@ ${PYSITELIB}/mitmproxy/net/server_spec.p ${PYSITELIB}/mitmproxy/net/tls.py ${PYSITELIB}/mitmproxy/net/tls.pyc ${PYSITELIB}/mitmproxy/net/tls.pyo +${PYSITELIB}/mitmproxy/net/udp.py +${PYSITELIB}/mitmproxy/net/udp.pyc +${PYSITELIB}/mitmproxy/net/udp.pyo ${PYSITELIB}/mitmproxy/options.py ${PYSITELIB}/mitmproxy/options.pyc ${PYSITELIB}/mitmproxy/options.pyo @@ -419,6 +461,9 @@ ${PYSITELIB}/mitmproxy/proxy/layer.pyo ${PYSITELIB}/mitmproxy/proxy/layers/__init__.py ${PYSITELIB}/mitmproxy/proxy/layers/__init__.pyc ${PYSITELIB}/mitmproxy/proxy/layers/__init__.pyo +${PYSITELIB}/mitmproxy/proxy/layers/dns.py +${PYSITELIB}/mitmproxy/proxy/layers/dns.pyc +${PYSITELIB}/mitmproxy/proxy/layers/dns.pyo ${PYSITELIB}/mitmproxy/proxy/layers/http/__init__.py ${PYSITELIB}/mitmproxy/proxy/layers/http/__init__.pyc ${PYSITELIB}/mitmproxy/proxy/layers/http/__init__.pyo @@ -489,6 +534,9 @@ ${PYSITELIB}/mitmproxy/test/tflow.pyo ${PYSITELIB}/mitmproxy/test/tutils.py ${PYSITELIB}/mitmproxy/test/tutils.pyc ${PYSITELIB}/mitmproxy/test/tutils.pyo +${PYSITELIB}/mitmproxy/tls.py +${PYSITELIB}/mitmproxy/tls.pyc +${PYSITELIB}/mitmproxy/tls.pyo ${PYSITELIB}/mitmproxy/tools/__init__.py ${PYSITELIB}/mitmproxy/tools/__init__.pyc ${PYSITELIB}/mitmproxy/tools/__init__.pyo @@ -612,18 +660,22 @@ ${PYSITELIB}/mitmproxy/tools/web/static/ ${PYSITELIB}/mitmproxy/tools/web/static/fonts/fontawesome-webfont.svg ${PYSITELIB}/mitmproxy/tools/web/static/fonts/fontawesome-webfont.ttf ${PYSITELIB}/mitmproxy/tools/web/static/fonts/fontawesome-webfont.woff +${PYSITELIB}/mitmproxy/tools/web/static/fonts/fontawesome-webfont.woff2 ${PYSITELIB}/mitmproxy/tools/web/static/images/chrome-devtools/LICENSE ${PYSITELIB}/mitmproxy/tools/web/static/images/chrome-devtools/resourceCSSIcon.png ${PYSITELIB}/mitmproxy/tools/web/static/images/chrome-devtools/resourceDocumentIcon.png ${PYSITELIB}/mitmproxy/tools/web/static/images/chrome-devtools/resourceJSIcon.png ${PYSITELIB}/mitmproxy/tools/web/static/images/chrome-devtools/resourcePlainIcon.png ${PYSITELIB}/mitmproxy/tools/web/static/images/favicon.ico +${PYSITELIB}/mitmproxy/tools/web/static/images/resourceDnsIcon.png ${PYSITELIB}/mitmproxy/tools/web/static/images/resourceExecutableIcon.png ${PYSITELIB}/mitmproxy/tools/web/static/images/resourceFlashIcon.png ${PYSITELIB}/mitmproxy/tools/web/static/images/resourceImageIcon.png ${PYSITELIB}/mitmproxy/tools/web/static/images/resourceJavaIcon.png ${PYSITELIB}/mitmproxy/tools/web/static/images/resourceNotModifiedIcon.png ${PYSITELIB}/mitmproxy/tools/web/static/images/resourceRedirectIcon.png +${PYSITELIB}/mitmproxy/tools/web/static/images/resourceTcpIcon.png +${PYSITELIB}/mitmproxy/tools/web/static/images/resourceWebSocketIcon.png ${PYSITELIB}/mitmproxy/tools/web/static/static.js ${PYSITELIB}/mitmproxy/tools/web/static/vendor.css ${PYSITELIB}/mitmproxy/tools/web/static/vendor.js @@ -673,6 +725,9 @@ ${PYSITELIB}/mitmproxy/utils/strutils.py ${PYSITELIB}/mitmproxy/utils/typecheck.py ${PYSITELIB}/mitmproxy/utils/typecheck.pyc ${PYSITELIB}/mitmproxy/utils/typecheck.pyo +${PYSITELIB}/mitmproxy/utils/vt_codes.py +${PYSITELIB}/mitmproxy/utils/vt_codes.pyc +${PYSITELIB}/mitmproxy/utils/vt_codes.pyo ${PYSITELIB}/mitmproxy/version.py ${PYSITELIB}/mitmproxy/version.pyc ${PYSITELIB}/mitmproxy/version.pyo Index: pkgsrc/net/mitmproxy/distinfo diff -u pkgsrc/net/mitmproxy/distinfo:1.27 pkgsrc/net/mitmproxy/distinfo:1.28 --- pkgsrc/net/mitmproxy/distinfo:1.27 Tue Oct 26 11:06:00 2021 +++ pkgsrc/net/mitmproxy/distinfo Sat Jun 18 20:40:17 2022 @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.27 2021/10/26 11:06:00 nia Exp $ +$NetBSD: distinfo,v 1.28 2022/06/18 20:40:17 leot Exp $ -BLAKE2s (mitmproxy-7.0.3.tar.gz) = c5a2f16d5d20e2751be3fafeeb35f1f5fdd9374930295d14721ee3c3040d9ea6 -SHA512 (mitmproxy-7.0.3.tar.gz) = cffbb60421724fa28aab69b3bf1100e0aa5ab6e8933186f5706eb4eee35ef0f716616001156dac07921c73024e6ad8b98499a273575c592bb7694c0dffb728da -Size (mitmproxy-7.0.3.tar.gz) = 27311502 bytes +BLAKE2s (mitmproxy-8.1.0.tar.gz) = b69117332aac601ae40511492962089164b16bceb0eb34bf27e186d80ed80e62 +SHA512 (mitmproxy-8.1.0.tar.gz) = 47e0924b1fc2999cbc038295dbb43a78eef4120a31c9445aba7b1f31e90aa4d859c5e2665a429f16c5cf7a6f9f29a7d6a50bb09a1e54c2e1693714c28d5153e1 +Size (mitmproxy-8.1.0.tar.gz) = 27940706 bytes --_----------=_1655584818292310--