JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #56930 from carlosdagos/sshuttle-0.78.5

Browse Source 
sshuttle: 0.78.4 -> 0.78.5
This commit is contained in:
Ryan Mulligan 2019-03-06 19:00:28 -08:00 committed by GitHub
commit 224ad7d5b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/security/sshuttle/default.nix
View File

@ -1,23 +1,23 @@
{ stdenv, python3Packages, fetchurl, makeWrapper, pandoc { stdenv, python3Packages, fetchurl, makeWrapper
, coreutils, iptables, nettools, openssh, procps, fetchpatch }: , coreutils, iptables, nettools, openssh, procps, fetchpatch }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "sshuttle-${version}"; name = "sshuttle-${version}";
version = "0.78.4"; version = "0.78.5";
src = fetchurl { src = fetchurl {
sha256 = "0pqk43kd7crqhg6qgnl8kapncwgw1xgaf02zarzypcw64kvdih9h"; sha256 = "0vp13xwrhx4m6zgsyzvai84lkq9mzkaw47j58dk0ll95kaymk2x8";
url = "mirror://pypi/s/sshuttle/${name}.tar.gz"; url = "mirror://pypi/s/sshuttle/${name}.tar.gz";
}; };
patches = [ ./sudo.patch ]; patches = [ ./sudo.patch ];
nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.hostPlatform.system != "i686-linux") pandoc; nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ];
buildInputs = buildInputs =
[ coreutils openssh procps nettools ] [ coreutils openssh procps nettools ]
++ stdenv.lib.optionals stdenv.isLinux [ iptables ]; ++ stdenv.lib.optionals stdenv.isLinux [ iptables ];
checkInputs = with python3Packages; [ mock pytest pytestrunner ]; checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ];
postInstall = let postInstall = let
mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x); mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x);
@ -31,11 +31,11 @@ python3Packages.buildPythonApplication rec {
description = "Transparent proxy server that works as a poor man's VPN"; description = "Transparent proxy server that works as a poor man's VPN";
longDescription = '' longDescription = ''
Forward connections over SSH, without requiring administrator access to the Forward connections over SSH, without requiring administrator access to the
target network (though it does require Python 2 at both ends). target network (though it does require Python 2.7, Python 3.5 or later at both ends).
Works with Linux and Mac OS and supports DNS tunneling. Works with Linux and Mac OS and supports DNS tunneling.
''; '';
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ domenkozar ]; maintainers = with maintainers; [ domenkozar carlosdagos ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

6
pkgs/tools/security/sshuttle/sudo.patch
View File

@ -1,9 +1,9 @@
diff --git a/sshuttle/client.py b/sshuttle/client.py diff --git a/sshuttle/client.py b/sshuttle/client.py
index 7a7b6d7..8dde615 100644 index cab5b1c..e89f8a6 100644
--- a/sshuttle/client.py --- a/sshuttle/client.py
+++ b/sshuttle/client.py +++ b/sshuttle/client.py
@@ -158,7 +158,7 @@ class FirewallClient: @@ -192,7 +192,7 @@ class FirewallClient:
def __init__(self, method_name):
self.auto_nets = [] self.auto_nets = []
python_path = os.path.dirname(os.path.dirname(__file__)) python_path = os.path.dirname(os.path.dirname(__file__))
- argvbase = ([sys.executable, sys.argv[0]] + - argvbase = ([sys.executable, sys.argv[0]] +