| 1 |
commit: bb1f8408db50c4ea99c48cd41eafcc98c0460be0 |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 6 03:15:57 2018 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 6 03:17:58 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb1f8408 |
| 7 |
|
| 8 |
net-proxy/sshuttle: check for more generic remote python versions |
| 9 |
|
| 10 |
.../sshuttle/files/sshuttle-0.78.3-remote-python.patch | 13 +++++++++++++ |
| 11 |
net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild | 2 ++ |
| 12 |
2 files changed, 15 insertions(+) |
| 13 |
|
| 14 |
diff --git a/net-proxy/sshuttle/files/sshuttle-0.78.3-remote-python.patch b/net-proxy/sshuttle/files/sshuttle-0.78.3-remote-python.patch |
| 15 |
new file mode 100644 |
| 16 |
index 00000000000..d7404fd45b0 |
| 17 |
--- /dev/null |
| 18 |
+++ b/net-proxy/sshuttle/files/sshuttle-0.78.3-remote-python.patch |
| 19 |
@@ -0,0 +1,13 @@ |
| 20 |
+Check for more generic remote python versions. |
| 21 |
+ |
| 22 |
+--- sshuttle-0.78.3/sshuttle/ssh.py |
| 23 |
++++ sshuttle-0.78.3/sshuttle/ssh.py |
| 24 |
+@@ -116,7 +116,7 @@ |
| 25 |
+ if python: |
| 26 |
+ pycmd = "'%s' -c '%s'" % (python, pyscript) |
| 27 |
+ else: |
| 28 |
+- pycmd = ("P=python3.5; $P -V 2>/dev/null || P=python; " |
| 29 |
++ pycmd = ("P=python3; $P -V 2>/dev/null || P=python2; $P -V 2>/dev/null || P=python; " |
| 30 |
+ "exec \"$P\" -c %s") % quote(pyscript) |
| 31 |
+ pycmd = ("exec /bin/sh -c %s" % quote(pycmd)) |
| 32 |
+ argv = (sshl + |
| 33 |
|
| 34 |
diff --git a/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild b/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild |
| 35 |
index 49502d96180..254601915e1 100644 |
| 36 |
--- a/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild |
| 37 |
+++ b/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild |
| 38 |
@@ -31,6 +31,8 @@ DEPEND=" |
| 39 |
|
| 40 |
CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL ~NF_NAT" |
| 41 |
|
| 42 |
+PATCHES=( "${FILESDIR}"/${P}-remote-python.patch ) |
| 43 |
+ |
| 44 |
python_prepare_all() { |
| 45 |
# don't run tests via setup.py pytest |
| 46 |
sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die |
Archives