Received: by mail.netbsd.org (Postfix, from userid 605) id E295B84E92; Thu, 5 Apr 2018 17:53:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4189B84E8F for ; Thu, 5 Apr 2018 17:53:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id AzzEMoscbtXS for ; Thu, 5 Apr 2018 17:53:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 21FDD84E65 for ; Thu, 5 Apr 2018 17:53:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F012CFBEC; Thu, 5 Apr 2018 17:53:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_152295078274470" MIME-Version: 1.0 Date: Thu, 5 Apr 2018 17:53:02 +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: <20180405175302.F012CFBEC@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. --_----------=_152295078274470 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Thu Apr 5 17:53:02 UTC 2018 Modified Files: pkgsrc/net/mitmproxy: Makefile PLIST distinfo pkgsrc/net/mitmproxy/patches: patch-setup.py Log Message: mitmproxy: Update net/mitmproxy to 3.0.4 pkgsrc changes: - py-h11 and py-requests are no longer needed, delete them from DEPENDS (`h11' is no more used while `requests' is only an extra dependency) Changes: 05 April 2018: mitmproxy 3.0.4 * Fix an issue that caused mitmproxy to not retry HTTP requests on timeout. * Misc bug fixes and improvements To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/mitmproxy/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/mitmproxy/PLIST cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/mitmproxy/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/mitmproxy/patches/patch-setup.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_152295078274470 Content-Disposition: inline Content-Length: 7052 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.19 pkgsrc/net/mitmproxy/Makefile:1.20 --- pkgsrc/net/mitmproxy/Makefile:1.19 Mon Feb 26 12:28:48 2018 +++ pkgsrc/net/mitmproxy/Makefile Thu Apr 5 17:53:02 2018 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2018/02/26 12:28:48 leot Exp $ +# $NetBSD: Makefile,v 1.20 2018/04/05 17:53:02 leot Exp $ -DISTNAME= mitmproxy-3.0.3 +DISTNAME= mitmproxy-3.0.4 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=mitmproxy/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -20,7 +20,6 @@ DEPENDS+= ${PYPKGPREFIX}-configargparse> DEPENDS+= ${PYPKGPREFIX}-construct>=2.5.2:../../devel/py-construct DEPENDS+= ${PYPKGPREFIX}-cryptography>=2.1.4:../../security/py-cryptography DEPENDS+= ${PYPKGPREFIX}-cssutils>=1.0.1:../../textproc/py-cssutils -DEPENDS+= ${PYPKGPREFIX}-h11>=0.7.0:../../www/py-h11 DEPENDS+= ${PYPKGPREFIX}-h2>=3.0.1:../../www/py-h2 DEPENDS+= ${PYPKGPREFIX}-hpack>=2.1.0:../../net/py-hpack DEPENDS+= ${PYPKGPREFIX}-html2text>=2016.1.8:../../textproc/py-html2text @@ -30,7 +29,6 @@ DEPENDS+= ${PYPKGPREFIX}-ldap3>=2.4:../. DEPENDS+= ${PYPKGPREFIX}-passlib>=1.6.5:../../security/py-passlib DEPENDS+= ${PYPKGPREFIX}-pyparsing>=2.1.3:../../devel/py-pyparsing DEPENDS+= ${PYPKGPREFIX}-pyperclip>=1.6.0:../../x11/py-pyperclip -DEPENDS+= ${PYPKGPREFIX}-requests>=2.9.1:../../devel/py-requests DEPENDS+= ${PYPKGPREFIX}-ruamel-yaml>=0.13.2:../../devel/py-ruamel-yaml DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=1.5.4:../../devel/py-sortedcontainers DEPENDS+= ${PYPKGPREFIX}-tornado>=4.3.0:../../www/py-tornado Index: pkgsrc/net/mitmproxy/PLIST diff -u pkgsrc/net/mitmproxy/PLIST:1.9 pkgsrc/net/mitmproxy/PLIST:1.10 --- pkgsrc/net/mitmproxy/PLIST:1.9 Mon Feb 26 12:28:48 2018 +++ pkgsrc/net/mitmproxy/PLIST Thu Apr 5 17:53:02 2018 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2018/02/26 12:28:48 leot Exp $ +@comment $NetBSD: PLIST,v 1.10 2018/04/05 17:53:02 leot Exp $ bin/mitmdump bin/mitmproxy bin/mitmweb @@ -40,9 +40,6 @@ ${PYSITELIB}/mitmproxy/addons/clientplay ${PYSITELIB}/mitmproxy/addons/core.py ${PYSITELIB}/mitmproxy/addons/core.pyc ${PYSITELIB}/mitmproxy/addons/core.pyo -${PYSITELIB}/mitmproxy/addons/core_option_validation.py -${PYSITELIB}/mitmproxy/addons/core_option_validation.pyc -${PYSITELIB}/mitmproxy/addons/core_option_validation.pyo ${PYSITELIB}/mitmproxy/addons/cut.py ${PYSITELIB}/mitmproxy/addons/cut.pyc ${PYSITELIB}/mitmproxy/addons/cut.pyo Index: pkgsrc/net/mitmproxy/distinfo diff -u pkgsrc/net/mitmproxy/distinfo:1.12 pkgsrc/net/mitmproxy/distinfo:1.13 --- pkgsrc/net/mitmproxy/distinfo:1.12 Mon Feb 26 12:28:48 2018 +++ pkgsrc/net/mitmproxy/distinfo Thu Apr 5 17:53:02 2018 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.12 2018/02/26 12:28:48 leot Exp $ +$NetBSD: distinfo,v 1.13 2018/04/05 17:53:02 leot Exp $ -SHA1 (mitmproxy-3.0.3.tar.gz) = 73c5df44ec8ebfe7bef672234578f31473cc714d -RMD160 (mitmproxy-3.0.3.tar.gz) = 071de5dfd7b519d4be0c910127e749b46f663987 -SHA512 (mitmproxy-3.0.3.tar.gz) = 5477b8ac438b8f2ea40e658c50988881ef0f3eeda3178b2fbed9618d2a490c28f59b32174e150d8cbeb1b04b4b868a64029bde6499983dff782d4204aa0f8d37 -Size (mitmproxy-3.0.3.tar.gz) = 27171521 bytes -SHA1 (patch-setup.py) = e692d17abb332a61d4cfec52ab17d0c93d84180a +SHA1 (mitmproxy-3.0.4.tar.gz) = c05ada3b10cb5fc42e86f25205a4a8823f64de2a +RMD160 (mitmproxy-3.0.4.tar.gz) = 57a68e86b9719f27635bbe07d75ebc7c92495478 +SHA512 (mitmproxy-3.0.4.tar.gz) = a89b0bee6997ce51d23483101755dae9f5300339d65e4975679df5c6b60ff9af94e655651321cd8e831666a04ec5cc24c7af647f3aab913524b6755b47f1f57b +Size (mitmproxy-3.0.4.tar.gz) = 27147733 bytes +SHA1 (patch-setup.py) = 4b74c7546e3c513efeb9157ed232f833d514436f Index: pkgsrc/net/mitmproxy/patches/patch-setup.py diff -u pkgsrc/net/mitmproxy/patches/patch-setup.py:1.6 pkgsrc/net/mitmproxy/patches/patch-setup.py:1.7 --- pkgsrc/net/mitmproxy/patches/patch-setup.py:1.6 Mon Feb 26 12:28:48 2018 +++ pkgsrc/net/mitmproxy/patches/patch-setup.py Thu Apr 5 17:53:02 2018 @@ -1,10 +1,10 @@ -$NetBSD: patch-setup.py,v 1.6 2018/02/26 12:28:48 leot Exp $ +$NetBSD: patch-setup.py,v 1.7 2018/04/05 17:53:02 leot Exp $ Avoid too strict version requirements. ---- setup.py.orig 2018-02-22 12:17:33.000000000 +0000 +--- setup.py.orig 2018-04-05 15:09:51.000000000 +0000 +++ setup.py -@@ -61,47 +61,47 @@ setup( +@@ -61,45 +61,45 @@ 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=[ @@ -14,8 +14,7 @@ Avoid too strict version requirements. + "brotlipy>=0.7.0", "certifi>=2015.11.20.1", # no semver here - this should always be on the last release! - "click>=6.2, <7", -- "cryptography>=2.1.4,<2.2", -- 'h11>=0.7.0,<0.8', +- "cryptography>=2.1.4,<2.3", - "h2>=3.0.1,<4", - "hyperframe>=5.1.0,<6", - "kaitaistruct>=0.7,<0.9", @@ -25,15 +24,13 @@ Avoid too strict version requirements. - "pyOpenSSL>=17.5,<17.6", - "pyparsing>=2.1.3, <2.3", - "pyperclip>=1.6.0, <1.7", -- "requests>=2.9.1, <3", - "ruamel.yaml>=0.13.2, <0.16", - "sortedcontainers>=1.5.4, <1.6", -- "tornado>=4.3, <4.6", +- "tornado>=4.3,<5.1", - "urwid>=2.0.1,<2.1", - "wsproto>=0.11.0,<0.12.0", + "click>=6.2", + "cryptography>=2.1.4", -+ 'h11>=0.7.0', + "h2>=3.0.1", + "hyperframe>=5.1.0", + "kaitaistruct>=0.7", @@ -43,7 +40,6 @@ Avoid too strict version requirements. + "pyOpenSSL>=17.5", + "pyparsing>=2.1.3", + "pyperclip>=1.6.0", -+ "requests>=2.9.1", + "ruamel.yaml>=0.13.2", + "sortedcontainers>=1.5.4", + "tornado>=4.3", @@ -58,30 +54,30 @@ Avoid too strict version requirements. 'dev': [ - "flake8>=3.5, <3.6", - "Flask>=0.10.1, <0.13", -- "mypy>=0.560,<0.561", +- "mypy>=0.580,<0.581", - "pytest-cov>=2.5.1,<3", - "pytest-faulthandler>=1.3.1,<2", - "pytest-timeout>=1.2.1,<2", - "pytest-xdist>=1.22,<2", - "pytest>=3.3,<4", +- "requests>=2.9.1, <3", - "tox>=2.3, <3", - "rstcheck>=2.2, <4.0", + "flake8>=3.5", + "Flask>=0.10.1", -+ "mypy>=0.560", ++ "mypy>=0.580", + "pytest-cov>=2.5.1", + "pytest-faulthandler>=1.3.1", + "pytest-timeout>=1.2.1", + "pytest-xdist>=1.22", + "pytest>=3.3", ++ "requests>=2.9.1", + "tox>=2.3", + "rstcheck>=2.2", ], 'examples': [ -- "beautifulsoup4>=4.4.1, <4.7", -- "Pillow>=4.3,<5.1", -+ "beautifulsoup4>=4.4.1", -+ "Pillow>=4.3", +- "beautifulsoup4>=4.4.1, <4.7" ++ "beautifulsoup4>=4.4.1" ] } ) --_----------=_152295078274470--