[PATCH 1/3] gnu: Add sshuttle.

[PATCH 1/3] gnu: Add sshuttle.

[Tobias Geerinckx-Rice]

* gnu/packages/vpn.scm (sshuttle): New variable.
---
 gnu/packages/vpn.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 6d50304..a856d69 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25,6 +26,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gettext)
@@ -32,6 +34,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xml))
 
@@ -201,3 +204,34 @@ traversing network address translators (NATs) and firewalls.")
      "Tinc is a VPN that uses tunnelling and encryption to create a secure
 private network between hosts on the internet.")
     (license license:gpl2+)))
+
+(define-public sshuttle
+  (package
+    (name "sshuttle")
+    (version "0.78.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri name version))
+       (sha256
+        (base32
+         "0g1dpqigz02vafzh84z5990lnj9d95raknav0xmf0va7rr41d9q3"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-pytest-runner" ,python-pytest-runner)
+       ("python-setuptools-scm" ,python-setuptools-scm)
+
+       ;; For tests only.
+       ("python-mock" ,python-mock)
+       ("python-pytest" ,python-pytest)))
+    (home-page "https://github.com/sshuttle/sshuttle")
+    (synopsis "VPN that transparently forwards connections over SSH")
+    (description "sshuttle creates an encrypted virtual private network (VPN)
+connection to any remote server to which you have secure shell (SSH) access.
+The only requirement is a suitable version of Python on the server;
+administrative privileges are required only on the client.  Unlike most VPNs,
+sshuttle forwards entire sessions, not packets, using kernel transparent
+proxying.  This makes it faster and more reliable than SSH's own tunneling and
+port forwarding features.  It can forward both TCP and UDP traffic, including
+DNS domain name queries.")
+    (license license:lgpl2.1+)))
-- 
2.9.3

[PATCH 2/3] gnu: Add python-argcomplete.

[Tobias Geerinckx-Rice]

* gnu/packages/python.scm (argcomplete): New variable.
---
 gnu/packages/python.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d624229..fdf6289 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -32,6 +32,7 @@
 ;;; Copyright © 2016 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2016 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -11825,3 +11826,24 @@ the Flask web framework in Python.  It is similar to package
 @code{python-flask-restful} but supports the @code{python-swagger}
 documentation builder.")
     (license license:expat)))
+
+(define-public python-argcomplete
+  (package
+    (name "python-argcomplete")
+    (version "1.7.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "argcomplete" version))
+        (sha256
+          (base32
+            "11bwiw6j0nilgz81xnw6f1npyga3prp8asjqrm87cdr3ria5l03x"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/kislyuk/argcomplete")
+    (synopsis "Shell tab completion for Python argparse")
+    (description "argcomplete provides extensible command line tab completion
+of arguments and options for Python scripts using @code{argparse}.  It's
+particularly useful for programs with many options or sub-parsers that can
+dynamically suggest completions; for example, when browsing resources over the
+network.")
+    (license license:asl2.0)))
-- 
2.9.3

Re: [PATCH 2/3] gnu: Add python-argcomplete.

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 150 bytes --]

On 07/12/16 04:19, Tobias Geerinckx-Rice wrote:
> * gnu/packages/python.scm (argcomplete): New variable.

s/argcomplete/python-argcomplete/ :-)


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 476 bytes --]

Re: [PATCH 2/3] gnu: Add python-argcomplete.

[Danny Milosavljevic]

On Wed, 7 Dec 2016 04:22:27 +0100
Tobias Geerinckx-Rice <me@tobias.gr> wrote:

> On 07/12/16 04:19, Tobias Geerinckx-Rice wrote:
> > * gnu/packages/python.scm (argcomplete): New variable.  
> 
> s/argcomplete/python-argcomplete/ :-)
> 

LGTM (with the name change).

Re: [PATCH 2/3] gnu: Add python-argcomplete.

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 178 bytes --]

