From a800c2175f47887eaba36cc8220f665026d433e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 27 Mar 2017 15:51:06 +0200 Subject: gnu: mosh: Update to 1.3.0. * gnu/packages/ssh.scm (mosh): Update to 1.3.0. --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index c511b7a6c9..0443937749 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -300,13 +300,13 @@ (define-public corkscrew (define-public mosh (package (name "mosh") - (version "1.2.6") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "https://mosh.org/mosh-" version ".tar.gz")) (sha256 (base32 - "118fhpm754wpklf1blnlq5xbvrxqml6rdfs3b07wg666zkxvg0ky")))) + "0xikz40q873g9ihvz3x6bwkcb9hb8kcnp5wpcmb72pg5c7s143ij")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 040ae44aa1fb42b8e801b2abbebc8ec869eaaa65 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 27 Mar 2017 16:57:36 +0200 Subject: gnu: corkscrew: Download source from a mirror. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (corkscrew)[source]: Use ‘https://downloads.openwrt.org’. --- gnu/packages/ssh.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 0443937749..67ffe1fac2 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -263,8 +263,11 @@ (define-public corkscrew (source (origin (method url-fetch) - (uri (string-append "http://www.agroman.net/corkscrew/corkscrew-" - version ".tar.gz")) + ;; The agroman.net domain name expired on 2017-03-23, and the original + ;; "http://www.agroman.net/corkscrew/corkscrew-2.0.tar.gz" now returns + ;; bogus HTML. Perhaps it will yet return. Until then, use a mirror. + (uri (string-append "https://downloads.openwrt.org/sources/" + "corkscrew-" version ".tar.gz")) (sha256 (base32 "1gmhas4va6gd70i2x2mpxpwpgww6413mji29mg282jms3jscn3qd")))) (build-system gnu-build-system) -- cgit v1.2.3 From 10c95711b4ec69706377bd0f3db86f1cf2bb047a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 27 Mar 2017 17:31:54 +0200 Subject: gnu: corkscrew: Improve descriptions. * gnu/packages/ssh.scm (corkscrew)[synopsis, description]: Fix typos and condense. Remove scary warning (the tunnel is always encrypted through SSH) and speculation. --- gnu/packages/ssh.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 67ffe1fac2..b5c73ea85e 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -292,12 +292,11 @@ (define-public corkscrew (string-append "." "/configure") flags)))))))) (home-page "http://www.agroman.net/corkscrew") - (synopsis "Tunneling SSH through HTTP proxies") + (synopsis "SSH tunneling through HTTP(S) proxies") (description - "Corkscrew allows creating TCP tunnels through HTTP proxies. WARNING: -At the moment only plain text authentication is supported, should you require -to use it with your HTTP proxy. Digest based authentication may be supported -in future and NTLM based authentication is most likey never be supported.") + "Corkscrew tunnels SSH connections through most HTTP and HTTPS proxies. +Proxy authentication is only supported through the plain-text HTTP basic +authentication scheme.") (license license:gpl2+))) (define-public mosh -- cgit v1.2.3 From 81d95a121aa2c73c72f26266c2971dc398380d55 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 27 Mar 2017 20:10:44 +0200 Subject: gnu: corkscrew: Install the README file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (corkscrew)[arguments]: Add a very basic ‘install-documentation’ phase. --- gnu/packages/ssh.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index b5c73ea85e..4ac9a75c71 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -290,7 +291,13 @@ (define-public corkscrew (setenv "CONFIG_SHELL" bash) (zero? (apply system* bash (string-append "." "/configure") - flags)))))))) + flags))))) + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/corkscrew"))) + (install-file "README" doc) + #t)))))) (home-page "http://www.agroman.net/corkscrew") (synopsis "SSH tunneling through HTTP(S) proxies") (description -- cgit v1.2.3