From 87ca53cbc420008d59a5f6d1711314ad5a144721 Mon Sep 17 00:00:00 2001
From: Avery Pennarun <apenwarr@gmail.com>
Date: Fri, 6 Jul 2012 16:26:45 -0400
Subject: [PATCH] MacOS precompiled app package for sshuttle-0.61

---
 Sshuttle VPN.app/Contents/MacOS/Sshuttle      | Bin 37568 -> 25264 bytes
 .../Contents/Resources/sshuttle/firewall.py   |   2 ++
 .../Contents/Resources/sshuttle/main.py       |   3 +++
 .../Contents/Resources/sshuttle/server.py     |  11 +++++++++--
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Sshuttle VPN.app/Contents/MacOS/Sshuttle b/Sshuttle VPN.app/Contents/MacOS/Sshuttle
index 334693bce34a1bd861422c89ea9d54c9ca219d47..cd9467129e3e448c6de4bdfb7e69297c48f10465 100755
GIT binary patch
delta 2211
zcmbVNUrbY17(W-<0$ONGt3z7KMa#mRv0zZq&7>pV<Yoh;+ZauhF;KH=rWOhdX2v!l
zd$?9&>$kVXX~_1lY-SLLiF274oR~dK-o}heG|}afu%%giU<rZ!zS~RJhiwo0((io#
z&UfxP-#Oo})1MVhd@pVLVdb0egb+pG5^%8)PKeDh40Z{=q~Qy(Z(=eu?Z~|2x#)D-
zD>!Zy;zJ=z<a4Hdoqi#nz}bn21u{<-ktDmTp}M(Nhyc9J4k55`o=UCM;o4dqL0E+|
zf-r9;Pgc6?+*)=8;SKOzp+B89^v8gI-ISRy<;aAq>5=P*WFc34H=U_GZaaMH#EDZU
zNp7vOHp@5>NiMe}QH?t&#i-rwi@@o@Y97cc$Tiv~3-Kn5B;*hzZ-nDZu(2=kq)v$Q
zkn6#nU?x5bGgq&aZo6xxFX^%SCHd2<AD=%u(e!S*`1JCtmgQZ1b}p?bS;wQGZJw5*
zPJbr6k<NIWl8weZ-6cZ0jF3bJ_Scj@4~-L^$*AaL_{B1c`kNB`Y0VPQuW=-u?$Vx)
zF1F|}L?qR2Pj!`QUCUbgQVPE^%^uK{dHo|!Q5I9mQVQ~6N|_%^TCrtKc{Ho=or#pP
zh&5;T2P{EY`Y|IxPbvE7k{Gf<-d&s1tnbXv*LOi3Qy$J*0$eB!>AK5E&8C#BraVh2
z&qnXG^vqCeZT&$6#KH~?QLf}d18Y9k@Nh(w%>}-aXftbEqG&5?U=gj7g;=fU+e&ZW
z9(?_1{M7K^;iK{3iN0eex5rM?SG6_e{O~xJc_;l`yM-j#yMdooKlnZH``{$_+_fh8
zzN6B$S#-6&Ratl4pR^Xm_Qi_Av=Y2&oAaRw(sZk_E-~i|8Bd_XhBfi=G6)BTX6SrS
z)?1)&GW8Jjdg#Rx?hU^^rvGL5`7jO?J&oh?J7=AHrUN=u{DkPv>0C_lwh(*SYZylg
z0>=yV!2<n*0=<+jH9g0>4KW**BvbHWW-@ZF{9??xp4)c>r$YOZH#W5|Tb|p(0{l#D
zTXJe{L>CvDy}j|F;r@8eMRhK>>j9SJLj=re52$INj>ZT44cs{#X)_~i8>d>c&9&*C
zv%%G7PTpV!+tBY`S{w*e_L-4RGt!5?_fu#vlsV+2^xzrEk_mh1P^C<2+#?lJPy7JJ
ztMQsOG?<Gw0I+a7v?u1Js-Z^Pgs~0kaC;*%nisKB$U;DnVMpK}fgFM4ghD`&H{(X(
z`wu`E>Xi>yU!UJNzxxZS82+~7li%-gjqp7FhJwc7wAHwROn6Hk4PJA%U<!ZD*k&FX
z>hj2tm9gW=@WB%Doo!6mF;kn>Z$bbV01c}4R2^LmX-k^2tZKtq6<w*Ogo;Vyn53fr
z^Dbpt9kc$L^WIZul{u&a(MLCehI3Z?QRnMM(mdSrDkDP)Yk&rxr-rcXUNeb5Vd!JZ
z^bOv<c3;)*>U^o%ZLM8Twd-0t0BKPjy%Xx0Nw3yNBtbu&t?fs%W77Wxing(u-;n*v
z8>{udK>jOO?B-&xfd#)@CbseSC+w)V$E<k>Hi(}u6MdZsltorn4f>oOC%Ru)d)@2I
z=jkz}-;@oe+;OchdD&shfex))xMj<F@wo|_N!KT`-jK0Am#TvQNboxNo7}<<U}4m>
z4bXudGwn@gJZai_@PVK6_n7e!Gv3NJ0*z*~nn08=`kfOxz>usORES9I04i~i_i4}(
ejD>a~IPru+fMUB4q}b-3D-$%{RQV5Rb>T0&m7>W2

literal 37568
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
ZReDkD=Z2X$Pm1d6c~s5?{=b|f@E<^gi7Eg9

diff --git a/Sshuttle VPN.app/Contents/Resources/sshuttle/firewall.py b/Sshuttle VPN.app/Contents/Resources/sshuttle/firewall.py
index 452715e..53d866e 100644
--- a/Sshuttle VPN.app/Contents/Resources/sshuttle/firewall.py	
+++ b/Sshuttle VPN.app/Contents/Resources/sshuttle/firewall.py	
@@ -471,6 +471,8 @@ def main(port, dnsport, syslog):
     # disappears; we still have to clean up.
     signal.signal(signal.SIGHUP, signal.SIG_IGN)
     signal.signal(signal.SIGPIPE, signal.SIG_IGN)
+    signal.signal(signal.SIGTERM, signal.SIG_IGN)
+    signal.signal(signal.SIGINT, signal.SIG_IGN)
 
     # ctrl-c shouldn't be passed along to me.  When the main sshuttle dies,
     # I'll die automatically.
diff --git a/Sshuttle VPN.app/Contents/Resources/sshuttle/main.py b/Sshuttle VPN.app/Contents/Resources/sshuttle/main.py
index daf3b87..34d9fb1 100755
--- a/Sshuttle VPN.app/Contents/Resources/sshuttle/main.py	
+++ b/Sshuttle VPN.app/Contents/Resources/sshuttle/main.py	
@@ -57,6 +57,7 @@ dns        capture local DNS requests and forward to the remote DNS server
 python=    path to python interpreter on the remote server
 r,remote=  ssh hostname (and optional username) of remote sshuttle server
 x,exclude= exclude this subnet (can be used more than once)
+exclude-from=  exclude the subnets in a file (whitespace separated)
 v,verbose  increase debug message verbosity
 e,ssh-cmd= the command to use to connect to the remote [ssh]
 seed-hosts= with -H, use these hostnames for initial scan (comma-separated)
@@ -104,6 +105,8 @@ try:
         for k,v in flags:
             if k in ('-x','--exclude'):
                 excludes.append(v)
+            if k in ('-X', '--exclude-from'):
+                excludes += open(v).read().split()
         remotename = opt.remote
         if remotename == '' or remotename == '-':
             remotename = None
diff --git a/Sshuttle VPN.app/Contents/Resources/sshuttle/server.py b/Sshuttle VPN.app/Contents/Resources/sshuttle/server.py
index e1b327d..5f2e5e4 100644
--- a/Sshuttle VPN.app/Contents/Resources/sshuttle/server.py	
+++ b/Sshuttle VPN.app/Contents/Resources/sshuttle/server.py	
@@ -43,7 +43,12 @@ def _maskbits(netmask):
     
     
 def _shl(n, bits):
-    return n * int(2**bits)
+    # we use our own implementation of left-shift because
+    # results may be different between older and newer versions
+    # of python for numbers like 1<<32.  We use long() because
+    # int(2**32) doesn't work in older python, which has limited
+    # int sizes.
+    return n * long(2**bits)
 
 
 def _list_routes():
@@ -68,9 +73,11 @@ def _list_routes():
 
 
 def list_routes():
+    l = []
     for (ip,width) in _list_routes():
         if not ip.startswith('0.') and not ip.startswith('127.'):
-            yield (ip,width)
+            l.append((ip,width))
+    return l
 
 
 def _exc_dump():