Merge ~smoser/ubuntu/+source/sshuttle:fix/backward-compat into ubuntu/+source/sshuttle:ubuntu/focal-devel

[Scott Moser]

Restore compatibility with python 3.5 and below.

The upstream commit 9c873579348e3308123d broke python versions
3.4 and below. We would like to support an ubuntu 20.04 client
(python 3.8) connecting to a ubuntu 14.04 server (python 3.4).

The change here makes that combination work.

[Dan Streetman (ddstreet)]

inline comments on version checking logic, and also editing the quilt file itself isn't good; a new patch should be added instead of editing the one from upstream.

and there is still the question from @slashd of whether upstream will carry this, or if debian and/or ubuntu should carry it separately

review: Needs Fixing

Unmerged commits

50a7ab4... by Scott Moser on 2020-07-24

releasing package sshuttle version 0.78.5-1ubuntu2

ec0bce8... by Scott Moser on 2020-07-24

update changelog

24bb599... by Scott Moser on 2020-07-24

Restore compatibility with python 3.4.

The upstream commit 9c873579348e3308123d broke python versions
3.4 and below. We would like to support an ubuntu 20.04 client
(python 3.8) connecting to a ubuntu 14.04 server (python 3.4).

The change here makes that combination work.

diff --git a/debian/changelog b/debian/changelog
index dbb2583..9564a31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sshuttle (0.78.5-1ubuntu2) focal; urgency=medium
+
+  * d/p/0001-compatibility-with-python38.patch: update patch
+    to support python versions < 3.5 (trusty).
+
+ -- Scott Moser <[e-mail]>  Fri, 24 Jul 2020 12:02:34 -0400
+
 sshuttle (0.78.5-1ubuntu1) focal; urgency=medium
 
   * d/p/0001-compatibility-with-python38.patch:
diff --git a/debian/patches/0001-compatibility-with-python38.patch b/debian/patches/0001-compatibility-with-python38.patch
index 6d55b74..2afaa69 100644
--- a/debian/patches/0001-compatibility-with-python38.patch
+++ b/debian/patches/0001-compatibility-with-python38.patch
@@ -1,16 +1,18 @@
 Description: Fix Python 3.8 file operations
  Under Python 3.8 we can not wrap a File in a Sock.
 
