Received: by mail.netbsd.org (Postfix, from userid 605) id C8D2C84D48; Tue, 17 Dec 2019 10:21:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 51FFF84D38 for ; Tue, 17 Dec 2019 10:21:52 +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 t-84svFb5FWB for ; Tue, 17 Dec 2019 10:21:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 57B2284CD3 for ; Tue, 17 Dec 2019 10:21:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5149BFA97; Tue, 17 Dec 2019 10:21:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157657811164540" MIME-Version: 1.0 Date: Tue, 17 Dec 2019 10:21:51 +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: <20191217102151.5149BFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157657811164540 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Tue Dec 17 10:21:51 UTC 2019 Modified Files: pkgsrc/net/mitmproxy: Makefile PLIST distinfo Removed Files: pkgsrc/net/mitmproxy/patches: patch-mitmproxy_proxy_protocol_websocket.py Log Message: mitmproxy: Update to 5.0.0 Changes: 5.0.0 ----- ** Major Changes ** * Added new Table UI (@Jessonsotoventura) * Added EKU extension to certificates. This fixes support for macOS Catalina (@vin01) ** Security Fixes ** * Fixed command injection vulnerabilities when exporting flows as curl/httpie commands (@cript0nauta) * Do not echo unsanitized user input in HTTP error responses (@fimad) ** Full Changelog ** * Moved to Github CI for Continuous Integration, dropping support for old Linux and macOS releases. (#3728) * Vastly improved command parsing, in particular for setting flow filters (@typoon) * Added a new flow export for raw responses (@mckeimic) * URLs are now edited in an external editor (@Jessonsotoventura) * mitmproxy now has a command history (@typoon) * Added terminal like keyboard shortcuts for the command bar (ctrl+w, ctrl+a, ctrl+f, ...) (@typoon) * Fixed issue with improper handling of non-ascii characters in URLs (@rjt-gupta) * Filtering can now use unicode characters (@rjt-gupta) * Fixed issue with user keybindings not being able to override default keybindings * Improved installation instructions * Added support for IPV6-only environments (@sethb157) * Fixed bug with server replay (@rjt-gupta) * Fixed issue with duplicate error responses (@ccssrryy) * Users can now set a specific external editor using $MITMPROXY_EDITOR (@rjt-gupta) * Config file can now be called `config.yml` or `config.yaml` (@ylmrx) * Fixed crash on `view.focus.[next|prev]` (@ylmrx) * Updated documentation to help using mitmproxy certificate on Android (@jannst) * Added support to parse IPv6 entries from `pfctl` on MacOS. (@tomlabaude) * Fixed instructions on how to build the documentation (@jannst) * Added a new `--allow-hosts` option (@pierlon) * Added support for zstd content-encoding (@tsaaristo) * Fixed issue where the replay server would corrupt the Date header (@tonyb486) * Improve speed for WebSocket interception (@MathieuBordere) * Fixed issue with parsing JPEG files. (@lusceu) * Improve example code style (@BoboTiG) * Fixed issue converting void responses to HAR (@worldmind) * Color coded http status codes in mitmweb (@arun-94) * Added organization to generated certificates (@Abcdefghijklmnopqrstuvwxyzxyz) * Errors are now displayed on sys.stderr (@JessicaFavin) * Fixed issue with replay timestamps (@rjt-gupta) * Fixed copying in mitmweb on macOS (@XZzYassin) To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/mitmproxy/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/mitmproxy/PLIST cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/mitmproxy/distinfo cvs rdiff -u -r1.2 -r0 \ pkgsrc/net/mitmproxy/patches/patch-mitmproxy_proxy_protocol_websocket.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157657811164540 Content-Disposition: inline Content-Length: 7946 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.26 pkgsrc/net/mitmproxy/Makefile:1.27 --- pkgsrc/net/mitmproxy/Makefile:1.26 Sun Jul 21 12:16:28 2019 +++ pkgsrc/net/mitmproxy/Makefile Tue Dec 17 10:21:51 2019 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2019/07/21 12:16:28 leot Exp $ +# $NetBSD: Makefile,v 1.27 2019/12/17 10:21:51 leot Exp $ -DISTNAME= mitmproxy-4.0.4 -PKGREVISION= 3 +DISTNAME= mitmproxy-5.0.0 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=mitmproxy/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -11,39 +10,43 @@ HOMEPAGE= https://mitmproxy.org/ COMMENT= Interactive console program for inspecting and editing traffic flows LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=17.5:../../security/py-OpenSSL +DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=19.0:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-asn1>=0.3.1:../../security/py-asn1 DEPENDS+= ${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker -DEPENDS+= ${PYPKGPREFIX}-brotlipy>=0.7.0:../../archivers/py-brotlipy -DEPENDS+= ${PYPKGPREFIX}-certifi>=2015.11.20.1:../../security/py-certifi -DEPENDS+= ${PYPKGPREFIX}-click>=6.2:../../devel/py-click +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>=2.1.4:../../security/py-cryptography +DEPENDS+= ${PYPKGPREFIX}-flask>=1.1.1:../../www/py-flask DEPENDS+= ${PYPKGPREFIX}-h2>=3.0.1:../../www/py-h2 DEPENDS+= ${PYPKGPREFIX}-hyperframe>=5.1.0:../../www/py-hyperframe DEPENDS+= ${PYPKGPREFIX}-kaitaistruct>=0.7:../../devel/py-kaitaistruct -DEPENDS+= ${PYPKGPREFIX}-ldap3>=2.5:../../databases/py-ldap3 +DEPENDS+= ${PYPKGPREFIX}-ldap3>=2.6.1:../../databases/py-ldap3 DEPENDS+= ${PYPKGPREFIX}-passlib>=1.6.5:../../security/py-passlib -DEPENDS+= ${PYPKGPREFIX}-pyparsing>=2.1.3:../../devel/py-pyparsing +DEPENDS+= ${PYPKGPREFIX}-protobuf>=3.6.0:../../devel/py-protobuf +DEPENDS+= ${PYPKGPREFIX}-publicsuffix2>=2.20190812:../../www/py-publicsuffix2 +DEPENDS+= ${PYPKGPREFIX}-pyparsing>=2.4.2:../../devel/py-pyparsing DEPENDS+= ${PYPKGPREFIX}-pyperclip>=1.6.0:../../x11/py-pyperclip -DEPENDS+= ${PYPKGPREFIX}-ruamel-yaml>=0.13.2:../../devel/py-ruamel-yaml -DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=1.5.4:../../devel/py-sortedcontainers +DEPENDS+= ${PYPKGPREFIX}-ruamel-yaml>=0.16:../../devel/py-ruamel-yaml +DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=2.1.0:../../devel/py-sortedcontainers DEPENDS+= ${PYPKGPREFIX}-tornado>=4.3.0:../../www/py-tornado DEPENDS+= ${PYPKGPREFIX}-urwid>=2.0.1:../../devel/py-urwid -DEPENDS+= ${PYPKGPREFIX}-wsproto>=0.13.0:../../www/py-wsproto +DEPENDS+= ${PYPKGPREFIX}-wsproto>=0.14.0:../../www/py-wsproto +DEPENDS+= ${PYPKGPREFIX}-zstandard>=0.11.0:../../archivers/py-zstandard 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 '/==[0-9.]+",/ s/==/>=/g' REPLACE_SH+= mitmproxy/contrib/kaitaistruct/make.sh USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 27 -post-install: - ${FIND} ${DESTDIR} -name "*.orig" -type f -exec ${RM} {} \; +# Only for Python 3.x +PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" Index: pkgsrc/net/mitmproxy/PLIST diff -u pkgsrc/net/mitmproxy/PLIST:1.12 pkgsrc/net/mitmproxy/PLIST:1.13 --- pkgsrc/net/mitmproxy/PLIST:1.12 Thu Aug 9 11:51:41 2018 +++ pkgsrc/net/mitmproxy/PLIST Tue Dec 17 10:21:51 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2018/08/09 11:51:41 leot Exp $ +@comment $NetBSD: PLIST,v 1.13 2019/12/17 10:21:51 leot Exp $ bin/mitmdump bin/mitmproxy bin/mitmweb @@ -37,6 +37,9 @@ ${PYSITELIB}/mitmproxy/addons/check_ca.p ${PYSITELIB}/mitmproxy/addons/clientplayback.py ${PYSITELIB}/mitmproxy/addons/clientplayback.pyc ${PYSITELIB}/mitmproxy/addons/clientplayback.pyo +${PYSITELIB}/mitmproxy/addons/command_history.py +${PYSITELIB}/mitmproxy/addons/command_history.pyc +${PYSITELIB}/mitmproxy/addons/command_history.pyo ${PYSITELIB}/mitmproxy/addons/core.py ${PYSITELIB}/mitmproxy/addons/core.pyc ${PYSITELIB}/mitmproxy/addons/core.pyo @@ -67,9 +70,6 @@ ${PYSITELIB}/mitmproxy/addons/onboarding ${PYSITELIB}/mitmproxy/addons/onboardingapp/__init__.py ${PYSITELIB}/mitmproxy/addons/onboardingapp/__init__.pyc ${PYSITELIB}/mitmproxy/addons/onboardingapp/__init__.pyo -${PYSITELIB}/mitmproxy/addons/onboardingapp/app.py -${PYSITELIB}/mitmproxy/addons/onboardingapp/app.pyc -${PYSITELIB}/mitmproxy/addons/onboardingapp/app.pyo ${PYSITELIB}/mitmproxy/addons/onboardingapp/static/bootstrap.min.css ${PYSITELIB}/mitmproxy/addons/onboardingapp/static/fontawesome/css/font-awesome.css ${PYSITELIB}/mitmproxy/addons/onboardingapp/static/fontawesome/css/font-awesome.min.css @@ -102,6 +102,9 @@ ${PYSITELIB}/mitmproxy/addons/script.pyo ${PYSITELIB}/mitmproxy/addons/serverplayback.py ${PYSITELIB}/mitmproxy/addons/serverplayback.pyc ${PYSITELIB}/mitmproxy/addons/serverplayback.pyo +${PYSITELIB}/mitmproxy/addons/session.py +${PYSITELIB}/mitmproxy/addons/session.pyc +${PYSITELIB}/mitmproxy/addons/session.pyo ${PYSITELIB}/mitmproxy/addons/setheaders.py ${PYSITELIB}/mitmproxy/addons/setheaders.pyc ${PYSITELIB}/mitmproxy/addons/setheaders.pyo @@ -135,6 +138,9 @@ ${PYSITELIB}/mitmproxy/certs.pyo ${PYSITELIB}/mitmproxy/command.py ${PYSITELIB}/mitmproxy/command.pyc ${PYSITELIB}/mitmproxy/command.pyo +${PYSITELIB}/mitmproxy/command_lexer.py +${PYSITELIB}/mitmproxy/command_lexer.pyc +${PYSITELIB}/mitmproxy/command_lexer.pyo ${PYSITELIB}/mitmproxy/connections.py ${PYSITELIB}/mitmproxy/connections.pyc ${PYSITELIB}/mitmproxy/connections.pyo @@ -288,9 +294,20 @@ ${PYSITELIB}/mitmproxy/io/__init__.pyo ${PYSITELIB}/mitmproxy/io/compat.py ${PYSITELIB}/mitmproxy/io/compat.pyc ${PYSITELIB}/mitmproxy/io/compat.pyo +${PYSITELIB}/mitmproxy/io/db.py +${PYSITELIB}/mitmproxy/io/db.pyc +${PYSITELIB}/mitmproxy/io/db.pyo ${PYSITELIB}/mitmproxy/io/io.py ${PYSITELIB}/mitmproxy/io/io.pyc ${PYSITELIB}/mitmproxy/io/io.pyo +${PYSITELIB}/mitmproxy/io/proto/http.proto +${PYSITELIB}/mitmproxy/io/proto/http_pb2.py +${PYSITELIB}/mitmproxy/io/proto/http_pb2.pyc +${PYSITELIB}/mitmproxy/io/proto/http_pb2.pyo +${PYSITELIB}/mitmproxy/io/protobuf.py +${PYSITELIB}/mitmproxy/io/protobuf.pyc +${PYSITELIB}/mitmproxy/io/protobuf.pyo +${PYSITELIB}/mitmproxy/io/sql/session_create.sql ${PYSITELIB}/mitmproxy/io/tnetstring.py ${PYSITELIB}/mitmproxy/io/tnetstring.pyc ${PYSITELIB}/mitmproxy/io/tnetstring.pyo Index: pkgsrc/net/mitmproxy/distinfo diff -u pkgsrc/net/mitmproxy/distinfo:1.17 pkgsrc/net/mitmproxy/distinfo:1.18 --- pkgsrc/net/mitmproxy/distinfo:1.17 Sun Jul 21 12:16:28 2019 +++ pkgsrc/net/mitmproxy/distinfo Tue Dec 17 10:21:51 2019 @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.17 2019/07/21 12:16:28 leot Exp $ +$NetBSD: distinfo,v 1.18 2019/12/17 10:21:51 leot Exp $ -SHA1 (mitmproxy-4.0.4.tar.gz) = 67871cbf7751d34d254ccc733f5e2cd23fbe8faf -RMD160 (mitmproxy-4.0.4.tar.gz) = d4935a325081544ef0cc9b5551d5eb976ce21777 -SHA512 (mitmproxy-4.0.4.tar.gz) = e08ea8b1c75a95b822c463625509037bbc8a979161cacaa1f0185f98df8d6d7e5400925365dbbe70d18751251b1005824f739a8cd035c0389f7b4aea562adfb3 -Size (mitmproxy-4.0.4.tar.gz) = 27131713 bytes -SHA1 (patch-mitmproxy_proxy_protocol_websocket.py) = 3a3a67daa4190a150070cf44b007f8b97bee9278 +SHA1 (mitmproxy-5.0.0.tar.gz) = c0fbb073ce31c8615078a7b09e95f1f77b51f537 +RMD160 (mitmproxy-5.0.0.tar.gz) = 2ca43e7a94d7df9f641ab1f6d18d1323587c6ecd +SHA512 (mitmproxy-5.0.0.tar.gz) = 89de1e40cf7b78e04c575f8db2583c720c47492f6330e6a24819f27b580cd1fc1feb4c1b547de1213361d53ca08b16dae24d7fa9f3faa615fb9917769c1d10cb +Size (mitmproxy-5.0.0.tar.gz) = 27203802 bytes --_----------=_157657811164540--