Attachment 135772 Details for Bug 180747 – mitmproxy.diff

[patch] mitmproxy.diff

mitmproxy.diff (text/plain), 6.54 KB, created by Hung-Yi Chen on 2013-07-22 22:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hung-Yi Chen

Created: 2013-07-22 22:40:00 UTC

Size: 6.54 KB

patch

obsolete

>Index: www/mitmproxy/Makefile
>===================================================================
>--- www/mitmproxy/Makefile	(revision 323491)
>+++ www/mitmproxy/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mitmproxy
>-PORTVERSION=	0.8.1
>+PORTVERSION=	0.9.1
> CATEGORIES=	www python
> MASTER_SITES=	http://mitmproxy.org/download/
> 
>@@ -10,8 +10,10 @@
> COMMENT=	An SSL-capable man-in-the-middle proxy
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1>0:${PORTSDIR}/devel/py-asn1 \
>+		${PYTHON_PKGNAMEPREFIX}flask>0:${PORTSDIR}/www/py-flask \
> 		${PYTHON_PKGNAMEPREFIX}imaging>0:${PORTSDIR}/graphics/py-imaging \
> 		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
>+		${PYTHON_PKGNAMEPREFIX}netlib>0:${PORTSDIR}/net/py-netlib \
> 		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl \
> 		${PYTHON_PKGNAMEPREFIX}urwid>0:${PORTSDIR}/devel/py-urwid
> 
>Index: www/mitmproxy/distinfo
>===================================================================
>--- www/mitmproxy/distinfo	(revision 323491)
>+++ www/mitmproxy/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (mitmproxy-0.8.1.tar.gz) = efccd77e6734cbf3472d4ebf65d5bfed424a110ec1ee7ff28828e8e452e51783
>-SIZE (mitmproxy-0.8.1.tar.gz) = 2782437
>+SHA256 (mitmproxy-0.9.1.tar.gz) = 18e0ca349ac8565eaa422693123e864251edbaab7e7c938ea5481d5511715eec
>+SIZE (mitmproxy-0.9.1.tar.gz) = 3121659
>Index: www/mitmproxy/files/patch-setup.py
>===================================================================
>--- www/mitmproxy/files/patch-setup.py	(revision 323491)
>+++ www/mitmproxy/files/patch-setup.py	(working copy)
>@@ -1,5 +1,5 @@
>---- setup.py.orig	2012-04-09 11:55:00.000000000 +0800
>-+++ setup.py	2012-11-08 01:43:57.000000000 +0800
>+--- setup.py.orig	2013-07-23 03:08:39.785592808 +0800
>++++ setup.py	2013-07-23 03:09:19.367592415 +0800
> @@ -1,4 +1,5 @@
>  from distutils.core import setup
> +from setuptools import setup
>@@ -6,9 +6,17 @@
>  import fnmatch, os.path
>  from libmproxy import version
>  
>-@@ -92,5 +93,4 @@
>+@@ -92,13 +93,4 @@
>              "Topic :: Internet :: Proxy Servers",
>              "Topic :: Software Development :: Testing"
>          ],
>--        install_requires=['urwid>=1.0', 'pyasn1', 'pyopenssl>=0.12', "PIL", "lxml"],
>+-        install_requires=[
>+-            "netlib>=%s"%version.VERSION,
>+-            "urwid>=1.1",
>+-            "pyasn1>0.1.2",
>+-            "pyopenssl>=0.13",
>+-            "PIL",
>+-            "lxml",
>+-            "flask"
>+-        ],
>  )
>Index: www/mitmproxy/pkg-plist
>===================================================================
>--- www/mitmproxy/pkg-plist	(revision 323491)
>+++ www/mitmproxy/pkg-plist	(working copy)
>@@ -1,7 +1,7 @@
> bin/mitmdump
> bin/mitmproxy
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/__init__.py
>-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/certutils.py
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/app.py
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/cmdline.py
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/controller.py
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/dump.py
>@@ -14,7 +14,7 @@
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/utils.py
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/version.py
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/certutils.pyc
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/app.pyc
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/cmdline.pyc
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/controller.pyc
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/dump.pyc
>@@ -27,7 +27,7 @@
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/utils.pyc
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/version.pyc
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/certutils.pyo
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/app.pyo
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/cmdline.pyo
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/controller.pyo
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/dump.pyo
>@@ -67,10 +67,13 @@
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/help.pyo
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/console/palettes.pyo
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/__init__.py
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/html2text.py
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/pyparsing.py
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/html2text.pyc
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/pyparsing.pyc
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/html2text.pyo
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/pyparsing.pyo
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/__init__.py
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/__init__.pyc
>@@ -93,9 +96,18 @@
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.pyo
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/packer.pyo
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/contrib/jsbeautifier/unpackers/urlencode.pyo
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/__init__.py
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/linux.py
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/osx.py
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/pf.py
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/common.pyc
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/linux.pyc
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/osx.pyc
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/pf.pyc
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/linux.pyo
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/osx.pyo
>+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/libmproxy/platform/pf.pyo
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
> %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt

Actions: View | Diff

Attachments on bug 180747: 135772