Date: Tue, 17 Dec 2019 10:02:52 +0100 From: Mathieu Arnold <mat@FreeBSD.org> To: Kai Knoblich <kai@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r520286 - in head/www/mitmproxy: . files Message-ID: <20191217090252.rppgchonk2vkz7zl@atuin.in.mat.cc> In-Reply-To: <201912161936.xBGJax8c026374@repo.freebsd.org> References: <201912161936.xBGJax8c026374@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--3ki2jlwm3jfblvpw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 16, 2019 at 07:36:59PM +0000, Kai Knoblich wrote: > Author: kai > Date: Mon Dec 16 19:36:59 2019 > New Revision: 520286 > URL: https://svnweb.freebsd.org/changeset/ports/520286 >=20 > Log: > www/mitmproxy: Unbreak at runtime > =20 > * After r511877 (initial cause, already fixed in r518596) and r516400 [= 1] > the port was broken at runtime. Unbreak it by relaxing the version r= ange > for net/py-ldap3. You know, you can write: ${PYTHON_PKGNAMEPREFIX}ldap3>=3D2.5<2.6:net/py-ldap3@${PY_FLAVOR} This would probably have caught things sooner. > Also relax the version range for devel/py-urwid which was recently up= dated > in r519201. > =20 > * Adjust the RUN_DEPENDS by making them more specific (as given in setu= p.py) > to reduce the likelihood of runtime errors in the future. > =20 > * Bump PORTREVISION due changed code. > =20 > A MFH is not required as www/mitmproxy in the 2019Q4 branch isn't affec= ted > and was already fixed with r518597. > =20 > PR: 242025 > Reported by: ale [1] > Approved by: maintainer timeout (2 weeks) >=20 > Modified: > head/www/mitmproxy/Makefile > head/www/mitmproxy/files/patch-setup.py >=20 > Modified: head/www/mitmproxy/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/mitmproxy/Makefile Mon Dec 16 18:50:06 2019 (r520285) > +++ head/www/mitmproxy/Makefile Mon Dec 16 19:36:59 2019 (r520286) > @@ -4,7 +4,7 @@ > PORTNAME=3D mitmproxy > PORTVERSION=3D 4.0.4 > DISTVERSIONPREFIX=3D v > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > CATEGORIES=3D www python > =20 > MAINTAINER=3D gaod@hychen.org > @@ -15,22 +15,23 @@ LICENSE_FILE=3D ${WRKSRC}/LICENSE > =20 > RUN_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}click>=3D6.2:devel/py-click@${PY_F= LAVOR} \ > ${PYTHON_PKGNAMEPREFIX}blinker>=3D1.4:devel/py-blinker@${PY_FLAVOR} \ > - ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \ > - ${PYTHON_PKGNAMEPREFIX}wsproto>=3D0.13.0:net/py-wsproto@${PY_FLAVOR} \ > + ${PYTHON_PKGNAMEPREFIX}certifi>=3D2015.11.20.1:security/py-certifi@${P= Y_FLAVOR} \ > + ${PYTHON_PKGNAMEPREFIX}wsproto>=3D0.11.0:net/py-wsproto@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}ldap3>=3D2.5:net/py-ldap3@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}passlib>=3D1.6.5:security/py-passlib@${PY_FLAVO= R} \ > - ${PYTHON_PKGNAMEPREFIX}pyasn1>=3D0.3.1:devel/py-pyasn1@${PY_FLAVOR} \ > + ${PYTHON_PKGNAMEPREFIX}pyasn1>=3D0.3.1<0.5:devel/py-pyasn1@${PY_FLAVOR= } \ > ${PYTHON_PKGNAMEPREFIX}openssl>=3D17.5:security/py-openssl@${PY_FLAVOR= } \ > ${PYTHON_PKGNAMEPREFIX}pyparsing>=3D2.1.3:devel/py-pyparsing@${PY_FLAV= OR} \ > ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=3D0.13.2:devel/py-ruamel.yaml@${PY= _FLAVOR} \ > - ${PYTHON_PKGNAMEPREFIX}tornado>=3D4.3:www/py-tornado@${PY_FLAVOR} \ > + ${PYTHON_PKGNAMEPREFIX}tornado>=3D4.3<5.2:www/py-tornado@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}urwid>=3D2.0.1:devel/py-urwid@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}brotli>=3D0.7.0:archivers/py-brotli@${PY_FLAVOR= } \ > ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=3D1.5.4:devel/py-sortedcontai= ners@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pyperclip>=3D1.6.0:devel/py-pyperclip@${PY_FLAV= OR} \ > - ${PYTHON_PKGNAMEPREFIX}hyperframe>=3D5.1.0:www/py-hyperframe@${PY_FLAV= OR} \ > - ${PYTHON_PKGNAMEPREFIX}kaitaistruct>=3D0.7:devel/py-kaitaistruct@${PY_= FLAVOR} \ > - ${PYTHON_PKGNAMEPREFIX}h2>=3D3.1.0:www/py-h2@${PY_FLAVOR} > + ${PYTHON_PKGNAMEPREFIX}hyperframe>=3D5.1.0<6:www/py-hyperframe@${PY_FL= AVOR} \ > + ${PYTHON_PKGNAMEPREFIX}kaitaistruct>=3D0.7<0.9:devel/py-kaitaistruct@$= {PY_FLAVOR} \ > + ${PYTHON_PKGNAMEPREFIX}h2>=3D3.0.1<4:www/py-h2@${PY_FLAVOR} \ > + ${PYTHON_PKGNAMEPREFIX}cryptography>=3D2.1.4:security/py-cryptography@= ${PY_FLAVOR} > =20 > USES=3D python:3.5+ > USE_PYTHON=3D distutils autoplist noflavors >=20 > Modified: head/www/mitmproxy/files/patch-setup.py > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/mitmproxy/files/patch-setup.py Mon Dec 16 18:50:06 2019 (r52= 0285) > +++ head/www/mitmproxy/files/patch-setup.py Mon Dec 16 19:36:59 2019 (r52= 0286) > @@ -1,4 +1,4 @@ > ---- setup.py.orig 2019-07-30 16:02:34 UTC > +--- setup.py.orig 2019-12-09 13:30:10 UTC > +++ setup.py > @@ -61,24 +61,24 @@ setup( > # It is not considered best practice to use install_requires to pin= dependencies to specific versions. > @@ -13,7 +13,8 @@ > "h2>=3D3.0.1,<4", > "hyperframe>=3D5.1.0,<6", > "kaitaistruct>=3D0.7,<0.9", > - "ldap3>=3D2.5,<2.6", > +- "ldap3>=3D2.5,<2.6", > ++ "ldap3>=3D2.5", > "passlib>=3D1.6.5", > "pyasn1>=3D0.3.1,<0.5", > - "pyOpenSSL>=3D17.5,<18.1", > @@ -24,8 +25,9 @@ > - "sortedcontainers>=3D1.5.4,<2.1", > + "sortedcontainers>=3D1.5.4", > "tornado>=3D4.3,<5.2", > - "urwid>=3D2.0.1,<2.1", > +- "urwid>=3D2.0.1,<2.1", > - "wsproto>=3D0.11.0,<0.12.0", > ++ "urwid>=3D2.0.1", > + "wsproto>=3D0.13.0", > ], > extras_require=3D{ >=20 --=20 Mathieu Arnold --3ki2jlwm3jfblvpw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAl34mbxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zkgI0w//UIy14kGB/H8XV7AQ8stZwrznmVtGb67/uW4gmTvQYdtVGQuZWlLGtIjo 6F5rzE17WInWQ3sjpMBgPo7r5u+j9fEEUAAAiwxolMMOoQa3LDSvtBG0poAOedAk 0uGirBqZmh8UwZI6G5HFkmNiPm66C6c0jWxRIEq5C15Gq7+xxK+UnbnC/4nCOdsS ZZQUWNr0dAm1gmtcvN+OD9tizzVhWLFe4SQKtCr1NKRtuS1WDcG3c1KYsPSXJ4+7 mHjLo5M6C8mDoSGjl6CGe3Eusye0V2mUogFL5z8GVMRGFQBNzU/FJaKxjSZXtEOm K0pA5cYWT8kr0MxFhYxqjXCnwznQmi8QQk3sYN2PYxPpnBj+Hva0xQRZJ0KczNCG x/dfKkuJkIzJgZ1lkQBBVSV0c/mqZ8YC774xZfd9SJWAMV2fZsWcwv3MRu+cIjrP yPNwzcNU4dF3LPXtZTtJbdblpDrGe//g4uA6X7HNC4zq2LjQSVeAQwDygEI7OY8z iQEWRFu0c4HTE2AsmXExV/hDGNvMkDgB9utYfyF7RbU64xCIXaEoMVmNjnUctoEf bwYZuK+b+0zjah73+7HZG0ABr7SaD29tDI4CP1fCDtMmnGFDoiKq0Qd9FgUuTZ2z dKIgjkp/uCzsSikEQNbos9wElHGJWaWajR0wtYonlc0BpvdxqVo= =WTTq -----END PGP SIGNATURE----- --3ki2jlwm3jfblvpw--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191217090252.rppgchonk2vkz7zl>