diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-proxy/mitmproxy/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-proxy/mitmproxy/files')
| -rw-r--r-- | net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch b/net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch new file mode 100644 index 000000000000..bd6f65aa920e --- /dev/null +++ b/net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch @@ -0,0 +1,44 @@ +--- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/__init__.py ++++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/__init__.py +@@ -246,7 +246,7 @@ + return sweet_code + + def unpack(self, source, evalcode=False): +- import jsbeautifier.unpackers as unpackers ++ from ..jsbeautifier import unpackers + try: + return unpackers.run(source, evalcode) + except unpackers.UnpackingError as error: +--- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/__init__.py ++++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/__init__.py +@@ -7,7 +7,7 @@ + + import pkgutil + import re +-from jsbeautifier.unpackers import evalbased ++from ...jsbeautifier.unpackers import evalbased + + # NOTE: AT THE MOMENT, IT IS DEACTIVATED FOR YOUR SECURITY: it runs js! + BLACKLIST = ['jsbeautifier.unpackers.evalbased'] +--- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py ++++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py +@@ -40,7 +40,7 @@ + except ImportError: + from urllib.parse import unquote + +-from jsbeautifier.unpackers import UnpackingError ++from ...jsbeautifier.unpackers import UnpackingError + + PRIORITY = 1 + +--- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/packer.py ++++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/packer.py +@@ -14,7 +14,7 @@ + + import re + import string +-from jsbeautifier.unpackers import UnpackingError ++from ...jsbeautifier.unpackers import UnpackingError + + PRIORITY = 1 + |