net-proxy/sshuttle: check for more generic remote python versions

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
new file mode 100644 (file)
index 0000000..d7404fd
--- /dev/null
+++ b/net-proxy/sshuttle/files/sshuttle-0.78.3-remote-python.patch
@@ -0,0 +1,13 @@
+Check for more generic remote python versions.
+
+--- sshuttle-0.78.3/sshuttle/ssh.py
++++ sshuttle-0.78.3/sshuttle/ssh.py
+@@ -116,7 +116,7 @@
+         if python:
+             pycmd = "'%s' -c '%s'" % (python, pyscript)
+         else:
+-            pycmd = ("P=python3.5; $P -V 2>/dev/null || P=python; "
++            pycmd = ("P=python3; $P -V 2>/dev/null || P=python2; $P -V 2>/dev/null || P=python; "
+                      "exec \"$P\" -c %s") % quote(pyscript)
+             pycmd = ("exec /bin/sh -c %s" % quote(pycmd))
+         argv = (sshl +

diff --git a/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild b/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild
index 49502d961803c2d64eaa202e4c4eb4934b7c3b7d..254601915e1c7f62c0ea0f87953b25f9e309dead 100644 (file)
--- a/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild
+++ b/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild
@@ -31,6 +31,8 @@ DEPEND="
 
 CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL ~NF_NAT"
 
+PATCHES=( "${FILESDIR}"/${P}-remote-python.patch )
+
 python_prepare_all() {
        # don't run tests via setup.py pytest
        sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die