Danny,

On 07/12/16 18:19, Danny Milosavljevic wrote:
> LGTM (with the name change).

Thanks. I went ahead and added a python2 variant as well.

Kind regards,

T G-R


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 476 bytes --]

[PATCH 3/3] gnu: Add sshoot.

[Tobias Geerinckx-Rice]

* gnu/packages/vpn.scm (sshoot): New variable.
---
 gnu/packages/vpn.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index a856d69..b73f66d 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -235,3 +235,31 @@ proxying.  This makes it faster and more reliable than SSH's own tunneling and
 port forwarding features.  It can forward both TCP and UDP traffic, including
 DNS domain name queries.")
     (license license:lgpl2.1+)))
+
+(define-public sshoot
+  (package
+    (name "sshoot")
+    (version "1.2.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri name version))
+       (sha256
+        (base32
+         "0a92lk8790dpp9j64vb6p4sazax0x3nby01lnfll7mxs1hx6n27q"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-argcomplete" ,python-argcomplete)
+       ("python-prettytable" ,python-prettytable)
+       ("python-pyyaml" ,python-pyyaml)))
+    ;; For tests only.
+    (native-inputs
+     `(("python-fixtures" ,python-fixtures)
+       ("python-pbr" ,python-pbr)
+       ("python-testtools" ,python-testtools)))
+    (home-page "https://bitbucket.org/ack/sshoot")
+    (synopsis "sshuttle VPN session manager")
+    (description "sshoot provides a command-line interface to manage multiple
+@command{sshuttle} virtual private networks.  It supports flexible profiles
+with configuration options for most of @command{sshuttle}’s features.")
+    (license license:gpl3+)))
-- 
2.9.3

Re: [PATCH 1/3] gnu: Add sshuttle.

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 300 bytes --]

On 07/12/16 04:19, Tobias Geerinckx-Rice wrote:
> +    (native-inputs
> +     `(("python-pytest-runner" ,python-pytest-runner)
> +       [...]
> +       ;; For tests only.
> +       [...]

Sic, by the way. Even ‘#:tests? #f’ builds fail without pytest-runner.

Kind regards,

T G-R


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 476 bytes --]

Re: [PATCH 1/3] gnu: Add sshuttle.

[Hartmut Goebel]

Am 07.12.2016 um 04:19 schrieb Tobias Geerinckx-Rice:
> +    (native-inputs
> +     `(("python-pytest-runner" ,python-pytest-runner)
> +       ("python-setuptools-scm" ,python-setuptools-scm)
> +
> +       ;; For tests only.
> +       ("python-mock" ,python-mock)
> +       ("python-pytest" ,python-pytest)))

I wonder why pytest-runner in not below the comment "For tests only"?

Also I'd not put an empty line in front of the comment.

Please check the license. The LICENCE file says LGPL 2.1+ as you said,
but https://pypi.python.org/pypi/sshuttle/ says it is GPL2+. Can you
please verify which one is correct. Thanks.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: [PATCH 1/3] gnu: Add sshuttle.

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 844 bytes --]

Hartmut,

On 07/12/16 10:44, Hartmut Goebel wrote:
> The LICENCE file says LGPL 2.1+ as you said, but
> https://pypi.python.org/pypi/sshuttle/ says it is GPL2+.

I know :-) That would be because of this gem, copied from...

    head -n 5 setup.py
    #!/usr/bin/env python

    # Copyright 2012-2014 Brian May
    #
    # This file is part of python-tldap.

Which appears never to have been updated.

> Can you please verify which one is correct.

I have as much information as you...

I've filed a bug report, with the suggested fix to add LGPL2+ licence
headers to the source files to remove any confusion.

Since the last commit was in March, and considering there is a LICENSE
file present, I propose we add the package as LGPL2 (conservatively,
license:lgpl2.0) until further notice.

Kind regards,

T G-R


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 476 bytes --]