- Note this currently requires Python >= 3.5
+ Note: Upstream commit referenced broke compatibility with
+  python versions < 3.5. Changes here restore support
+  for older python.  The goal is specifically to support
+  trusty (14.04) with python 3.4.
+
 Author: Brian May <[e-mail]>
 Origin: upstream, https://github.com/sshuttle/sshuttle/commit/9c873579348e3308123d1bf2a917b0c2f82b9dae
 Bug: https://github.com/sshuttle/sshuttle/issues/381
 Bug-Debian: https://bugs.debian.org/953621
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/1873368
-Index: sshuttle-0.78.5/sshuttle/client.py
-===================================================================
---- sshuttle-0.78.5.orig/sshuttle/client.py
-+++ sshuttle-0.78.5/sshuttle/client.py
+--- a/sshuttle/client.py
++++ b/sshuttle/client.py
 @@ -460,7 +460,7 @@ def _main(tcp_listener, udp_listener, fw
              raise Fatal("failed to establish ssh session (1)")
          else:
@@ -20,11 +22,9 @@ Index: sshuttle-0.78.5/sshuttle/client.py
      handlers.append(mux)
  
      expected = b'SSHUTTLE0001'
-Index: sshuttle-0.78.5/sshuttle/server.py
-===================================================================
---- sshuttle-0.78.5.orig/sshuttle/server.py
-+++ sshuttle-0.78.5/sshuttle/server.py
-@@ -295,10 +295,7 @@ def main(latency_control, auto_hosts, to
+--- a/sshuttle/server.py
++++ b/sshuttle/server.py
+@@ -295,10 +295,14 @@ def main(latency_control, auto_hosts, to
      sys.stdout.flush()
  
      handlers = []
@@ -32,14 +32,19 @@ Index: sshuttle-0.78.5/sshuttle/server.py
 -                            socket.AF_INET, socket.SOCK_STREAM),
 -              socket.fromfd(sys.stdout.fileno(),
 -                            socket.AF_INET, socket.SOCK_STREAM))
-+    mux = Mux(sys.stdin, sys.stdout)
++    if sys.version_info.major <= 3 and sys.version_info.minor <= 4:
++        debug1("Server version <= 3.4")
++        mux = Mux(socket.fromfd(sys.stdin.fileno(),
++                                socket.AF_INET, socket.SOCK_STREAM),
++                  socket.fromfd(sys.stdout.fileno(),
++                                socket.AF_INET, socket.SOCK_STREAM))
++    else:
++        mux = Mux(sys.stdin, sys.stdout)
      handlers.append(mux)
  
      debug1('auto-nets:' + str(auto_nets) + '\n')
-Index: sshuttle-0.78.5/sshuttle/ssnet.py
-===================================================================
---- sshuttle-0.78.5.orig/sshuttle/ssnet.py
-+++ sshuttle-0.78.5/sshuttle/ssnet.py
+--- a/sshuttle/ssnet.py
++++ b/sshuttle/ssnet.py
 @@ -334,10 +334,10 @@ class Proxy(Handler):
  
  class Mux(Handler):
@@ -55,31 +60,46 @@ Index: sshuttle-0.78.5/sshuttle/ssnet.py
          self.new_channel = self.got_dns_req = self.got_routes = None
          self.got_udp_open = self.got_udp_data = self.got_udp_close = None
          self.got_host_req = self.got_host_list = None
-@@ -434,9 +434,9 @@ class Mux(Handler):
+@@ -350,6 +350,8 @@ class Mux(Handler):
+         self.too_full = False
+         self.send(0, CMD_PING, b('chicken'))
+ 
++        self.py35 = sys.version_info.major <= 3 and sys.version_info.minor <= 4
++
+     def next_channel(self):
+         # channel 0 is special, so we never allocate it
+         for _ in range(1024):
+@@ -434,9 +436,12 @@ class Mux(Handler):
                  callback(cmd, data)
  
      def flush(self):
 -        self.wsock.setblocking(False)
-+        os.set_blocking(self.wfile.fileno(), False)
++        if self.py35:
++            self.wfile.setblocking(False)
++        else:
++            os.set_blocking(self.wfile.fileno(), False)
          if self.outbuf and self.outbuf[0]:
 -            wrote = _nb_clean(os.write, self.wsock.fileno(), self.outbuf[0])
 +            wrote = _nb_clean(os.write, self.wfile.fileno(), self.outbuf[0])
              debug2('mux wrote: %r/%d\n' % (wrote, len(self.outbuf[0])))
              if wrote:
                  self.outbuf[0] = self.outbuf[0][wrote:]
-@@ -444,9 +444,9 @@ class Mux(Handler):
+@@ -444,9 +449,12 @@ class Mux(Handler):
              self.outbuf[0:1] = []
  
      def fill(self):
 -        self.rsock.setblocking(False)
-+        os.set_blocking(self.rfile.fileno(), False)
++        if self.py35:
++            self.rfile.setblocking(False)
++        else:
++            os.set_blocking(self.rfile.fileno(), False)
          try:
 -            read = _nb_clean(os.read, self.rsock.fileno(), 32768)
 +            read = _nb_clean(os.read, self.rfile.fileno(), 32768)
          except OSError:
              _, e = sys.exc_info()[:2]
              raise Fatal('other end: %r' % e)
-@@ -476,22 +476,22 @@ class Mux(Handler):
+@@ -476,22 +484,22 @@ class Mux(Handler):
                  break
  
      def pre_select(self, r, w, x):