From 1fe557399c2e4a18ae207dc3f2bcb949d9de4d04 Mon Sep 17 00:00:00 2001 From: leot Date: Wed, 30 Dec 2015 15:08:08 +0000 Subject: Update net/mitmproxy to 0.15. Changes: 4 December 2015: mitmproxy 0.15 * Support for loading and converting older dumpfile formats (0.13 and up) * Content views for inline script (@chrisczub) * Better handling of empty header values (Benjamin Lee/@bltb) * Fix a gnarly memory leak in mitmdump * A number of bugfixes and small improvements --- net/mitmproxy/Makefile | 28 ++++++++++++++-------------- net/mitmproxy/PLIST | 29 +++++++++++++++++++---------- net/mitmproxy/distinfo | 11 ++++++----- net/mitmproxy/patches/patch-setup.py | 19 +++++++++++++++++++ 4 files changed, 58 insertions(+), 29 deletions(-) create mode 100644 net/mitmproxy/patches/patch-setup.py (limited to 'net/mitmproxy') diff --git a/net/mitmproxy/Makefile b/net/mitmproxy/Makefile index c3cc2250cd8..40bbd975010 100644 --- a/net/mitmproxy/Makefile +++ b/net/mitmproxy/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2015/12/05 21:25:52 adam Exp $ +# $NetBSD: Makefile,v 1.8 2015/12/30 15:08:08 leot Exp $ -DISTNAME= mitmproxy-0.14.0 +DISTNAME= mitmproxy-0.15 CATEGORIES= net MASTER_SITES= http://mitmproxy.org/download/ @@ -9,22 +9,22 @@ HOMEPAGE= http://mitmproxy.org/ COMMENT= Interactive console program for inspecting and editing traffic flows LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.3.0:../../graphics/py-Pillow -DEPENDS+= ${PYPKGPREFIX}-asn1>=0.1.2:../../security/py-asn1 -DEPENDS+= ${PYPKGPREFIX}-blinker>=1.3:../../devel/py-blinker +DEPENDS+= ${PYPKGPREFIX}-Pillow>=3.0.0:../../graphics/py-Pillow +DEPENDS+= ${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker DEPENDS+= ${PYPKGPREFIX}-certifi>=2015.9.6.2:../../security/py-certifi -DEPENDS+= ${PYPKGPREFIX}-click>=5.1:../../devel/py-click -DEPENDS+= ${PYPKGPREFIX}-configargparse>=0.9.3:../../devel/py-configargparse +DEPENDS+= ${PYPKGPREFIX}-click>=6.2:../../devel/py-click +DEPENDS+= ${PYPKGPREFIX}-configargparse>=0.10.0:../../devel/py-configargparse DEPENDS+= ${PYPKGPREFIX}-construct>=2.5.2:../../devel/py-construct DEPENDS+= ${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34 -DEPENDS+= ${PYPKGPREFIX}-html2text>=2015.4.14:../../textproc/py-html2text -DEPENDS+= ${PYPKGPREFIX}-lxml>=3.3.6:../../textproc/py-lxml -DEPENDS+= ${PYPKGPREFIX}-netlib>=0.13:../../net/py-netlib -DEPENDS+= ${PYPKGPREFIX}-pyparsing>=1.5.2:../../devel/py-pyparsing -DEPENDS+= ${PYPKGPREFIX}-pyperclip>=1.5.8:../../x11/py-pyperclip +DEPENDS+= ${PYPKGPREFIX}-html2text>=2015.11.4:../../textproc/py-html2text +DEPENDS+= ${PYPKGPREFIX}-lxml>=3.4.4:../../textproc/py-lxml +DEPENDS+= ${PYPKGPREFIX}-netlib>=0.15:../../net/py-netlib +DEPENDS+= ${PYPKGPREFIX}-pyparsing>=2.0.5:../../devel/py-pyparsing +DEPENDS+= ${PYPKGPREFIX}-pyperclip>=1.5.22:../../x11/py-pyperclip DEPENDS+= ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six -DEPENDS+= ${PYPKGPREFIX}-tornado>=4.0.2:../../www/py-tornado -DEPENDS+= ${PYPKGPREFIX}-urwid>=1.3:../../devel/py-urwid +DEPENDS+= ${PYPKGPREFIX}-tornado>=4.3.0:../../www/py-tornado +DEPENDS+= ${PYPKGPREFIX}-urwid>=1.3.1:../../devel/py-urwid +DEPENDS+= ${PYPKGPREFIX}-watchdog>=0.8.3:../../sysutils/py-watchdog USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-netlib diff --git a/net/mitmproxy/PLIST b/net/mitmproxy/PLIST index 04b13762f5e..c3bfb5fac3c 100644 --- a/net/mitmproxy/PLIST +++ b/net/mitmproxy/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2015/11/16 18:33:51 leot Exp $ +@comment $NetBSD: PLIST,v 1.5 2015/12/30 15:08:08 leot Exp $ bin/mitmdump bin/mitmproxy bin/mitmweb @@ -133,6 +133,9 @@ ${PYSITELIB}/libmproxy/filt.pyo ${PYSITELIB}/libmproxy/flow.py ${PYSITELIB}/libmproxy/flow.pyc ${PYSITELIB}/libmproxy/flow.pyo +${PYSITELIB}/libmproxy/flow_format_compat.py +${PYSITELIB}/libmproxy/flow_format_compat.pyc +${PYSITELIB}/libmproxy/flow_format_compat.pyo ${PYSITELIB}/libmproxy/main.py ${PYSITELIB}/libmproxy/main.pyc ${PYSITELIB}/libmproxy/main.pyo @@ -163,7 +166,6 @@ ${PYSITELIB}/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.s ${PYSITELIB}/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf ${PYSITELIB}/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff ${PYSITELIB}/libmproxy/onboarding/static/mitmproxy.css -${PYSITELIB}/libmproxy/onboarding/static/mitmproxy.js.map ${PYSITELIB}/libmproxy/onboarding/templates/frame.html ${PYSITELIB}/libmproxy/onboarding/templates/index.html ${PYSITELIB}/libmproxy/onboarding/templates/layout.html @@ -227,9 +229,21 @@ ${PYSITELIB}/libmproxy/proxy/root_context.pyo ${PYSITELIB}/libmproxy/proxy/server.py ${PYSITELIB}/libmproxy/proxy/server.pyc ${PYSITELIB}/libmproxy/proxy/server.pyo -${PYSITELIB}/libmproxy/script.py -${PYSITELIB}/libmproxy/script.pyc -${PYSITELIB}/libmproxy/script.pyo +${PYSITELIB}/libmproxy/script/__init__.py +${PYSITELIB}/libmproxy/script/__init__.pyc +${PYSITELIB}/libmproxy/script/__init__.pyo +${PYSITELIB}/libmproxy/script/concurrent.py +${PYSITELIB}/libmproxy/script/concurrent.pyc +${PYSITELIB}/libmproxy/script/concurrent.pyo +${PYSITELIB}/libmproxy/script/reloader.py +${PYSITELIB}/libmproxy/script/reloader.pyc +${PYSITELIB}/libmproxy/script/reloader.pyo +${PYSITELIB}/libmproxy/script/script.py +${PYSITELIB}/libmproxy/script/script.pyc +${PYSITELIB}/libmproxy/script/script.pyo +${PYSITELIB}/libmproxy/script/script_context.py +${PYSITELIB}/libmproxy/script/script_context.pyc +${PYSITELIB}/libmproxy/script/script_context.pyo ${PYSITELIB}/libmproxy/stateobject.py ${PYSITELIB}/libmproxy/stateobject.pyc ${PYSITELIB}/libmproxy/stateobject.pyo @@ -250,8 +264,6 @@ ${PYSITELIB}/libmproxy/web/app.pyc ${PYSITELIB}/libmproxy/web/app.pyo ${PYSITELIB}/libmproxy/web/static/app.css ${PYSITELIB}/libmproxy/web/static/app.js -${PYSITELIB}/libmproxy/web/static/css/app.css.map -${PYSITELIB}/libmproxy/web/static/css/vendor.css.map ${PYSITELIB}/libmproxy/web/static/fonts/fontawesome-webfont.eot ${PYSITELIB}/libmproxy/web/static/fonts/fontawesome-webfont.svg ${PYSITELIB}/libmproxy/web/static/fonts/fontawesome-webfont.ttf @@ -267,8 +279,6 @@ ${PYSITELIB}/libmproxy/web/static/images/resourceImageIcon.png ${PYSITELIB}/libmproxy/web/static/images/resourceJavaIcon.png ${PYSITELIB}/libmproxy/web/static/images/resourceNotModifiedIcon.png ${PYSITELIB}/libmproxy/web/static/images/resourceRedirectIcon.png -${PYSITELIB}/libmproxy/web/static/js/app.js.map -${PYSITELIB}/libmproxy/web/static/js/vendor.js.map ${PYSITELIB}/libmproxy/web/static/vendor.css ${PYSITELIB}/libmproxy/web/static/vendor.js ${PYSITELIB}/libmproxy/web/templates/index.html @@ -280,6 +290,5 @@ ${PYSITELIB}/${EGG_FILE}/PKG-INFO ${PYSITELIB}/${EGG_FILE}/SOURCES.txt ${PYSITELIB}/${EGG_FILE}/dependency_links.txt ${PYSITELIB}/${EGG_FILE}/entry_points.txt -${PYSITELIB}/${EGG_FILE}/pbr.json ${PYSITELIB}/${EGG_FILE}/requires.txt ${PYSITELIB}/${EGG_FILE}/top_level.txt diff --git a/net/mitmproxy/distinfo b/net/mitmproxy/distinfo index 0b58d4280ca..cbaef8a74f4 100644 --- a/net/mitmproxy/distinfo +++ b/net/mitmproxy/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.5 2015/11/16 18:33:51 leot Exp $ +$NetBSD: distinfo,v 1.6 2015/12/30 15:08:08 leot Exp $ -SHA1 (mitmproxy-0.14.0.tar.gz) = 5d74b6d8f33f5e12de16ae2d0f82f7268d73ca85 -RMD160 (mitmproxy-0.14.0.tar.gz) = 763c2e7d94c2361205a7277d1d52d42e1bb6f3fb -SHA512 (mitmproxy-0.14.0.tar.gz) = edf97b2825948ab9b4512dd1fc7f048655f70ae789d8f16f1c86b5bbec32fb490145c5801642e1fa58a53710733424ef17f8f842c1abea2252e565815854caf1 -Size (mitmproxy-0.14.0.tar.gz) = 6785233 bytes +SHA1 (mitmproxy-0.15.tar.gz) = c26793c8ac957f8a4d75073ca22edc4ebdaf158e +RMD160 (mitmproxy-0.15.tar.gz) = de16080adb8d218c21d62577afb9bcb14e265bd1 +SHA512 (mitmproxy-0.15.tar.gz) = 3130e82965fd12379ddc2ca0369900a668a6bf68b122781fc8e84079d2ebad0d3e3d7b553b397100cf40872f33ce0014edebed5b056602c30df51c9084014ce7 +Size (mitmproxy-0.15.tar.gz) = 1503247 bytes +SHA1 (patch-setup.py) = 5310ac499386aa630278249aad3698d4e7c34883 diff --git a/net/mitmproxy/patches/patch-setup.py b/net/mitmproxy/patches/patch-setup.py new file mode 100644 index 00000000000..73d018b0a24 --- /dev/null +++ b/net/mitmproxy/patches/patch-setup.py @@ -0,0 +1,19 @@ +$NetBSD: patch-setup.py,v 1.1 2015/12/30 15:08:08 leot Exp $ + +Avoid too strict version requirements. + +--- setup.py.orig 2015-12-03 17:16:16.000000000 +0000 ++++ setup.py +@@ -20,10 +20,10 @@ deps = { + "pyperclip>=1.5.22, <1.6", + "blinker>=1.4, <1.5", + "pyparsing>=2.0.5, <2.1", +- "html2text==2015.11.4", ++ "html2text>=2015.11.4", + "construct>=2.5.2, <2.6", + "six>=1.10.0, <1.11", +- "lxml==3.4.4", # there are no Windows wheels for 3.5! ++ "lxml>=3.4.4", # there are no Windows wheels for 3.5! + "Pillow>=3.0.0, <3.1", + "watchdog>=0.8.3, <0.9", + } -- cgit v1.2.3